Skip to content

Commit 2a64fa7

Browse files
committed
Merge pull request #523 from ThomasJClark/stepstuff
Fix some cosmetic issues with steps
2 parents 37267dd + be88cb3 commit 2a64fa7

4 files changed

Lines changed: 25 additions & 11 deletions

File tree

core/src/main/java/edu/wpi/grip/core/operations/composite/RGBThresholdOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class RGBThresholdOperation extends ThresholdOperation {
2121
private final SocketHint<List> greenHint = SocketHints.Inputs.createNumberListRangeSocketHint("Green", 0.0, 255.0);
2222
private final SocketHint<List> blueHint = SocketHints.Inputs.createNumberListRangeSocketHint("Blue", 0.0, 255.0);
2323

24-
private final SocketHint<Mat> outputHint = SocketHints.Outputs.createMatSocketHint("Input");
24+
private final SocketHint<Mat> outputHint = SocketHints.Outputs.createMatSocketHint("Output");
2525

2626
@Override
2727
public String getName() {
236 Bytes
Loading
255 Bytes
Loading

ui/src/main/resources/edu/wpi/grip/ui/pipeline/Step.fxml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,34 @@
2626
</Button>
2727
<Pane HBox.hgrow="ALWAYS"/>
2828
<HBox fx:id="buttons">
29-
<Button fx:id="moveLeftButton" onMouseClicked="#moveStepLeft" styleClass="move-left"
30-
text="" HBox.hgrow="NEVER">
31-
<minHeight>
32-
<DPIUtility fx:constant="SMALL_ICON_SIZE"/>
33-
</minHeight>
29+
<Button fx:id="moveLeftButton" onMouseClicked="#moveStepLeft" styleClass="move-left" HBox.hgrow="NEVER">
30+
<graphic>
31+
<ImageView>
32+
<Image url="/edu/wpi/grip/ui/icons/left.png"/>
33+
<fitWidth>
34+
<DPIUtility fx:constant="SMALL_ICON_SIZE"/>
35+
</fitWidth>
36+
<fitHeight>
37+
<DPIUtility fx:constant="SMALL_ICON_SIZE"/>
38+
</fitHeight>
39+
</ImageView>
40+
</graphic>
3441
<tooltip>
3542
<Tooltip text="Move Step Left"/>
3643
</tooltip>
3744
</Button>
38-
<Button fx:id="moveRightButton" onMouseClicked="#moveStepRight" styleClass="move-right"
39-
text="" HBox.hgrow="NEVER">
40-
<minHeight>
41-
<DPIUtility fx:constant="SMALL_ICON_SIZE"/>
42-
</minHeight>
45+
<Button fx:id="moveRightButton" onMouseClicked="#moveStepRight" styleClass="move-right" HBox.hgrow="NEVER">
46+
<graphic>
47+
<ImageView>
48+
<Image url="/edu/wpi/grip/ui/icons/right.png"/>
49+
<fitWidth>
50+
<DPIUtility fx:constant="SMALL_ICON_SIZE"/>
51+
</fitWidth>
52+
<fitHeight>
53+
<DPIUtility fx:constant="SMALL_ICON_SIZE"/>
54+
</fitHeight>
55+
</ImageView>
56+
</graphic>
4357
<tooltip>
4458
<Tooltip text="Move Step Right"/>
4559
</tooltip>

0 commit comments

Comments
 (0)