Fix grid button

Author: fransjacobs

src/main/java/jcs/ui/layout/LayoutCanvas.java

@@ -88,8 +88,7 @@ public enum Mode {
     CONTROL
   }
 
-  static final int LINE_GRID = 0;
-  static final int DOT_GRID = 1;
+  static final int LINE_GRID = 1;
 
   private int gridType = LINE_GRID;
 
@@ -120,8 +119,8 @@ public LayoutCanvas(boolean readonly) {
     setDoubleBuffered(true);
 
     this.readonly = readonly;
+    drawGrid = !readonly;
     this.executor = Executors.newSingleThreadExecutor();
-    //this.executor = Executors.newCachedThreadPool();
 
     this.mode = Mode.SELECT;
     this.orientation = Orientation.EAST;
@@ -145,12 +144,14 @@ public void paint(Graphics g) {
     super.paint(g);
 
     if (drawGrid) {
-      if (this.gridType == LINE_GRID) {
-        paintLineGrid(g);
-      } else {
-        paintDotGrid(g);
+      switch (gridType) {
+        case 1 ->
+          paintLineGrid(g);
+        case 2 ->
+          paintDotGrid(g);
+        //default -> no grid
       }
-    }
+   }
 
     //long now = System.currentTimeMillis();
     //Logger.trace("Duration: " + (now - started) + " ms.");
@@ -216,19 +217,9 @@ void setMode(LayoutCanvas.Mode mode) {
     Logger.trace("Mode: " + mode);
   }
 
-  void setDrawGrid(boolean flag) {
-    if (flag) {
-      switch (gridType) {
-        case LINE_GRID ->
-          gridType = DOT_GRID;
-        case DOT_GRID ->
-          gridType = LINE_GRID;
-        default ->
-          gridType = LINE_GRID;
-      }
-    }
-    drawGrid = flag;
-    repaint();
+  void setGridType(int gridType) {
+    this.gridType = gridType;
+    executor.execute((() -> repaint()));
   }
 
   void setTileType(TileBean.TileType tileType) {

src/main/java/jcs/ui/layout/LayoutPanel.form

@@ -317,16 +317,24 @@
                 <AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.HorizontalStrut"/>
               </AuxValues>
             </Component>
-            <Component class="javax.swing.JToggleButton" name="gridBtn">
+            <Component class="javax.swing.JButton" name="gridBtn">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/media/grid-2-24.png"/>
+                  <Image iconType="3" name="/media/square-grid-24.png"/>
                 </Property>
-                <Property name="selected" type="boolean" value="true"/>
-                <Property name="toolTipText" type="java.lang.String" value="Show Grid"/>
+                <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
-                <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/media/grid-dot-24.png"/>
+                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
+                  <Insets value="[2, 2, 2, 2]"/>
+                </Property>
+                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[38, 38]"/>
+                </Property>
+                <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[38, 38]"/>
+                </Property>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[38, 38]"/>
                 </Property>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>

src/main/java/jcs/ui/layout/LayoutPanel.java

@@ -18,6 +18,7 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
@@ -55,121 +56,131 @@
  *
  */
 public class LayoutPanel extends JPanel {
-
+  
   private static final long serialVersionUID = 2275543202224445302L;
-
+  
   private final boolean readonly;
-
+  
+  private int gridType;
+  
+  private static final String GRID_0 = "/media/square-grid-24.png";
+  private static final String GRID_1 = "/media/grid-2-24.png";
+  private static final String GRID_2 = "/media/grid-dot-24.png";
+  
   public LayoutPanel() {
     this(false);
   }
-
+  
   public LayoutPanel(boolean readonly) {
     this.readonly = readonly;
     initComponents();
     postInit();
   }
-
+  
   private void postInit() {
     RunUtil.loadProperties();
-
-    this.straightBtn.setSelected(true);
-    this.canvas.setTileType(TileType.STRAIGHT);
-    this.setMode(readonly ? LayoutCanvas.Mode.CONTROL : LayoutCanvas.Mode.SELECT);
-
+    
+    straightBtn.setSelected(true);
+    canvas.setTileType(TileType.STRAIGHT);
+    setMode(readonly ? LayoutCanvas.Mode.CONTROL : LayoutCanvas.Mode.SELECT);
+    
     if (readonly) {
-      this.canvas.setDrawGrid(!readonly);
-
+      //this.canvas.setDrawGrid(!readonly);
+      this.canvas.setGridType(0);
+      
       this.loadBtn.setEnabled(!readonly);
       this.loadBtn.setVisible(!readonly);
       this.toolBar.remove(this.loadBtn);
-
+      
       this.routeBtn.setEnabled(readonly);
       this.routeBtn.setVisible(readonly);
-
+      
       this.selectBtn.setEnabled(!readonly);
       this.selectBtn.setVisible(!readonly);
       this.toolBar.remove(this.selectBtn);
-
+      
       this.addBtn.setEnabled(!readonly);
       this.addBtn.setVisible(!readonly);
-
+      
       this.deleteBtn.setEnabled(!readonly);
       this.deleteBtn.setVisible(!readonly);
-
+      
       this.gridBtn.setEnabled(!readonly);
       this.gridBtn.setVisible(!readonly);
-
+      
       this.straightBtn.setEnabled(!readonly);
       this.straightBtn.setVisible(!readonly);
-
+      
       this.curvedBtn.setEnabled(!readonly);
       this.curvedBtn.setVisible(!readonly);
-
+      
       this.blockBtn.setEnabled(!readonly);
       this.blockBtn.setVisible(!readonly);
-
+      
       this.sensorBtn.setEnabled(!readonly);
       this.sensorBtn.setVisible(!readonly);
-
+      
       this.signalBtn.setEnabled(!readonly);
       this.signalBtn.setVisible(!readonly);
-
+      
       this.leftSwitchBtn.setEnabled(!readonly);
       this.leftSwitchBtn.setVisible(!readonly);
-
+      
       this.rightSwitchBtn.setEnabled(!readonly);
       this.rightSwitchBtn.setVisible(!readonly);
-
+      
       this.crossLBtn.setEnabled(!readonly);
       this.crossLBtn.setVisible(!readonly);
-
+      
       this.crossRBtn.setEnabled(!readonly);
       this.crossRBtn.setVisible(!readonly);
-
+      
       this.endTrackBtn.setEnabled(!readonly);
       this.endTrackBtn.setVisible(!readonly);
-
+      
       this.straightDirectionBtn.setEnabled(!readonly);
       this.straightDirectionBtn.setVisible(!readonly);
-
+      
       this.crossingBtn.setEnabled(!readonly);
       this.crossingBtn.setVisible(!readonly);
-
+      
       this.flipVerticalBtn.setEnabled(!readonly);
       this.flipVerticalBtn.setVisible(!readonly);
-
+      
       this.flipHorizontalBtn.setEnabled(!readonly);
       this.flipHorizontalBtn.setVisible(!readonly);
+    } else {
+      gridType = 1;
+      gridBtn.setIcon(new ImageIcon(getClass().getResource(GRID_1)));
+      canvas.setGridType(gridType);
     }
-    this.toolBar.remove(this.autoPilotBtn);
-    this.toolBar.remove(this.resetAutopilotBtn);
-    this.toolBar.remove(this.startAllLocomotivesBtn);
-
+    toolBar.remove(autoPilotBtn);
+    toolBar.remove(resetAutopilotBtn);
+    toolBar.remove(startAllLocomotivesBtn);
+    
     if (readonly) {
       loadLayout();
       Powerlistener powerlistener = new Powerlistener();
       JCS.getJcsCommandStation().addPowerEventListener(powerlistener);
     }
-
   }
-
+  
   public void loadLayout() {
     canvas.loadLayoutInBackground();
   }
-
+  
   public void rotateSelectedTile() {
     canvas.rotateSelectedTile();
   }
-
+  
   public void flipSelectedTileHorizontal() {
     canvas.flipSelectedTileHorizontal();
   }
-
+  
   public void flipSelectedTileVerical() {
     canvas.flipSelectedTileVertical();
   }
-
+  
   public void deleteSelectedTile() {
     canvas.deleteSelectedTile();
   }
@@ -204,7 +215,7 @@ private void initComponents() {
     startAllLocomotivesBtn = new JToggleButton();
     resetAutopilotBtn = new JButton();
     filler1 = new Box.Filler(new Dimension(20, 0), new Dimension(20, 0), new Dimension(20, 32767));
-    gridBtn = new JToggleButton();
+    gridBtn = new JButton();
     filler2 = new Box.Filler(new Dimension(20, 0), new Dimension(20, 0), new Dimension(20, 32767));
     selectBtn = new JButton();
     addBtn = new JButton();
@@ -420,11 +431,13 @@ public void actionPerformed(ActionEvent evt) {
     toolBar.add(resetAutopilotBtn);
     toolBar.add(filler1);
 
-    gridBtn.setIcon(new ImageIcon(getClass().getResource("/media/grid-2-24.png"))); // NOI18N
-    gridBtn.setSelected(true);
-    gridBtn.setToolTipText("Show Grid");
+    gridBtn.setIcon(new ImageIcon(getClass().getResource("/media/square-grid-24.png"))); // NOI18N
+    gridBtn.setFocusable(false);
     gridBtn.setHorizontalTextPosition(SwingConstants.CENTER);
-    gridBtn.setSelectedIcon(new ImageIcon(getClass().getResource("/media/grid-dot-24.png"))); // NOI18N
+    gridBtn.setMargin(new Insets(2, 2, 2, 2));
+    gridBtn.setMaximumSize(new Dimension(38, 38));
+    gridBtn.setMinimumSize(new Dimension(38, 38));
+    gridBtn.setPreferredSize(new Dimension(38, 38));
     gridBtn.setVerticalTextPosition(SwingConstants.BOTTOM);
     gridBtn.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent evt) {
@@ -845,10 +858,6 @@ private void sensorBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:event_sensor
       setTileType(TileBean.TileType.SENSOR);
     }//GEN-LAST:event_sensorBtnActionPerformed
 
-    private void gridBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:event_gridBtnActionPerformed
-      this.canvas.setDrawGrid(this.gridBtn.isSelected());
-    }//GEN-LAST:event_gridBtnActionPerformed
-
     private void formComponentResized(ComponentEvent evt) {//GEN-FIRST:event_formComponentResized
       //TODO!       
       //Logger.debug(evt.getComponent().getSize());// TODO add your handling code here:
@@ -895,7 +904,7 @@ private void endTrackBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:event_endT
 
   private void autoPilotBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:event_autoPilotBtnActionPerformed
     Logger.trace(evt.getActionCommand() + (autoPilotBtn.isSelected() ? " Enable" : " Disable") + " Auto mode");
-
+    
     if (autoPilotBtn.isSelected()) {
       startAllLocomotivesBtn.setEnabled(true);
     } else {
@@ -904,7 +913,7 @@ private void autoPilotBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:event_aut
       //}
       startAllLocomotivesBtn.setEnabled(false);
     }
-
+    
     AutoPilot.runAutoPilot(autoPilotBtn.isSelected());
   }//GEN-LAST:event_autoPilotBtnActionPerformed
 
@@ -923,18 +932,38 @@ private void resetAutopilotBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:even
     AutoPilot.reset();
   }//GEN-LAST:event_resetAutopilotBtnActionPerformed
 
+  private void gridBtnActionPerformed(ActionEvent evt) {//GEN-FIRST:event_gridBtnActionPerformed
+    gridType++;
+    if (gridType > 2) {
+      gridType = 0;
+    }
+    switch (gridType) {
+
+      case 0 -> {
+        gridBtn.setIcon(new ImageIcon(getClass().getResource(GRID_0)));
+      }
+      case 1 -> {
+        gridBtn.setIcon(new ImageIcon(getClass().getResource(GRID_1)));
+      }
+      case 2 -> {
+        gridBtn.setIcon(new ImageIcon(getClass().getResource(GRID_2)));
+      }
+    }
+    canvas.setGridType(gridType);
+  }//GEN-LAST:event_gridBtnActionPerformed
+
   private void setTileType(TileBean.TileType tileType) {
     canvas.setTileType(tileType);
   }
-
+  
   private void setDirection(Direction direction) {
     canvas.setDirection(direction);
   }
-
+  
   public void showRoutes() {
     canvas.showRoutesDialog();
   }
-
+  
   public void setMode(LayoutCanvas.Mode mode) {
     switch (mode) {
       case SELECT -> {
@@ -958,12 +987,12 @@ public void setMode(LayoutCanvas.Mode mode) {
         deleteBtn.setIcon(new ImageIcon(getClass().getResource("/media/delete-24.png")));
       }
     }
-
+    
     canvas.setMode(mode);
   }
-
+  
   private class Powerlistener implements PowerEventListener {
-
+    
     @Override
     public void onPowerChange(PowerEvent event) {
       //Logger.info("Track Power is " + (event.isPower() ? "on" : "off"));
@@ -998,7 +1027,7 @@ public void onPowerChange(PowerEvent event) {
   private JMenuItem flipHorizontalMI;
   private JButton flipVerticalBtn;
   private JMenuItem flipVerticalMI;
-  private JToggleButton gridBtn;
+  private JButton gridBtn;
   private JMenuItem horizontalMI;
   private JMenuItem leftMI;
   private JToggleButton leftSwitchBtn;