diff --git a/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/DetectTask.java b/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/DetectTask.java index 67167879..27ea5696 100644 --- a/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/DetectTask.java +++ b/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/DetectTask.java @@ -19,9 +19,9 @@ public String toJson() { return String.format("{'lng': %s, 'lat': %s, 'alt': %s}", x, y, z); } } - public record HSV(double h, double s, double v) { + public record HSV(int h, int s, int v) { public String toString() { - return String.format("[%s, %s, %s]", int(h), int(s), int(v)); + return String.format("[%s, %s, %s]", h, s, v); } } diff --git a/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/Parse.java b/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/Parse.java index c810fa57..b9c55ce6 100644 --- a/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/Parse.java +++ b/droneDSL/compile/src/main/java/org/droneDSL/compile/codeGen/concrete/Parse.java @@ -61,9 +61,9 @@ static Tuple2 createTask(GenericNode> tas } // HSV - var nums = attrMap.get("hsv_upper_bound").child(BotPsiElementTypes.PAREN).child(BotPsiElementTypes.TUPLE).childrenOfType(BotPsiElementTypes.NUMBER).map(t -> t.tokenText().toFloat()).toImmutableSeq(); + var nums = attrMap.get("hsv_upper_bound").child(BotPsiElementTypes.PAREN).child(BotPsiElementTypes.TUPLE).childrenOfType(BotPsiElementTypes.NUMBER).map(t -> t.tokenText().toInt()).toImmutableSeq(); var hsv_upper_bound = new DetectTask.HSV(nums.get(0), nums.get(1), nums.get(2)); - nums = attrMap.get("hsv_lower_bound").child(BotPsiElementTypes.PAREN).child(BotPsiElementTypes.TUPLE).childrenOfType(BotPsiElementTypes.NUMBER).map(t -> t.tokenText().toFloat()).toImmutableSeq(); + nums = attrMap.get("hsv_lower_bound").child(BotPsiElementTypes.PAREN).child(BotPsiElementTypes.TUPLE).childrenOfType(BotPsiElementTypes.NUMBER).map(t -> t.tokenText().toInt()).toImmutableSeq(); var hsv_lower_bound = new DetectTask.HSV(nums.get(0), nums.get(1), nums.get(2)); // construct new task