Maze

Normand Briere

2019-11-17 cb37a129d1adb403019c96e798e86e2da9667f15

 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,16 @@
65
67
 		oe.aConstraints.gridwidth = 1;
66
68
              */
67
69
             super.SetupUI2(oe);
68
-                
69
-            uDivsField = AddSlider(oe.ctrlPanel, "U #", biparam.minUDivs, 250+biparam.minUDivs, biparam.uDivs);
70
-            Return();
71
-            vDivsField = AddSlider(oe.ctrlPanel, "V #", biparam.minVDivs, (int)(250/6.28)+biparam.minVDivs, biparam.vDivs);
72
-            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();
73
80
 //		oe.aConstraints.gridwidth = 1;
74
81
 //		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
75
82
 //        oe.ctrlPanel.add(uDivsLabel = new JLabel("U #"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
..
..
@@ -96,17 +103,11 @@
96
103
 //		oe.aConstraints.gridwidth = 1;
97
104
         if (biparam instanceof Cone) // ends)
98
105
         {
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);
103
-			optionCB.addItemListener(this);
104
-//			oe.aConstraints.anchor = GridBagConstraints.EAST;
105
-			oe.aConstraints.gridwidth = 1;
106
+            oe.ctrlPanel.add(optionCB = new JCheckBox("Close Surface", biparam.endcaps)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
107
+            optionCB.addItemListener(this);
108
+            oe.ctrlPanel.Return();
106
109
             //endcaps.setState(!biparam.endcaps);
107
110
         }
108
-		oe.aConstraints.gridy += 1;
109
-		oe.aConstraints.gridx = 0;
110
111
     }
111
112
 	
112
113
 	void Clear()
..
..
@@ -141,6 +142,7 @@
141
142
 		if (//e.getSource() == nameField ||
142
143
         	    e.getSource() == optionCB)
143
144
 		{
145
+                    new Exception().printStackTrace();
144
146
 			//System.out.println(e);
145
147
 			applySelf();
146
148
 			//super.applySelf();
..
..
@@ -205,7 +207,7 @@
205
207
     public void applySelf()
206
208
     {
207
209
 		//System.out.println("Biparam :: applySelf");
208
-        //super.applySelf();
210
+        super.applySelf();
209
211
         int udivs = uDivsField.getInteger(); // biparam.minUDivs, 99);
210
212
         int vdivs = vDivsField.getInteger(); // biparam.minUDivs, 99);
211
213
         //biparam.name = nameField.getText();
..
..
@@ -244,8 +246,9 @@
244
246
 //		oe.ctrlPanel.remove(uDivsLabel);
245
247
 //		oe.ctrlPanel.remove(vDivsLabel);
246
248
 //		//oe.ctrlPanel.repaint();
247
-                Remove(uDivsField);
248
-                Remove(vDivsField);
249
+//                Remove(uDivsField);
250
+//                Remove(vDivsField);
251
+		oe.ctrlPanel.remove(uvPanel);
249
252
                 
250
253
                 super.closeUI();
251
254
 	}
..
..
@@ -263,10 +266,12 @@
263
266
     Biparam biparam;
264
267
     //JLabel uDivsLabel;
265
268
     //JLabel vDivsLabel;
266
-    NumberSlider uDivsField;
267
-    NumberSlider vDivsField;
269
+    cNumberSlider uDivsField;
270
+    cNumberSlider vDivsField;
268
271
     JCheckBox optionCB;
269
272
 
273
+    cGridBag uvPanel;
274
+    
270
275
 	ObjectUI parent;
271
276
 	
272
277
 	//ObjEditor objEditor;