From de77f98f619128b796492ac72073098a9603e53e Mon Sep 17 00:00:00 2001
From: savagex <savagex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 18 May 2008 15:02:16 +0000
Subject: [PATCH] check sanity of height values for terrain and sky

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3637 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 tools/ImgToMap/src/imgtomap/JFrameMain.form | 31 ++++++--------
 tools/ImgToMap/src/imgtomap/JFrameMain.java | 46 ++++++++++++++-------
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/tools/ImgToMap/src/imgtomap/JFrameMain.form b/tools/ImgToMap/src/imgtomap/JFrameMain.form
index fdc9ce614..512e789e5 100644
--- a/tools/ImgToMap/src/imgtomap/JFrameMain.form
+++ b/tools/ImgToMap/src/imgtomap/JFrameMain.form
@@ -23,25 +23,12 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="103" alignment="1" groupAlignment="1" attributes="0">
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jPanelSky" max="32767" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jPanel2" max="32767" attributes="0"/>
-                      </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jPanel1" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jButtonOK" min="-2" max="-2" attributes="0"/>
-                  </Group>
+                  <Component id="jPanelSky" alignment="0" max="32767" attributes="0"/>
+                  <Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
+                  <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
+                  <Component id="jButtonOK" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -236,6 +223,9 @@
               <SpinnerModel initial="1024" maximum="16384" minimum="256" numberType="java.lang.Integer" stepSize="1" type="number"/>
             </Property>
           </Properties>
+          <Events>
+            <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="jSpinnerHeightStateChanged"/>
+          </Events>
         </Component>
         <Component class="javax.swing.JSpinner" name="jSpinnerTextureScale">
           <Properties>
@@ -285,7 +275,7 @@
                       <Group type="102" alignment="0" attributes="0">
                           <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jSpinnerSkyHeight" min="-2" max="-2" attributes="0"/>
+                          <Component id="jSpinnerSkyHeight" min="-2" pref="82" max="-2" attributes="0"/>
                       </Group>
                       <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
@@ -335,6 +325,9 @@
               <SpinnerModel initial="1152" minimum="256" numberType="java.lang.Integer" stepSize="1" type="number"/>
             </Property>
           </Properties>
+          <Events>
+            <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="jSpinnerSkyHeightStateChanged"/>
+          </Events>
         </Component>
         <Component class="javax.swing.JCheckBox" name="jCheckBoxSkyFill">
           <Properties>
diff --git a/tools/ImgToMap/src/imgtomap/JFrameMain.java b/tools/ImgToMap/src/imgtomap/JFrameMain.java
index 48817026a..c920aac59 100644
--- a/tools/ImgToMap/src/imgtomap/JFrameMain.java
+++ b/tools/ImgToMap/src/imgtomap/JFrameMain.java
@@ -130,6 +130,11 @@ public class JFrameMain extends javax.swing.JFrame {
         jSpinnerUnits.setModel(new javax.swing.SpinnerNumberModel(256, 1, 2048, 1));
 
         jSpinnerHeight.setModel(new javax.swing.SpinnerNumberModel(1024, 256, 16384, 1));
+        jSpinnerHeight.addChangeListener(new javax.swing.event.ChangeListener() {
+            public void stateChanged(javax.swing.event.ChangeEvent evt) {
+                jSpinnerHeightStateChanged(evt);
+            }
+        });
 
         jSpinnerTextureScale.setModel(new javax.swing.SpinnerNumberModel(0.5d, 0.25d, 16.0d, 0.25d));
 
@@ -198,6 +203,11 @@ public class JFrameMain extends javax.swing.JFrame {
         jLabel5.setText("Sky height:");
 
         jSpinnerSkyHeight.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(1152), Integer.valueOf(256), null, Integer.valueOf(1)));
+        jSpinnerSkyHeight.addChangeListener(new javax.swing.event.ChangeListener() {
+            public void stateChanged(javax.swing.event.ChangeEvent evt) {
+                jSpinnerSkyHeightStateChanged(evt);
+            }
+        });
 
         jCheckBoxSkyFill.setSelected(true);
         jCheckBoxSkyFill.setText("fill alpha-gaps with sky");
@@ -221,7 +231,7 @@ public class JFrameMain extends javax.swing.JFrame {
                     .addGroup(jPanelSkyLayout.createSequentialGroup()
                         .addComponent(jLabel5)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jSpinnerSkyHeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(jSpinnerSkyHeight, javax.swing.GroupLayout.PREFERRED_SIZE, 82, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addComponent(jLabel6))
                 .addContainerGap())
         );
@@ -247,20 +257,12 @@ public class JFrameMain extends javax.swing.JFrame {
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                        .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                            .addContainerGap()
-                            .addComponent(jPanelSky, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                        .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                            .addContainerGap()
-                            .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                        .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                            .addContainerGap()
-                            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
-                    .addGroup(layout.createSequentialGroup()
-                        .addContainerGap()
-                        .addComponent(jButtonOK)))
+                    .addComponent(jPanelSky, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jButtonOK))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -331,6 +333,22 @@ private void jCheckBoxSkyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
     enableSkyPanel(jCheckBoxSky.isSelected());
 }//GEN-LAST:event_jCheckBoxSkyActionPerformed
 
+private void jSpinnerHeightStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_jSpinnerHeightStateChanged
+    int value = (Integer)jSpinnerHeight.getValue();
+    int skyheight = (Integer)jSpinnerSkyHeight.getValue();
+    if(skyheight < value) {
+        jSpinnerSkyHeight.setValue(value);
+    }
+}//GEN-LAST:event_jSpinnerHeightStateChanged
+
+private void jSpinnerSkyHeightStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_jSpinnerSkyHeightStateChanged
+    int value =(Integer)jSpinnerSkyHeight.getValue();
+    int height = (Integer)jSpinnerHeight.getValue();
+    if(height > value) {
+        jSpinnerHeight.setValue(value);
+    }
+}//GEN-LAST:event_jSpinnerSkyHeightStateChanged
+
 private void enableSkyPanel(boolean b) {
     jCheckBoxSkyFill.setEnabled(b);
     jSpinnerSkyHeight.setEnabled(b);
-- 
2.39.2