Minor tuning

Normand Briere

2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512

 BiparamEditor.java
..
..
@@ -67,11 +67,16 @@
67
67
 		oe.aConstraints.gridwidth = 1;
68
68
              */
69
69
             super.SetupUI2(oe);
70
-                
71
-            uDivsField = AddSlider(oe.ctrlPanel, "U #", biparam.minUDivs, 250+biparam.minUDivs, biparam.uDivs);
72
-            Return();
73
-            vDivsField = AddSlider(oe.ctrlPanel, "V #", biparam.minVDivs, (int)(500/3.14)+biparam.minVDivs, biparam.vDivs);
74
-            Return();
70
+                           
71
+            uvPanel = new cGridBag().setVertical(true);
72
+                    
73
+            int count = 50;
74
+            
75
+            uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, (int)(count*this.biparam.uStretch()) + biparam.minUDivs, biparam.uDivs).getComponent(1);
76
+            vDivsField = (cNumberSlider)AddSlider(uvPanel, "V #", biparam.minVDivs, (int)(count) + biparam.minVDivs, biparam.vDivs).getComponent(1);
77
+            
78
+            oe.ctrlPanel.add(uvPanel);
79
+            oe.ctrlPanel.Return();
75
80
 //		oe.aConstraints.gridwidth = 1;
76
81
 //		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
77
82
 //        oe.ctrlPanel.add(uDivsLabel = new JLabel("U #"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
..
..
@@ -98,17 +103,11 @@
98
103
 //		oe.aConstraints.gridwidth = 1;
99
104
         if (biparam instanceof Cone) // ends)
100
105
         {
101
-			oe.aConstraints.gridy += 1;
102
-			oe.aConstraints.gridwidth = 3;
103
-//			oe.aConstraints.anchor = GridBagConstraints.WEST;
104
-            oe.ctrlPanel.add(optionCB = new JCheckBox("Close Surface", biparam.endcaps), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
106
+            oe.ctrlPanel.add(optionCB = new JCheckBox("Close Surface", biparam.endcaps)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
105
107
 			optionCB.addItemListener(this);
106
-//			oe.aConstraints.anchor = GridBagConstraints.EAST;
107
-			oe.aConstraints.gridwidth = 1;
108
+oe.ctrlPanel.Return();
108
109
             //endcaps.setState(!biparam.endcaps);
109
110
         }
110
-		oe.aConstraints.gridy += 1;
111
-		oe.aConstraints.gridx = 0;
112
111
     }
113
112
 	
114
113
 	void Clear()
..
..
@@ -246,8 +245,9 @@
246
245
 //		oe.ctrlPanel.remove(uDivsLabel);
247
246
 //		oe.ctrlPanel.remove(vDivsLabel);
248
247
 //		//oe.ctrlPanel.repaint();
249
-                Remove(uDivsField);
250
-                Remove(vDivsField);
248
+//                Remove(uDivsField);
249
+//                Remove(vDivsField);
250
+		oe.ctrlPanel.remove(uvPanel);
251
251
                 
252
252
                 super.closeUI();
253
253
 	}
..
..
@@ -269,6 +269,8 @@
269
269
     cNumberSlider vDivsField;
270
270
     JCheckBox optionCB;
271
271
 
272
+    cGridBag uvPanel;
273
+    
272
274
 	ObjectUI parent;
273
275
 	
274
276
 	//ObjEditor objEditor;