From 48ad6e1782185f86a550bec440fba435ad8d6f7e Mon Sep 17 00:00:00 2001
From: Andreas Bayha <bayha@fortiss.org>
Date: Thu, 12 Oct 2023 10:53:36 +0200
Subject: [PATCH] YELLOW
Issue-ref: 4319
Issue-URL: https://git.fortiss.org/af3/af3/-/issues/4319
Signed-off-by: Andreas Bayha <bayha@fortiss.org>
---
.../tooling/common/ui/javafx/lwfxef/.ratings | 2 +-
.../javafx/lwfxef/DiagramViewerFeatures.java | 25 ++++++++++++++++---
.../ui/javafx/lwfxef/controller/base/.ratings | 2 +-
.../base/DefaultDiagramController.java | 2 +-
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
index a4a53f6d1..12bcbb736 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/.ratings
@@ -2,7 +2,7 @@ DiagramCoordinate.java 6b00aec99054d4cd19003a72bd4e5e774ac6a641 GREEN
DiagramLayers.java aa1f95dbae290c8b00202abe4385b01b8f36e5ab GREEN
DiagramViewer.java 537358db18da8b5ba2bf56082bfd87dec3ca88d8 GREEN
DiagramViewerDefaultTags.java 6230763252409c60009ab8887b4ef582cf883229 GREEN
-DiagramViewerFeatures.java 8909375b7116fbd7386eb7d6d8c6f0618a0673ec YELLOW
+DiagramViewerFeatures.java b48515b91e81cb07b405a92ab02925815f128ce9 YELLOW
DiagramViewerSelection.java e833f592543bc97077907d980a39b123fc4044e6 GREEN
EDragGesture.java 5cfa098d3877db11981c2750e5e103156d62fc5e GREEN
FeedbackChange.java b088fa89af648f1674f2f9c1f7f99d585ce801ca GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewerFeatures.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewerFeatures.java
index 8909375b7..b48515b91 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewerFeatures.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/DiagramViewerFeatures.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019, 2020 fortiss GmbH.
+ * Copyright (c) 2019, 2020, 2023 fortiss GmbH.
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
@@ -51,7 +51,9 @@ public final class DiagramViewerFeatures {
/** The flag for drawing the outer border, which occupies the first grid row and lane. */
private boolean drawOuterBorder = true;
/** The indicator type. */
- private IndicatorType indicatorType = IndicatorType.INVISIBLE;
+ private IndicatorType currentIndicatorType = IndicatorType.INVISIBLE;
+ /** The indicator type to be used, when enabling the grid. */
+ private IndicatorType defaultIndicatorType = IndicatorType.CROSS;
/** The background color. */
private Color backgroundColor = LIGHTGRAY;
/** The help text for the diagram viewer in-place help */
@@ -149,15 +151,20 @@ public final class DiagramViewerFeatures {
/** Returns the indicator type. */
public IndicatorType getIndicatorType() {
- return indicatorType;
+ return currentIndicatorType;
}
/** Sets the indicator type. */
public void setIndicatorType(IndicatorType indicatorType) {
- this.indicatorType = indicatorType;
+ this.currentIndicatorType = indicatorType;
viewer.updateAllVisuals();
}
+ /** Sets the displayed indicator type to the default value. */
+ public void setIndicatorTypeToDefault() {
+ setIndicatorType(defaultIndicatorType);
+ }
+
/** Returns the background color. */
public Color getBackgroundColor() {
return backgroundColor;
@@ -316,4 +323,14 @@ public final class DiagramViewerFeatures {
public void setHelpText(String helpText) {
this.helpText = helpText;
}
+
+ /** Retrieves the indicator type to be used, when enabling indicators. */
+ public IndicatorType getDefaultIndicatorType() {
+ return defaultIndicatorType;
+ }
+
+ /** Sets the indicator type to be used when enabling the grid. */
+ public void setDefaultIndicatorType(IndicatorType defaultIndicatorType) {
+ this.defaultIndicatorType = defaultIndicatorType;
+ }
}
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
index 4d5eceb1c..b454b3e56 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
@@ -2,7 +2,7 @@ AnchorageContentControllerBase.java da56b10cbf2711b5da69f0b59f43eacbe54f4eea GRE
ClickControllerBase.java 8e5861ed5f9318008ad0fdd5497ed320cd5bd647 GREEN
ContentAnchorageMoveControllerBase.java c18e7915ce23e124757f5b736086ecc46694800a GREEN
ControllerBase.java 9311521b252e46640e26d409610e527fd5ed6922 GREEN
-DefaultDiagramController.java f0e8fbcf8201699cd6bf6ea79878d11f9ad62756 YELLOW
+DefaultDiagramController.java f30b755bc068d6f634b705b99a5cd31f8c8272b7 YELLOW
DelegatingContentAnchorageController.java 1889628a346a2183082ffe213978f9d15a949494 GREEN
DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN
DraggingUtils.java 95117e2ea4c36b6c6a31f8088bb95b484e0e6612 GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java
index f0e8fbcf8..f30b755bc 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/DefaultDiagramController.java
@@ -91,7 +91,7 @@ public class DefaultDiagramController extends ControllerBase {
});
} else {
gridMenuItem.setOnAction(evt -> {
- features.setIndicatorType(IndicatorType.CROSS);
+ features.setIndicatorTypeToDefault();
});
}
} else {
--
GitLab