Fix physics UI

Normand Briere

2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729

Fix physics UI

 ObjEditor.java
..
..
@@ -1556,27 +1556,27 @@
1556
1556
         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
1557
         objectPanel.setToolTipTextAt(0, "Material");
1558
1558
     
1559
+        objectPanel.add(toolboxPanel);
1560
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1561
+        objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
1562
+
1559
1563
 //        JPanel north = new JPanel(new BorderLayout());
1560
1564
 //        north.setName("Edit");
1561
1565
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1562
1566
 //        objectPanel.add(north);
1563
1567
         objectPanel.add(editPanel);
1564
-        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
-        objectPanel.setToolTipTextAt(1, "Edit controls");
1568
+        objectPanel.setIconAt(2, GetIcon("icons/write.png"));
1569
+        objectPanel.setToolTipTextAt(2, "Edit controls");
1566
1570
         
1567
1571
         //if (Globals.ADVANCED)
1568
1572
             objectPanel.add(infoPanel);
1569
-        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
-        objectPanel.setToolTipTextAt(2, "Information");
1573
+        objectPanel.setIconAt(3, GetIcon("icons/info.png"));
1574
+        objectPanel.setToolTipTextAt(3, "Information");
1571
1575
         
1572
1576
         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1577
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1578
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1575
1579
         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
1580
1580
         /*
1581
1581
         aConstraints.gridx = 0;
1582
1582
         aConstraints.gridwidth = 1;
 PhysicsEditor.java
..
..
@@ -1,16 +1,10 @@
1
-/*
2
- * To change this template, choose Tools | Templates
3
- * and open the template in the editor.
4
- */
5
1
 
6
-/**
7
- *
8
- * @author nbriere
9
- */
10
2
 import java.awt.*;
11
3
 import java.awt.event.*;
12
4
 import javax.swing.*;
13
5
 import javax.swing.event.*;
6
+
7
+import grafeme.ui.*;
14
8
 
15
9
 class PhysicsEditor extends ObjEditor implements //ItemListener,
16
10
         ChangeListener, ObjectUI, ActionListener
..
..
@@ -76,52 +70,35 @@
76
70
              */
77
71
             super.SetupUI2(oe);
78
72
                 
79
-		oe.aConstraints.gridx = 0;
80
-		oe.aConstraints.gridwidth = 1;
73
+        gravityPanel = AddSlider(oe.ctrlPanel, "Gravity:", 0, 20.0, physicsnode.gravity, 1);
74
+        gravityField = (cNumberSlider)gravityPanel.getComponent(1);
81
75
                 
