Skip to content

Commit

Permalink
Fixed some minor problems with setting styles in the segment gauges
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerrit Grunwald committed May 31, 2012
1 parent 686b723 commit fd6d97f
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 11 deletions.
6 changes: 6 additions & 0 deletions src/main/java/jfxtras/labs/internal/scene/control/skin/DotMatrixSegmentSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,16 @@ public void updateCharacter() {
for (DotMatrixSegment.Dot dot : dotMap.keySet()) {
if (control.getDotMapping().containsKey(ASCII)) {
if (control.getDotMapping().get(ASCII).contains(dot)) {
dotMap.get(dot).getStyleClass().clear();
dotMap.get(dot).getStyleClass().add(ON_STYLE);
dotMap.get(dot).setEffect(INNER_SHADOW);
} else {
dotMap.get(dot).getStyleClass().clear();
dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off");
dotMap.get(dot).setEffect(null);
}
} else {
dotMap.get(dot).getStyleClass().clear();
dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off");
dotMap.get(dot).setEffect(null);
}
Expand All @@ -190,13 +193,16 @@ public void updateCharacter() {
for (DotMatrixSegment.Dot dot : dotMap.keySet()) {
if (control.getCustomDotMapping().containsKey(ASCII)) {
if (control.getCustomDotMapping().get(ASCII).contains(dot)) {
dotMap.get(dot).getStyleClass().clear();
dotMap.get(dot).getStyleClass().add(ON_STYLE);
dotMap.get(dot).setEffect(INNER_SHADOW);
} else {
dotMap.get(dot).getStyleClass().clear();
dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off");
dotMap.get(dot).setEffect(null);
}
} else {
dotMap.get(dot).getStyleClass().clear();
dotMap.get(dot).getStyleClass().add("dot-matrix-segment-off");
dotMap.get(dot).setEffect(null);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/jfxtras/labs/internal/scene/control/skin/LedSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ public final void drawLed() {
LED_OFF.getStyleClass().add("fx-led-off");
LED_OFF.setStroke(null);

ledOn.getStyleClass().clear();
ledOn.getStyleClass().add("fx-led-on");
ledOn.setStroke(null);
ledOn.setVisible(control.isOn());
Expand Down
28 changes: 17 additions & 11 deletions src/main/java/jfxtras/labs/internal/scene/control/skin/SevenSegmentSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
* Time: 08:12
*/
public class SevenSegmentSkin extends SkinBase<SevenSegment, SevenSegmentBehavior> {
private SevenSegment control;
private boolean isDirty;
private boolean initialized;
private Group segments;
private SevenSegment control;
private boolean isDirty;
private boolean initialized;
private Group segments;
private Map<SevenSegment.Segment, Shape> segmentMap;


Expand Down Expand Up @@ -176,42 +176,48 @@ public void updateCharacter() {
INNER_SHADOW.setRadius(0.05 * control.getPrefWidth());
INNER_SHADOW.setColor(Color.hsb(control.getColor().getHue(), control.getColor().getSaturation(), 0.2));

final String ON_STYLE = control.isPlainColor() ? "sixteen-segment-plain-on" : "sixteen-segment-on";
final String ON_STYLE = control.isPlainColor() ? "seven-segment-plain-on" : "seven-segment-on";

if (control.getCustomSegmentMapping().isEmpty()) {
for (SevenSegment.Segment segment : segmentMap.keySet()) {
if (control.getSegmentMapping().containsKey(ASCII)) {
if (control.getSegmentMapping().get(ASCII).contains(segment)) {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add(ON_STYLE);
segmentMap.get(segment).setEffect(INNER_SHADOW);
} else {
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("seven-segment-off");
segmentMap.get(segment).setEffect(null);
}
} else {
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).getStyleClass().add("seven-segment-off");
segmentMap.get(segment).setEffect(null);
}
}
} else {
for (SevenSegment.Segment segment : segmentMap.keySet()) {
if (control.getCustomSegmentMapping().containsKey(ASCII)) {
if (control.getCustomSegmentMapping().get(ASCII).contains(segment)) {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add(ON_STYLE);
segmentMap.get(segment).setEffect(INNER_SHADOW);
} else {
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("seven-segment-off");
segmentMap.get(segment).setEffect(null);
}
} else {
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("seven-segment-off");
segmentMap.get(segment).setEffect(null);
}
}
}
if (control.isDotOn()) {
segmentMap.get(SevenSegment.Segment.DOT).getStyleClass().add(ON_STYLE);
segmentMap.get(SevenSegment.Segment.DOT).setEffect(INNER_SHADOW);
segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().clear();
segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().add(ON_STYLE);
segmentMap.get(SixteenSegment.Segment.DOT).setEffect(INNER_SHADOW);
}
}

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/jfxtras/labs/internal/scene/control/skin/SixteenSegmentSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,16 @@ public void updateCharacter() {
for (SixteenSegment.Segment segment : segmentMap.keySet()) {
if (control.getSegmentMapping().containsKey(ASCII)) {
if (control.getSegmentMapping().get(ASCII).contains(segment)) {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add(ON_STYLE);
segmentMap.get(segment).setEffect(INNER_SHADOW);
} else {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).setEffect(null);
}
} else {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).setEffect(null);
}
Expand All @@ -197,19 +200,23 @@ public void updateCharacter() {
for (SixteenSegment.Segment segment : segmentMap.keySet()) {
if (control.getCustomSegmentMapping().containsKey(ASCII)) {
if (control.getCustomSegmentMapping().get(ASCII).contains(segment)) {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add(ON_STYLE);
segmentMap.get(segment).setEffect(INNER_SHADOW);
} else {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).setEffect(null);
}
} else {
segmentMap.get(segment).getStyleClass().clear();
segmentMap.get(segment).getStyleClass().add("sixteen-segment-off");
segmentMap.get(segment).setEffect(null);
}
}
}
if (control.isDotOn()) {
segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().clear();
segmentMap.get(SixteenSegment.Segment.DOT).getStyleClass().add(ON_STYLE);
segmentMap.get(SixteenSegment.Segment.DOT).setEffect(INNER_SHADOW);
}
Expand Down

0 comments on commit fd6d97f

Please sign in to comment.