Edit panel pin state.

Normand Briere

2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1

 BiparamEditor.java
..
..
@@ -4,6 +4,8 @@
4
4
 import javax.swing.*;
5
5
 import javax.swing.event.*;
6
6
 
7
+import grafeme.ui.*;
8
+
7
9
 class BiparamEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener
8
10
 {
9
11
     BiparamEditor(Biparam inBP, GroupEditor callee)
..
..
@@ -65,11 +67,14 @@
65
67
 		oe.aConstraints.gridwidth = 1;
66
68
              */
67
69
             super.SetupUI2(oe);
68
-                
69
-            uDivsField = AddSlider(oe.ctrlPanel, "U #", biparam.minUDivs, 256+biparam.minUDivs, biparam.uDivs);
70
-            Return();
71
-            vDivsField = AddSlider(oe.ctrlPanel, "V #", biparam.minVDivs, 256+biparam.minVDivs, biparam.vDivs);
72
-            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();
73
78
 //		oe.aConstraints.gridwidth = 1;
74
79
 //		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
75
80
 //        oe.ctrlPanel.add(uDivsLabel = new JLabel("U #"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
..
..
@@ -96,17 +101,11 @@
96
101
 //		oe.aConstraints.gridwidth = 1;
97
102
         if (biparam instanceof Cone) // ends)
98
103
         {
99
-			oe.aConstraints.gridy += 1;
100
-			oe.aConstraints.gridwidth = 3;
101
-//			oe.aConstraints.anchor = GridBagConstraints.WEST;
102
-            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);
103
105
 			optionCB.addItemListener(this);
104
-//			oe.aConstraints.anchor = GridBagConstraints.EAST;
105
-			oe.aConstraints.gridwidth = 1;
106
+oe.ctrlPanel.Return();
106
107
             //endcaps.setState(!biparam.endcaps);
107
108
         }
108
-		oe.aConstraints.gridy += 1;
109
-		oe.aConstraints.gridx = 0;
110
109
     }
111
110
 	
112
111
 	void Clear()
..
..
@@ -205,7 +204,7 @@
205
204
     public void applySelf()
206
205
     {
207
206
 		//System.out.println("Biparam :: applySelf");
208
-        //super.applySelf();
207
+        super.applySelf();
209
208
         int udivs = uDivsField.getInteger(); // biparam.minUDivs, 99);
210
209
         int vdivs = vDivsField.getInteger(); // biparam.minUDivs, 99);
211
210
         //biparam.name = nameField.getText();
..
..
@@ -244,8 +243,9 @@
244
243
 //		oe.ctrlPanel.remove(uDivsLabel);
245
244
 //		oe.ctrlPanel.remove(vDivsLabel);
246
245
 //		//oe.ctrlPanel.repaint();
247
-                Remove(uDivsField);
248
-                Remove(vDivsField);
246
+//                Remove(uDivsField);
247
+//                Remove(vDivsField);
248
+		oe.ctrlPanel.remove(uvPanel);
249
249
                 
250
250
                 super.closeUI();
251
251
 	}
..
..
@@ -261,12 +261,14 @@
261
261
 	}
262
262
 	
263
263
     Biparam biparam;
264
-    JLabel uDivsLabel;
265
-    JLabel vDivsLabel;
266
-    NumberSlider uDivsField;
267
-    NumberSlider vDivsField;
264
+    //JLabel uDivsLabel;
265
+    //JLabel vDivsLabel;
266
+    cNumberSlider uDivsField;
267
+    cNumberSlider vDivsField;
268
268
     JCheckBox optionCB;
269
269
 
270
+    cGridBag uvPanel;
271
+    
270
272
 	ObjectUI parent;
271
273
 	
272
274
 	//ObjEditor objEditor;