Skip to content

Commit

Permalink
gave ToolBar FlowPane a more natural LCARS look
Browse files Browse the repository at this point in the history
  • Loading branch information
@RalphSteinhagen
RalphSteinhagen committed Sep 14, 2019
1 parent dd894e5 commit c20f699
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 15 deletions.
39 changes: 25 additions & 14 deletions chartfx-chart/src/main/java/de/gsi/chart/Chart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,22 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import de.gsi.chart.ui.ChartLayoutAnimator;
import javafx.css.converter.BooleanConverter;
import javafx.css.converter.EnumConverter;

import de.gsi.chart.axes.Axis;
import de.gsi.chart.axes.spi.DefaultNumericAxis;
import de.gsi.chart.legend.Legend;
import de.gsi.chart.legend.spi.DefaultLegend;
import de.gsi.chart.plugins.ChartPlugin;
import de.gsi.chart.renderer.Renderer;
import de.gsi.chart.renderer.spi.LabelledMarkerRenderer;
import de.gsi.chart.ui.ChartLayoutAnimator;
import de.gsi.chart.ui.HiddenSidesPane;
import de.gsi.chart.ui.ResizableCanvas;
import de.gsi.chart.ui.css.StylishBooleanProperty;
import de.gsi.chart.ui.css.StylishObjectProperty;
import de.gsi.chart.ui.geometry.Corner;
import de.gsi.chart.ui.geometry.Side;
import de.gsi.chart.utils.FXUtils;
import de.gsi.chart.utils.ToolBarShapeHelper;
import de.gsi.dataset.DataSet;
import de.gsi.dataset.event.EventListener;
import de.gsi.dataset.utils.AssertUtils;
Expand Down Expand Up @@ -58,6 +56,8 @@
import javafx.css.Styleable;
import javafx.css.StyleableObjectProperty;
import javafx.css.StyleableProperty;
import javafx.css.converter.BooleanConverter;
import javafx.css.converter.EnumConverter;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Orientation;
Expand Down Expand Up @@ -100,7 +100,7 @@ public abstract class Chart extends HiddenSidesPane implements Observable {
private static final Logger LOGGER = LoggerFactory.getLogger(Chart.class);
private static final String CHART_CSS = Chart.class.getResource("chart.css").toExternalForm();
private static final int DEFAULT_TRIGGER_DISTANCE = 50;
protected static boolean DEBUG = false; // for more verbose debugging
protected static boolean DEBUG; // for more verbose debugging

protected BooleanBinding showingBinding;
protected final BooleanProperty showing = new SimpleBooleanProperty(this, "showing", false);
Expand All @@ -119,9 +119,9 @@ public abstract class Chart extends HiddenSidesPane implements Observable {
});

