point toggle with g (must click on image first)

CSAFE-ISU · Feb 12, 2024 · 63c2aa7 · 63c2aa7
1 parent b129a4c
commit 63c2aa7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/CoordinateExporter/src/main/java/File_Uploader.java b/CoordinateExporter/src/main/java/File_Uploader.java
@@ -74,11 +74,6 @@ public void actionPerformed(ActionEvent e) {
         panel.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
-                if (e.getKeyCode() == KeyEvent.VK_TAB) { //tab to toggle selected ROI
-                    RoiManager coords = RoiManager.getRoiManager();
-                    coords.select(img, coords.getSelectedIndex() == 0 ? 1 : 0);
-                }
-
                 if (e.getKeyCode() == KeyEvent.VK_Q && ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0)
                         && ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0)) {
                     openForExport(); //ctrl + shift + Q to open export
@@ -90,6 +85,7 @@ public void keyPressed(KeyEvent e) {
     }
 
     public void openForImport() {
+        log.setText("Log: Importing...");
         imported.setCurrentDirectory(new File(System.getProperty("user.home")));
         imported.setFileFilter(new FileNameExtensionFilter("JSON files", "json"));
         int returnValue = imported.showOpenDialog(null);
@@ -99,11 +95,11 @@ public void openForImport() {
             String filePath = file.getAbsolutePath();
             coordControl.importCoords(filePath);
             importText.setText("Imported: " + filePath);
-            log.setText("Log: Importing...");
         }
     }
 
     public void openForExport() {
+        log.setText("Log: Exporting...");
         exported.setCurrentDirectory(new File(System.getProperty("user.home")));
         exported.setFileFilter(new FileNameExtensionFilter("JSON files", "json"));
         int returnValue = exported.showOpenDialog(null);
@@ -114,7 +110,6 @@ public void openForExport() {
             try {
                 coordControl.exportCoords(filePath);
                 exportText.setText("Exported: " + filePath);
-                log.setText("Log: Exporting...");
             } catch (IOException ex) {
                 throw new RuntimeException(ex);
             }

diff --git a/CoordinateExporter/src/main/java/PointSwapListener.java b/CoordinateExporter/src/main/java/PointSwapListener.java
@@ -11,7 +11,7 @@
 
 /**
  * Listens for a double click, and will search out the nearest point within a certain range to swap
- * its ROI between the "valid" and "invalid" ROIs.
+ * its ROI between the "valid" and "invalid" ROIs, or will swap the selected ROI.
  */
 public class PointSwapListener extends PointListener implements KeyListener {
 
@@ -27,6 +27,7 @@ public PointSwapListener(JLabel log) {
 
     @Override
     public void mouseClicked(MouseEvent e) {
+        KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
         if (qKeyPressed && this.toString().equals(address)) {
             changeClosestPoint(e.getX(), e.getY());
         }
@@ -99,8 +100,10 @@ public void changeClosestPoint(int x, int y) {
     }
 
     @Override
-    public void keyTyped(KeyEvent e) {
-        //NULL
+    public void keyTyped(KeyEvent e) { //Putting this here since it's just a single key press
+        if ((e.getKeyChar() == 'g' || e.getKeyChar() == 'G') && this.toString().equals(address)) {
+            roiManager.select(img, roiManager.getSelectedIndex() == 0 ? 1 : 0);
+        }
     }
 
     @Override