82
-		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
83
-        oe.ctrlPanel.add(gravityLabel = new JLabel("Gravity: "), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
84
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL; // 1;
85
-		oe.aConstraints.gridx += 1;
86
-		oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
87
-        oe.ctrlPanel.add(gravityField = new NumberSlider(0, 100.0), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
76
+//        oe.ctrlPanel.add(gravityLabel = new JLabel("Gravity: ")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
77
+//        oe.ctrlPanel.Return();
78
+//        oe.ctrlPanel.add(gravityField = new NumberSlider(0, 100.0)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
88
79
         
89
-        gravityField.setFloat(physicsnode.gravity);
80
+        oe.ctrlPanel.Return();
90
81
         
91
-		oe.aConstraints.gridx = 0;
92
-		oe.aConstraints.gridy += 1;
93
-		oe.aConstraints.gridwidth = 1;
94
-                
95
-		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
96
-        oe.ctrlPanel.add(windLabel = new JLabel("Wind: "), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
97
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL; // 1;
98
-		oe.aConstraints.gridx += 1;
99
-		oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
100
-        oe.ctrlPanel.add(windField = new NumberSlider(0, 100.0), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
82
+        windPanel = AddSlider(oe.ctrlPanel, "Wind:", 0, 20.0, physicsnode.wind, 1);
83
+        windField = (cNumberSlider)windPanel.getComponent(1);
101
84
         
102
-        windField.setFloat(physicsnode.wind);
85
+//        oe.ctrlPanel.add(windLabel = new JLabel("Wind: ")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
86
+//        oe.ctrlPanel.Return();
87
+//        oe.ctrlPanel.add(windField = new NumberSlider(0, 100.0)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
103
88
         
104
-		oe.aConstraints.gridx = 0;
105
-		oe.aConstraints.gridy += 1;
106
-		oe.aConstraints.gridwidth = 1;
107
-                
108
-		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
109
-        oe.ctrlPanel.add(floorLabel = new JLabel("Floor: "), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
110
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL; // 1;
111
-		oe.aConstraints.gridx += 1;
112
-		oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
113
-        oe.ctrlPanel.add(floorField = new NumberSlider(0, 100.0), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
89
+        oe.ctrlPanel.Return();
114
90
         
115
-        floorField.setFloat(physicsnode.floor);
116
-		oe.aConstraints.gridy += 1;
117
-                
118
-		oe.aConstraints.fill = 0;
119
-		oe.aConstraints.gridx -= 1;
120
-		oe.aConstraints.fill = GridBagConstraints.VERTICAL;
121
-		oe.aConstraints.gridy += 1;
122
-		oe.aConstraints.gridx = 0;
123
-                
91
+        floorPanel = AddSlider(oe.ctrlPanel, "Floor:", 0, 20.0, physicsnode.floor, 1);
92
+        floorField = (cNumberSlider)floorPanel.getComponent(1);
93
+        
94
+//        oe.ctrlPanel.add(floorLabel = new JLabel("Floor: ")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
95
+//        oe.ctrlPanel.Return();
96
+//        oe.ctrlPanel.add(floorField = new NumberSlider(0, 100.0)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
97
+        
98
+        oe.ctrlPanel.Return();
99
+        
124
100
 		gravityField.addChangeListener(this);
101
+		windField.addChangeListener(this);
125
102
 		floorField.addChangeListener(this);
126
103
     }
127
104
 	
..
..
@@ -173,6 +150,7 @@
173
150
 	{
174
151
 	    //System.out.println("Biparam :: stateChanged");
175
152
 		if (e.getSource() == gravityField ||
153
+		    e.getSource() == windField ||
176
154
 		    e.getSource() == floorField)
177
155
 		{
178
156
 		//System.out.println("#U = " + biparam.uDivs);
..
..
@@ -234,14 +212,19 @@
234
212
 		ObjEditor oe = objEditor;
235
213
 		
236
214
 		gravityField.removeChangeListener(this);
215
+		windField.removeChangeListener(this);
237
216
 		floorField.removeChangeListener(this);
238
217
                 
239
-		oe.ctrlPanel.remove(gravityField);
240
-		oe.ctrlPanel.remove(gravityLabel);
241
-		oe.ctrlPanel.remove(windField);
242
-		oe.ctrlPanel.remove(windLabel);
243
-		oe.ctrlPanel.remove(floorField);
244
-		oe.ctrlPanel.remove(floorLabel);
218
+		oe.ctrlPanel.remove(gravityPanel);
219
+		oe.ctrlPanel.remove(windPanel);
220
+		oe.ctrlPanel.remove(floorPanel);
221
+                
222
+		//oe.ctrlPanel.remove(gravityField);
223
+		//oe.ctrlPanel.remove(gravityLabel);
224
+		//oe.ctrlPanel.remove(windField);
225
+		//oe.ctrlPanel.remove(windLabel);
226
+		//oe.ctrlPanel.remove(floorField);
227
+		//oe.ctrlPanel.remove(floorLabel);
245
228
 		//oe.ctrlPanel.repaint();
246
229
                 
247
230
                 super.closeUI();
..
..
@@ -259,12 +242,16 @@
259
242
 	
260
243
     PhysicsNode physicsnode;
261
244
     
262
-    JLabel gravityLabel;
263
-    NumberSlider gravityField;
264
-    JLabel windLabel;
265
-    NumberSlider windField;
266
-    JLabel floorLabel;
267
-    NumberSlider floorField;
245
+    cGridBag gravityPanel;
246
+    cGridBag windPanel;
247
+    cGridBag floorPanel;
248
+        
249
+    //JLabel gravityLabel;
250
+    cNumberSlider gravityField;
251
+    //JLabel windLabel;
252
+    cNumberSlider windField;
253
+    //JLabel floorLabel;
254
+    cNumberSlider floorField;
268
255
 
269
256
 	ObjectUI parent;
270
257