Fixed reading of external files & display as second projection

OSUCartography · Apr 2, 2017 · ad2949b · ad2949b
1 parent afaaa25
commit ad2949b
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 81 deletions.
diff --git a/build/classes/ika/app/Application.properties b/build/classes/ika/app/Application.properties
@@ -10,7 +10,7 @@ PreferencesPanel=ika.gui.FlexProjectorPreferencesPanel
 #The version of the application, numbers only in the format X.Y.Z, e.g. "1.12.5"
 #The last number is optional, i.e. "1.12" is valid.
 #The numbers can be followed by a string, such as "0.12 alpha"
-ApplicationVersion=1.0.3
+ApplicationVersion=1.0.6
 
 #a small icon for display in information dialogs
 ApplicationIcon=logo64x64.png

diff --git a/build/classes/ika/data/projections.txt b/build/classes/ika/data/projections.txt
@@ -12,11 +12,12 @@ Eckert IV, true
 Eckert V, true
 Eckert VI, true
 Eckert-Greifendorff, true, approx
-Equidistant Cylindrical (Plate Carrée), true
+Equirectangular, true
 Fahey, true, approx
 Foucaut, true, 
 Foucaut Sinusoidal, true
 Gall (Gall Stereographic), true
+Gall-Peters, true
 Ginzburg VIII (TsNIIGAiK 1944), true
 Goode Homolosine, true
 Hammer, true, approx

diff --git a/src/ika/app/Application.properties b/src/ika/app/Application.properties
@@ -10,7 +10,7 @@ PreferencesPanel=ika.gui.FlexProjectorPreferencesPanel
 #The version of the application, numbers only in the format X.Y.Z, e.g. "1.12.5"
 #The last number is optional, i.e. "1.12" is valid.
 #The numbers can be followed by a string, such as "0.12 alpha"
-ApplicationVersion=1.0.5
+ApplicationVersion=1.0.6
 
 #a small icon for display in information dialogs
 ApplicationIcon=logo64x64.png

diff --git a/src/ika/geo/FlexProjectorModel.java b/src/ika/geo/FlexProjectorModel.java
@@ -91,7 +91,7 @@ public class DisplayModel implements Serializable {
         /**
          * An array containing the information displayed by the distortion table.
          * Access to distParams must be synchronized as it is used by two threads.
-         * One thread is the Event Dispatching Thread, the other one is a Swingworker
+         * One thread is the Event Dispatching Thread, the other one is a SwingWorker
          * thread that fills the table with distortion indices.
          * Synchronization: synchronized (distParams) {...}
          * Using a Vector that is internally synchronized instead of an ArrayList is
@@ -125,8 +125,6 @@ public ProjectionDistortionParameters getDistortionParameters(Projection proj) {
             for (ProjectionDistortionParameters p : distParams) {
                 Class c1 = p.getProjection().getClass();
                 Class c2 = proj.getClass();
-                System.out.println(c1); // FIXME
-                System.out.println(c2);
                 if (c1 == c2) {
                     return p;
                 }

diff --git a/src/ika/gui/ProjectionBrewerPanel.form b/src/ika/gui/ProjectionBrewerPanel.form
@@ -750,7 +750,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,116,0,0,1,-114"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,116,0,0,3,74"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -1481,7 +1481,7 @@
                               <Layout>
                                 <DimensionLayout dim="0">
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <EmptySpace min="0" pref="377" max="32767" attributes="0"/>
+                                      <EmptySpace min="0" pref="821" max="32767" attributes="0"/>
                                   </Group>
                                 </DimensionLayout>
                                 <DimensionLayout dim="1">
@@ -1569,7 +1569,7 @@
                               <Layout>
                                 <DimensionLayout dim="0">
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <EmptySpace min="0" pref="377" max="32767" attributes="0"/>
+                                      <EmptySpace min="0" pref="821" max="32767" attributes="0"/>
                                   </Group>
                                 </DimensionLayout>
                                 <DimensionLayout dim="1">
@@ -2475,7 +2475,6 @@
                 </Component>
                 <Component class="javax.swing.JComboBox" name="tissotComboBox">
                   <Properties>
-                    <Property name="editable" type="boolean" value="true"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="6">
                         <StringItem index="0" value="5"/>
@@ -2551,7 +2550,6 @@
                 </Component>
                 <Component class="javax.swing.JComboBox" name="graticuleComboBox">
                   <Properties>
-                    <Property name="editable" type="boolean" value="true"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                       <StringArray count="6">
                         <StringItem index="0" value="5"/>
@@ -2596,7 +2594,7 @@
                     </Constraint>
                   </Constraints>
                 </Component>
-                <Component class="javax.swing.JComboBox" name="projectionComboBox">
+                <Component class="javax.swing.JComboBox" name="secondProjectionComboBox">
                   <Properties>
                     <Property name="maximumRowCount" type="int" value="25"/>
                     <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
@@ -2607,11 +2605,11 @@
                       <Dimension value="[150, 27]"/>
                     </Property>
                     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-                      <Connection code="GUIUtil.getPreferredSize(projectionComboBox, 250)" type="code"/>
+                      <Connection code="GUIUtil.getPreferredSize(secondProjectionComboBox, 250)" type="code"/>
                     </Property>
                   </Properties>
                   <Events>
-                    <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="projectionComboBoxItemStateChanged"/>
+                    <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="secondProjectionComboBoxItemStateChanged"/>
                   </Events>
                   <Constraints>
                     <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -2755,7 +2753,7 @@
                 </Component>
                 <Component class="javax.swing.JLabel" name="angularIsolinesEquidistanceLabel">
                   <Properties>
-                    <Property name="text" type="java.lang.String" value="Equidistance:"/>
+                    <Property name="text" type="java.lang.String" value="Interval:"/>
                   </Properties>
                   <Constraints>
                     <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -2811,7 +2809,7 @@
                 </Component>
                 <Component class="javax.swing.JLabel" name="arealIsolinesEquidistanceLabel">
                   <Properties>
-                    <Property name="text" type="java.lang.String" value="Equidistance:"/>
+                    <Property name="text" type="java.lang.String" value="Interval:"/>
                   </Properties>
                   <Constraints>
                     <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -2832,10 +2830,7 @@
                       </StringArray>
                     </Property>
                     <Property name="selectedIndex" type="int" value="2"/>
-                    <Property name="toolTipText" type="java.lang.String" value="The equidistance between two isolines."/>
-                    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                      <Dimension value="[50, 27]"/>
-                    </Property>
+                    <Property name="toolTipText" type="java.lang.String" value="The interval between two isolines."/>
                     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
                       <Connection code="GUIUtil.getPreferredSize(arealIsolinesEquidistanceComboBox, COMBO_BOX_WIDTH)" type="code"/>
                     </Property>