Browse Source

Made several small fixes

- Added ESC keyboard shortcut for deselecting toolbox row/resetting
selection model

- Debug.out with log level adds text to the console window now (adaptive
to severity)

- feedback when editing property and using the wrong type in console
window

- changed some version numbers

- small fix in options manager (two elements on top of each other)
Julian Ohl 7 years ago
parent
commit
88a9d136e4

+ 7 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/debug/Debug.java

@@ -79,7 +79,6 @@ public final class Debug {
 	public static void out(String s) {
 		if (DEBUG_ENABLED) {
 			System.out.println(s);
-			Platform.runLater(() -> ConsoleManager.addNormalText(s));
 		}
 	}
 
@@ -97,6 +96,13 @@ public final class Debug {
 	public static void out(String s, int severity) {
 		if (DEBUG_ENABLED && severity >= logLevel) {
 			System.out.println(s);
+			
+			if(severity < 3){
+				Platform.runLater(() -> ConsoleManager.addNormalText(s));
+			}
+			else{
+				Platform.runLater(() -> ConsoleManager.addErrorText(s));
+			}
 		}
 	}
 

+ 1 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GUIController.java

@@ -232,7 +232,7 @@ public class GUIController implements Initializable {
 		initializeWorldView();
 
 		// Setup the Keyboard Shortcuts
-		KeyboardShortcuts.initialize(Main.getInstance().getPrimaryStage());
+		KeyboardShortcuts.initialize(Main.getInstance().getPrimaryStage(), this);
 
 	}
 

+ 2 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/OptionsManager.java

@@ -171,7 +171,8 @@ public final class OptionsManager {
 
 		grid.add(new Label("Clicked Waypoint Color"), 0, row);
 		grid.add(waypointSelectedColorSymbolLayer, 1, row);
-
+		
+		row++;
 		grid.add(new Label("Logging level"), 0, row);
 		grid.add(loggingLevelSelector, 1, row);
 		row++;

+ 1 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/PropertiesManager.java

@@ -181,7 +181,7 @@ public final class PropertiesManager {
 				editedPair.setValue(oldValue);
 				t.getTableView().getItems().get(t.getTablePosition().getRow()).setKey(oldValue);
 				setItemsProperties();
-				Debug.out("invalid input for this attribute type");
+				Debug.out("invalid input for this attribute type", 1);
 			}
 
 			// Unselect row after updating Property

+ 1 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ToolboxManager.java

@@ -28,7 +28,7 @@ import javafx.util.Pair;
  * Manager for the Toolbox pane.
  * 
  * @author Dominik Renkel
- * @version 1.1
+ * @version 2.0
  *
  */
 public final class ToolboxManager {

+ 18 - 4
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/handlers/KeyboardShortcuts.java

@@ -4,6 +4,7 @@ import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
 import de.tu_darmstadt.informatik.tk.scopviz.main.CreationMode;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
+import de.tu_darmstadt.informatik.tk.scopviz.ui.GUIController;
 import javafx.event.EventHandler;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
@@ -16,11 +17,16 @@ import javafx.stage.Stage;
  * actions in the menu bar should be defined in the fxml file as accelerators.
  * 
  * @author Julian Ohl (julian.ohl95@web.de)
- * @version 1.0
+ * @version 1.3
  *
  */
 public final class KeyboardShortcuts {
 
+	/**
+	 * Reference to the GUI Controller for Access to various GUI Elements.
+	 */
+	private static GUIController controller;
+	
 	// example of keycombinations
 	final static KeyCombination mShift = new KeyCodeCombination(KeyCode.M, KeyCombination.SHIFT_DOWN);
 	final static KeyCombination rAltShift = new KeyCodeCombination(KeyCode.R, KeyCombination.ALT_DOWN,
@@ -38,8 +44,9 @@ public final class KeyboardShortcuts {
 	 * @param primaryStage
 	 *            the Stage
 	 */
-	public static void initialize(Stage primaryStage) {
-
+	public static void initialize(Stage primaryStage, GUIController c) {
+		
+		controller = c;
 		primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, buttonsPressed);
 		primaryStage.addEventFilter(KeyEvent.KEY_RELEASED, buttonsReleased);
 
@@ -63,7 +70,14 @@ public final class KeyboardShortcuts {
 				}
 
 			}
-
+			
+			if (event.getCode() == KeyCode.ESCAPE) {
+				
+				//clears toolbox selection/selectionmode
+				controller.toolbox.getSelectionModel().clearSelection();
+				Main.getInstance().getGraphManager().deselectEdgeCreationNodes();
+				
+			}
 		}
 	};