Changeset 78 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

08/25/2017 02:22:49 PM (9 years ago)

Author:

bmcguffin

Message:

Changed algorithm that calculated minimum possible zoom.

Location:

trunk/src/scriptbuilder/gui

Files:

• IncidentEditorFrame.form (modified) (1 diff)
• IncidentEditorFrame.java (modified) (7 diffs)
• ScriptBuilderFrame.java (modified) (1 diff)
• application.properties (modified) (1 diff)

trunk/src/scriptbuilder/gui/IncidentEditorFrame.form

@@ -664 +664 @@
     <Component class="javax.swing.JSlider" name="zoomSlider">
       <Properties>
-        <Property name="maximum" type="int" value="21"/>
-        <Property name="minimum" type="int" value="5"/>
+        <Property name="maximum" type="int" value="22"/>
+        <Property name="minimum" type="int" value="4"/>
         <Property name="orientation" type="int" value="1"/>
-        <Property name="value" type="int" value="13"/>
+        <Property name="value" type="int" value="4"/>
         <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
           <Color id="Default Cursor"/>

trunk/src/scriptbuilder/gui/IncidentEditorFrame.java

@@ -266 +266 @@
         radioEvalButton.addKeyListener(new TimelineKeyListener());
 
-        // Hack to refresh the zoom
-        zoomSlider.setValue(zoomSlider.getValue() - 1);
-        zoomSlider.setValue(zoomSlider.getValue() + 1);
+//        // Hack to refresh the zoom
+//        zoomSlider.setValue(zoomSlider.getValue() - 1);
+//        zoomSlider.setValue(zoomSlider.getValue() + 1);
 
         // Set listener for scroll pane
@@ -299 +299 @@
         incidentName.setText(""+this.theIncident.name);
         incidentDescription.setText(""+this.theIncident.description);
+        zoomSlider.setValue(zoomSlider.getMinimum());
     }
 
@@ -356 +357 @@
         zoomSlider.setMinimum(((timelineTickPanel.getVisibleRect().width - 20)
                 * ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION)
-                / Math.max(theIncident.length, 1));
+                / Math.max(theIncident.length, ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH));
         zoomSlider.setMaximum(zoomSlider.getMinimum() + 20);
     }
@@ -717 +718 @@
         setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         setMinimumSize(new java.awt.Dimension(800, 700));
-        setPreferredSize(new java.awt.Dimension(945, 1545));
-        setSize(new java.awt.Dimension(800, 700));
 
         timelinesScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
@@ -805 +804 @@
         );
 
-        zoomSlider.setMaximum(21);
-        zoomSlider.setMinimum(5);
+        zoomSlider.setMaximum(22);
+        zoomSlider.setMinimum(4);
         zoomSlider.setOrientation(javax.swing.JSlider.VERTICAL);
-        zoomSlider.setValue(13);
+        zoomSlider.setValue(4);
         zoomSlider.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         zoomSlider.setFocusable(false);
@@ -832 +831 @@
         incidentDescriptionPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
 
+        incidentDescription.setEditable(false);
         incidentDescription.setColumns(20);
-        incidentDescription.setEditable(false);
         incidentDescription.setLineWrap(true);
         incidentDescription.setRows(5);
@@ -1329 +1328 @@
      */
     private void zoomSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_zoomSliderStateChanged
-        ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue() * 2;
+        ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue();
         this.update(null, theIncident);
         pack();

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -234 +234 @@
         zoomSlider.setMinimum(((timelineTickPanel.getVisibleRect().width - 20)
                 * ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION)
-                / Math.max(script.absoluteLength(), 1));
+                / Math.max(script.absoluteLength(), ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH));
         zoomSlider.setMaximum(zoomSlider.getMinimum() + 20);
     }

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Mon, 14 Aug 2017 16:52:48 -0700
+#Fri, 25 Aug 2017 15:10:59 -0700
 
 Application.revision=0
 
-Application.buildnumber=3
+Application.buildnumber=4