Reset transform, fix loop versioning.

Normand Briere

2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009

 RandomEditor.java
..
..
@@ -9,14 +9,15 @@
9
9
 class RandomEditor extends ObjEditor implements //ItemListener,
10
10
         ChangeListener, ObjectUI, ActionListener
11
11
 {
12
-        cGridBag childPanel;
12
+        cGridBag itemPanel;
13
+    private cGridBag dampPanel;
13
14
     RandomEditor(RandomNode inBP, GroupEditor callee)
14
15
     {
15
16
         super(inBP,callee);
16
17
         
17
18
         objEditor = callee.GetEditor(); // new ObjEditor(inBP, this, callee);
18
19
 
19
-        switchnode = (RandomNode) inBP;
20
+        randomnode = (RandomNode) inBP;
20
21
 	//	parent = p;
21
22
 		
22
23
 	//SetupUI2(callee.objEditor);
..
..
@@ -35,7 +36,7 @@
35
36
         
36
37
         objEditor = callee.GetEditor(); // new ObjEditor(inBP, this, callee);
37
38
 
38
-        switchnode = (RandomNode) inBP;
39
+        randomnode = (RandomNode) inBP;
39
40
 		parent = p;
40
41
 		
41
42
 	SetupUI2(callee.objEditor);
..
..
@@ -49,7 +50,7 @@
49
50
         
50
51
         //objEditor = new ObjEditor(inBP, copy, this, callee);
51
52
 		// ?? super.parent = p;
52
-        switchnode = (RandomNode) copy;
53
+        randomnode = (RandomNode) copy;
53
54
 		parent = p;
54
55
 		
55
56
 		//objEditor.SetupUI(false); // ?
..
..
@@ -60,24 +61,30 @@
60
61
 	void SetupUI2(ObjEditor oe)
61
62
 	{
62
63
             super.SetupUI2(oe);
63
-                childPanel = AddSlider(oe.ctrlPanel, "Child: ", 0, switchnode.Size()-1, switchnode.rnd);
64
+                itemPanel = AddSlider(oe.ctrlPanel, "Item: ", 0, randomnode.Size()-1, randomnode.rndIndex);
64
65
                 
65
-            childField = (cNumberSlider)childPanel.getComponent(1);
66
+            itemField = (cNumberSlider)itemPanel.getComponent(1);
66
67
             oe.ctrlPanel.Return();
68
+            
69
+        oe.ctrlPanel.Return();
70
+        dampPanel = AddSlider(oe.ctrlPanel, "Damp: ", 0, 300, randomnode.damp);
71
+            
72
+            dampField = (cNumberSlider)dampPanel.getComponent(1);
73
+        oe.ctrlPanel.Return();
67
74
         }
68
75
 	
69
76
 	void Clear()
70
77
 	{
71
78
 		objEditor.Clear();
72
79
 
73
-		switchnode = null;
80
+		randomnode = null;
74
81
 	}
75
82
 	
76
83
 	
77
84
 	public void stateChanged(ChangeEvent e)
78
85
 	{
79
86
 	    //System.out.println("Biparam :: stateChanged");
80
-		if (e.getSource() == childField)
87
+		if (e.getSource() == itemField || e.getSource() == dampField)
81
88
 		{
82
89
 		//System.out.println("#U = " + biparam.uDivs);
83
90
 		//System.out.println("#V = " + biparam.vDivs);
..
..
@@ -94,7 +101,7 @@
94
101
 	
95
102
 	void Refresh()
96
103
 	{
97
-            switchnode.rnd = childField.getInteger();
104
+            randomnode.rndIndex = itemField.getInteger();
98
105
 		
99
106
             refreshContents();
100
107
 	}
..
..
@@ -102,7 +109,8 @@
102
109
     /**/
103
110
     public void applySelf()
104
111
     {
105
-        switchnode.rnd = childField.getInteger();
112
+        randomnode.rndIndex = itemField.getInteger();
113
+        randomnode.damp = dampField.getInteger(); // biparam.minUDivs, 99);
106
114
     }
107
115
     /**/
108
116
     
..
..
@@ -111,7 +119,8 @@
111
119
 		ObjEditor oe = objEditor;
112
120
 		
113
121
                 //Remove(childField);
114
-                oe.ctrlPanel.remove(this.childPanel);
122
+                oe.ctrlPanel.remove(this.itemPanel);
123
+                oe.ctrlPanel.remove(this.dampPanel);
115
124
                 
116
125
                 super.closeUI();
117
126
 	}
..
..
@@ -126,8 +135,9 @@
126
135
 		objEditor.refreshContents();
127
136
 	}
128
137
 	
129
-    RandomNode switchnode;
130
-    cNumberSlider childField;
138
+    RandomNode randomnode;
139
+    cNumberSlider itemField;
140
+    cNumberSlider dampField;
131
141
 
132
142
 	ObjectUI parent;
133
143