// isCanvasChangeRequested is a recursion guard to update canvas only once
protected boolean isCanvasChangeRequested = false;
protected boolean isCanvasChangeRequested;
// layoutOngoing is a recursion guard to update canvas only once
protected boolean layoutOngoing = false;
protected boolean layoutOngoing;
protected final ObservableList<Axis> axesList = FXCollections.observableArrayList();
private final Map<ChartPlugin, Group> pluginGroups = new ConcurrentHashMap<>();
private final ObservableList<ChartPlugin> plugins = FXCollections.observableList(new LinkedList<>());
Expand All @@ -139,7 +139,7 @@ public abstract class Chart extends HiddenSidesPane implements Observable {
protected final GridPane axesAndCanvasPane = new GridPane();
protected final Group pluginsArea = Chart.createChildGroup();

protected boolean isAxesUpdate = false;
protected boolean isAxesUpdate;
// containing the plugin handler/modifier
protected final FlowPane toolBar = new FlowPane();
protected final BooleanProperty toolBarPinned = new SimpleBooleanProperty(this, "toolBarPinned", false);
Expand Down Expand Up @@ -518,19 +518,27 @@ public Chart() {
new Background(new BackgroundFill(Color.web("#f4f4f4", 0.85).deriveColor(0, 1.0, .94, 1.0),
new CornerRadii(0, 0, 10, 10, false), Insets.EMPTY)));
toolBar.setMinHeight(0);
final Insets toolBarPadding = new Insets(1, 12.5, 5, 12.5);
toolBar.setShape(ToolBarShapeHelper.getToolBarShape(toolBar.getWidth(), toolBar.getHeight(), 25));
ChangeListener<Number> toolBarSizeListener = (ch, o, n) -> {
if (n.equals(o)) {
return;
}
toolBar.setShape(ToolBarShapeHelper.getToolBarShape(toolBar.getWidth(), toolBar.getHeight(), 25));
};
toolBar.widthProperty().addListener(toolBarSizeListener);
toolBar.heightProperty().addListener(toolBarSizeListener);
toolBar.setPrefWidth(-1);
toolBar.setAlignment(Pos.TOP_CENTER);
toolBar.setMinWidth(0);
toolBar.setPadding(new Insets(1, 8, 6, 8));
toolBar.setPadding(toolBarPadding);
VBox.setVgrow(toolBar, Priority.ALWAYS);
HBox topbox = new HBox();
topbox.setAlignment(Pos.TOP_CENTER);
topbox.getChildren().add(getToolBar());
HBox.setHgrow(toolBar, Priority.NEVER);
setTop(topbox);
getToolBar().setOnMouseClicked(mevt -> {
toolBarPinned.set(!toolBarPinned.get());
});
getToolBar().setOnMouseClicked(mevt -> toolBarPinned.set(!toolBarPinned.get()));
toolBarPinned.addListener((obj, valOld, valNew) -> {
if (valNew) {
this.setPinnedSide(javafx.geometry.Side.TOP);
Expand Down Expand Up @@ -858,9 +866,11 @@ public final ObjectProperty<Side> measurementBarSideProperty() {
public BooleanProperty toolBarPinnedProperty() {
return toolBarPinned;
}
public boolean getToolBarPinned() {

public boolean getToolBarPinned() { // NOPMD
return toolBarPinned.get();
}

public Chart setToolBarPinned(boolean value) {
toolBarPinned.set(value);
return this;
Expand Down Expand Up @@ -1131,6 +1141,7 @@ protected void registerShowingListener() {
}
if (oldScene != null) {
// remove listener

}

if (newScene == null) {
Expand All @@ -1150,7 +1161,7 @@ protected void registerShowingListener() {
});
});
showing.addListener((ch, o, n) -> {
if (o == n) {
if (n.equals(n)) {
return;
}
if (n) {
Expand Down
2 changes: 1 addition & 1 deletion chartfx-chart/src/main/java/de/gsi/chart/utils/StyleParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* @author rstein
*/
public final class StyleParser {
public final class StyleParser { // NOPMD
private static final Logger LOGGER = LoggerFactory.getLogger(StyleParser.class);
private static final int DEFAULT_FONT_SIZE = 18;
private static final String DEFAULT_FONT = "Helvetia";
Expand Down
47 changes: 47 additions & 0 deletions chartfx-chart/src/main/java/de/gsi/chart/utils/ToolBarShapeHelper.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package de.gsi.chart.utils;

import javafx.scene.shape.CubicCurveTo;
import javafx.scene.shape.LineTo;
import javafx.scene.shape.MoveTo;
import javafx.scene.shape.Path;
import javafx.scene.shape.Shape;

/**
* @author rstein
*/
public final class ToolBarShapeHelper {

private ToolBarShapeHelper() {

}

public static Shape getToolBarShape(final double width, final double height, final double radii) {
final double centreX = 0.0;
final double centreY = 0.0;
final double halfWidth = 0.5 * width + 2 * radii;
final double halfHeight = 0.5 * height;

Path path = new Path();

// go to left-top most corner
path.getElements().add(new MoveTo(centreX - halfWidth - 4 * radii, centreY - halfHeight));

// cubic sweep down
path.getElements().add(new CubicCurveTo(//
centreX - halfWidth - 0 * radii, centreY - halfHeight, // first control point
centreX - halfWidth - 4 * radii, centreY + halfHeight, // second control point
centreX - halfWidth + 0 * radii, centreY + halfHeight)); // to coordinate
// line on bottom
path.getElements().add(new LineTo(centreX + halfWidth, centreY + halfHeight));

// cubic sweep up
path.getElements().add(new CubicCurveTo(//
centreX + halfWidth + 4 * radii, centreY + halfHeight, // first control point
centreX + halfWidth + 0 * radii, centreY - halfHeight, // second control point
centreX + halfWidth + 4 * radii, centreY - halfHeight)); // to coordinate

// return to top left corner
path.getElements().add(new LineTo(centreX - halfWidth - 2 * radii, centreY - halfHeight));
return path;
}
}

0 comments on commit c20f699

Please sign in to comment.