Undo/redo fully working

Normand Briere

2019-06-11 1d909ffa0c2beb51d453b53b845c4f3a749ca5f0

Undo/redo fully working

 Composite.java
..
..
@@ -160,36 +160,37 @@
160
160
 //        //Touch();
161
161
 //    }
162
162
     
163
-    public void clear()
164
-    {
165
-        if (blockloop)
166
-        {
167
-            //blockloop = false;
168
-            return;
169
-        }
170
-
171
-        blockloop = true;
172
-        //Applet3D.tracein("Clear", this);
173
-        for (int i = 0; i < Children().size(); i++)
174
-        {
175
-            Object3D obj = (Object3D) Children().get(i); // reserve(i);
176
-            
177
-            //if (!obj.ReadOnly()) // Object3D Serial...
178
-            if (!(obj instanceof Composite) || !((Composite) obj).ReadOnly())
179
-            {
180
-                obj.clear();
181
-                //Children().release(i);
182
-                Children().remove(i);
183
-                --i;
184
-            } else
185
-            {
186
-                //Children().release(i);
187
-            }
188
-        }
189
-        //Applet3D.traceout("Clear", this);
190
-
191
-        blockloop = false;
192
-    }
163
+    // JUNE 2019??? That cannot work...
164
+//    public void clear()
165
+//    {
166
+//        if (blockloop)
167
+//        {
168
+//            //blockloop = false;
169
+//            return;
170
+//        }
171
+//
172
+//        blockloop = true;
173
+//        //Applet3D.tracein("Clear", this);
174
+//        for (int i = 0; i < Children().size(); i++)
175
+//        {
176
+//            Object3D obj = (Object3D) Children().get(i); // reserve(i);
177
+//            
178
+//            //if (!obj.ReadOnly()) // Object3D Serial...
179
+//            if (!(obj instanceof Composite) || !((Composite) obj).ReadOnly())
180
+//            {
181
+//                obj.clear();
182
+//                //Children().release(i);
183
+//                Children().remove(i);
184
+//                --i;
185
+//            } else
186
+//            {
187
+//                //Children().release(i);
188
+//            }
189
+//        }
190
+//        //Applet3D.traceout("Clear", this);
191
+//
192
+//        blockloop = false;
193
+//    }
193
194
 
194
195
     boolean ReadOnly()
195
196
     {
 GroupEditor.java
..
..
@@ -154,11 +154,12 @@
154
154
 		oe.menuBar.add(menu = new Menu("Edit"));
155
155
 		//editItem = menu.add(new MenuItem("Edit"));
156
156
 		//editItem.addActionListener(this);
157
-		undoItem = menu.add(new MenuItem("Undo"));
158
-		undoItem.addActionListener(this);
159
-		redoItem = menu.add(new MenuItem("Redo"));
160
-		redoItem.addActionListener(this);
161
-		menu.add("-");
157
+                
158
+//		undoItem = menu.add(new MenuItem("Undo"));
159
+//		undoItem.addActionListener(this);
160
+//		redoItem = menu.add(new MenuItem("Redo"));
161
+//		redoItem.addActionListener(this);
162
+//		menu.add("-");
162
163
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
163
164
 		duplicateItem.addActionListener(this);
164
165
 		cloneItem = menu.add(new MenuItem("Clone"));
..
..
@@ -202,7 +203,7 @@
202
203
         //zBufferItem.addActionListener(this);
203
204
         //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204
205
         //normalLensItem.addActionListener(this);
205
-        cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206
207
         revertCameraItem.addActionListener(this);
207
208
         
208
209
         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
..
..
@@ -266,7 +267,7 @@
266
267
 //		animationItem.addItemListener(this);
267
268
 //                    animationItem.setState(CameraPane.ANIMATION);
268
269
         cameraMenu.add("-");
269
-        cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
270
+        cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270
271
         editCameraItem.addActionListener(this);
271
272
         
272
273
         if (Globals.ADVANCED)
..
..
@@ -555,6 +556,18 @@
555
556
         oe.buttonGroup.add(dummyButton);
556
557
          */
557
558
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559
+                
560
+		oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
+                undoButton.setToolTipText("Undo changes");
562
+		undoButton.addActionListener(this);
563
+                
564
+		oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
+                redoButton.setToolTipText("Redo changes");
566
+		redoButton.addActionListener(this);
567
+                
568
+		oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
+                saveButton.setToolTipText("Save changes");
570
+		saveButton.addActionListener(this);
558
571
                 
559
572
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560
573
                 liveCB.setToolTipText("Enable animation");
..
..
@@ -1956,6 +1969,18 @@
1956
1969
 		{
1957
1970
                     DumpObject();
1958
1971
 		} else
1972
+		if (source == undoButton)
1973
+		{
1974
+			Undo();
1975
+		} else
1976
+		if (source == redoButton)
1977
+		{
1978
+			Redo();
1979
+		} else
1980
+		if (source == saveButton)
1981
+		{
1982
+			Save();
1983
+		} else
1959
1984
 		if (source == oneStepButton)
1960
1985
 		{
1961
1986
                     Globals.ONESTEP = true;
..
..
@@ -3128,7 +3153,8 @@
3128
3153
                         sideView.object = group;
3129
3154
                     }
3130
3155
                     
3131
-// fix "+" issue                    group.editWindow = this;
3156
+// fix "+" issue
3157
+                    group.editWindow = this;
3132
3158
                     
3133
3159
                     /*
3134
3160
                     currentLayout = radio.layout;
..
..
@@ -4404,6 +4430,7 @@
4404
4430
 	{
4405
4431
 		if (group.selection.isEmpty())
4406
4432
 			return;
4433
+                
4407
4434
 		Grafreed.clipboardIsTempGroup = false;
4408
4435
 		Composite tGroup = null;
4409
4436
 		if (group.selection.size() > 0) // 1)
..
..
@@ -4414,6 +4441,7 @@
4414
4441
                 
4415
4442
 		if (cut)
4416
4443
 		{
4444
+                    Save();
4417
4445
 			//int indices[] = jList.getSelectedIndices();
4418
4446
 			//for (int i = indices.length - 1; i >= 0; i--)
4419
4447
 			//jList.remove(indices[i]);
..
..
@@ -4503,8 +4531,10 @@
4503
4531
 			}
4504
4532
 			
4505
4533
 		}
4534
+                
4506
4535
 		if (Grafreed.clipboardIsTempGroup)
4507
4536
 			Grafreed.clipboard = tGroup;
4537
+                
4508
4538
 		if (cut)
4509
4539
                 {
4510
4540
                     ResetModel();
..
..
@@ -5129,6 +5159,9 @@
5129
5159
 	cButton clearpanelButton;
5130
5160
 	cButton unselectButton;
5131
5161
 	
5162
+	cButton saveButton;
5163
+	cButton undoButton;
5164
+	cButton redoButton;
5132
5165
 	cButton oneStepButton;
5133
5166
         
5134
5167
 	cButton screenfitButton;
 ObjEditor.java
..
..
@@ -3242,7 +3242,7 @@
3242
3242
         for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3243
3243
         {
3244
3244
             ab = (cRadio)e.nextElement();
3245
-            if(ab.GetObject() == client)
3245
+            if(ab.GetObject() == copy)
3246
3246
             {
3247
3247
                 return ab;
3248
3248
             }