Fix physics UI

Normand Briere

2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729

 BiparamEditor.java
..
..
@@ -67,11 +67,14 @@
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
+            uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, 250+biparam.minUDivs, biparam.uDivs).getComponent(1);
74
+            vDivsField = (cNumberSlider)AddSlider(uvPanel, "V #", biparam.minVDivs, (int)(500/3.1416)+biparam.minVDivs, biparam.vDivs).getComponent(1);
75
+            
76
+            oe.ctrlPanel.add(uvPanel);
77
+            oe.ctrlPanel.Return();
75
78
 //		oe.aConstraints.gridwidth = 1;
76
79
 //		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
77
80
 //        oe.ctrlPanel.add(uDivsLabel = new JLabel("U #"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
..
..
@@ -98,17 +101,11 @@
98
101
 //		oe.aConstraints.gridwidth = 1;
99
102
         if (biparam instanceof Cone) // ends)
100
103
         {
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);
104
+            oe.ctrlPanel.add(optionCB = new JCheckBox("Close Surface", biparam.endcaps)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
105
105
 			optionCB.addItemListener(this);
106
-//			oe.aConstraints.anchor = GridBagConstraints.EAST;
107
-			oe.aConstraints.gridwidth = 1;
106
+oe.ctrlPanel.Return();
108
107
             //endcaps.setState(!biparam.endcaps);
109
108
         }
110
-		oe.aConstraints.gridy += 1;
111
-		oe.aConstraints.gridx = 0;
112
109
     }
113
110
 	
114
111
 	void Clear()
..
..
@@ -246,8 +243,9 @@
246
243
 //		oe.ctrlPanel.remove(uDivsLabel);
247
244
 //		oe.ctrlPanel.remove(vDivsLabel);
248
245
 //		//oe.ctrlPanel.repaint();
249
-                Remove(uDivsField);
250
-                Remove(vDivsField);
246
+//                Remove(uDivsField);
247
+//                Remove(vDivsField);
248
+		oe.ctrlPanel.remove(uvPanel);
251
249
                 
252
250
                 super.closeUI();
253
251
 	}
..
..
@@ -269,6 +267,8 @@
269
267
     cNumberSlider vDivsField;
270
268
     JCheckBox optionCB;
271
269
 
270
+    cGridBag uvPanel;
271
+    
272
272
 	ObjectUI parent;
273
273
 	
274
274
 	//ObjEditor objEditor;