Version slider

Normand Briere

2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1

 GroupEditor.java
..
..
@@ -60,6 +60,12 @@
60
60
 		this.copy = this.group = group;
61
61
 		//selectees = this.group.selectees;
62
62
 		
63
+        if (copy.versions == null)
64
+        {
65
+            copy.versions = new byte[100][];
66
+            copy.versionindex = -1;
67
+        }
68
+        
63
69
 		if(ui)
64
70
                     SetupUI(objEditor);
65
71
 	}
..
..
@@ -74,6 +80,12 @@
74
80
 		this.copy = this.group = copy;
75
81
 		//selectees = this.group.selectees;
76
82
 		
83
+        if (copy.versions == null)
84
+        {
85
+            copy.versions = new byte[100][];
86
+            copy.versionindex = -1;
87
+        }
88
+        
77
89
 		SetupMenu2(this); //objEditor);
78
90
 		SetupUI2(objEditor);
79
91
 		objEditor.SetupUI(true);
..
..
@@ -84,6 +96,10 @@
84
96
 
85
97
     void CloneSelection(boolean supports)
86
98
     {
99
+        if (Globals.REPLACEONMAKE)
100
+            Save();
101
+        boolean keep = Globals.REPLACEONMAKE;
102
+        Globals.REPLACEONMAKE = false;
87
103
         //   Object3D keep = GrafreeD.clipboard;
88
104
            //Object3D obj;
89
105
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +110,7 @@
94
110
                
95
111
                makeSomething(clone, i==group.selection.size()-1);
96
112
            }
113
+        Globals.REPLACEONMAKE = keep;
97
114
     }
98
115
 
99
116
     void CloneClipboard(boolean supports)
..
..
@@ -380,13 +397,14 @@
380
397
 		shadowYItem.addActionListener(this);
381
398
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
399
 		shadowZItem.addActionListener(this);
400
+		attributeItem = menu.add(new MenuItem("Attribute"));
401
+		attributeItem.addActionListener(this);
402
+                
383
403
         if (Globals.ADVANCED)
384
404
         {
385
405
 		menu.add("-");
386
406
 		linkerItem = menu.add(new MenuItem("Linker"));
387
407
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
408
 		templateItem = menu.add(new MenuItem("Template"));
391
409
 		templateItem.addActionListener(this);
392
410
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -538,6 +556,7 @@
538
556
 		buildToolsMenu(menu);
539
557
 	}
540
558
 	
559
+        
541
560
 	void SetupUI2(ObjEditor oe)
542
561
 	{
543
562
             // June 2019
..
..
@@ -601,42 +620,55 @@
601
620
                 fullButton.setToolTipText("Full-screen window");
602
621
 		fullButton.addActionListener(this);
603
622
                 
623
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
+                screenfitButton.setToolTipText("Screen fit");
625
+		screenfitButton.addActionListener(this);
626
+
604
627
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
628
                 restoreCameraButton.setToolTipText("Restore viewpoint");
606
629
 		restoreCameraButton.addActionListener(this);
607
630
                 
631
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
+                saveButton.setToolTipText("New version");
633
+		saveButton.addActionListener(this);
634
+                                                
608
635
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
-                undoButton.setToolTipText("Undo changes");
636
+                undoButton.setToolTipText("Previous version");
610
637
 		undoButton.addActionListener(this);
611
638
                 undoButton.setEnabled(false);
612
639
                 
640
+                cGridBag updown = new cGridBag().setVertical(true);
641
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+                restoreButton.setToolTipText("Restore current");
643
+		restoreButton.addActionListener(this);
644
+                restoreButton.setEnabled(false);
645
+                
646
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
+                replaceButton.setToolTipText("Replace current");
648
+		replaceButton.addActionListener(this);
649
+                replaceButton.setEnabled(false);
650
+                
651
+                copyOptionsPanel.add(updown);
652
+                
613
653
 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
-                redoButton.setToolTipText("Redo changes");
654
+                redoButton.setToolTipText("Next version");
615
655
 		redoButton.addActionListener(this);
616
656
                 redoButton.setEnabled(false);
617
657
                 
618
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
-                saveButton.setToolTipText("Save changes");
620
-		saveButton.addActionListener(this);
621
-                
622
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
658
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623
659
                 liveCB.setToolTipText("Enable animation");
624
660
                                 liveCB.addItemListener(this);
625
661
 
626
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627
663
                 oneStepButton.setToolTipText("Animate one step forward");
628
664
 		oneStepButton.addActionListener(this);
629
665
                 
630
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
666
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631
667
                 fastCB.setToolTipText("Fast mode");
632
668
                                 fastCB.addItemListener(this);
633
669
                                 
634
670
                 //oe.toolboxPanel.Return();
635
671
                 
636
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
-                screenfitButton.setToolTipText("Screen fit");
638
-		screenfitButton.addActionListener(this);
639
-
640
672
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
673
 //                trackCB.setToolTipText("Enable tracking");
642
674
 //                                trackCB.addItemListener(this);
..
..
@@ -814,6 +846,9 @@
814
846
 
815
847
                 oe.treePanel.add(copyOptionsPanel);
816
848
                 oe.treePanel.Return();
849
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
850
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
851
+            sliderPane.preferredHeight = 1;
817
852
                 
818
853
 //        mainPanel.setDividerLocation(0.5); //1.0);
819
854
 //        mainPanel.setResizeWeight(0.5);
..
..
@@ -939,9 +974,9 @@
939
974
                 toggleSwitchCB.setToolTipText("Choose a single item");
940
975
                                 toggleSwitchCB.addItemListener(this);
941
976
                                 
942
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943
-                autosaveCB.setToolTipText("On structure change");
944
-                                autosaveCB.addItemListener(this);
977
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
978
+                autokeepCB.setToolTipText("On structure change");
979
+                                autokeepCB.addItemListener(this);
945
980
 
946
981
                 panel.Return();
947
982
             if (Globals.ADVANCED)
..
..
@@ -970,7 +1005,7 @@
970
1005
         {
971
1006
             cRadio radioButton = new cRadio(obj.name);
972
1007
             
973
-            // Patch to avoid bug with transparency.
1008
+            // June 2019. Patch to avoid bug with transparency.
974
1009
             radioButton.hadMaterial = obj.material != null;
975
1010
             if (!radioButton.hadMaterial)
976
1011
             {
..
..
@@ -1018,7 +1053,7 @@
1018
1053
         
1019
1054
         cCheckBox oeilCB;
1020
1055
         cCheckBox shadowCB;
1021
-        cCheckBox autosaveCB;
1056
+        cCheckBox autokeepCB;
1022
1057
         cCheckBox lookAtCB;
1023
1058
         
1024
1059
 //        static int COLOR = 1;
..
..
@@ -1130,9 +1165,9 @@
1130
1165
             {
1131
1166
                 Globals.FREEZEONMOVE ^= true;
1132
1167
             }
1133
-            else if(e.getSource() == autosaveCB)
1168
+            else if(e.getSource() == autokeepCB)
1134
1169
             {
1135
-                Globals.SAVEONMAKE ^= true;
1170
+                Globals.REPLACEONMAKE ^= true;
1136
1171
             }
1137
1172
             else if(e.getSource() == lookAtCB)
1138
1173
             {
..
..
@@ -1214,8 +1249,6 @@
1214
1249
                         }
1215
1250
                     }
1216
1251
                     
1217
-                    String string = (String) object;
1218
-                    
1219
1252
                     System.out.println("Transfer = " + object + "; drop : " + target);
1220
1253
 //                    if( object instanceof java.io.File[])
1221
1254
 //                    {
..
..
@@ -1223,6 +1256,8 @@
1223
1256
 //                        objEditor.DropFile((java.io.File[]) object, true);
1224
1257
 //                        return;
1225
1258
 //                    }
1259
+                    
1260
+                    String string = object.toString();
1226
1261
                     
1227
1262
                     // File path for Mac and Windows
1228
1263
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1472,6 +1507,9 @@
1472
1507
 		animationItem.addItemListener(this);
1473
1508
                 animationItem.setState(Globals.ANIMATION);
1474
1509
                 
1510
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1511
+		archiveItem.addActionListener(this);
1512
+                
1475
1513
 		menu.add("-");
1476
1514
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1477
1515
 		parseverticesItem.addActionListener(this);
..
..
@@ -1484,6 +1522,8 @@
1484
1522
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1485
1523
 		reduce34MorphItem.addActionListener(this);
1486
1524
 		menu.add("-");
1525
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1526
+		memoryItem.addActionListener(this);
1487
1527
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1488
1528
 		computeAOItem.addActionListener(this);
1489
1529
                 
..
..
@@ -1492,8 +1532,6 @@
1492
1532
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1493
1533
 		mirrorItem.addActionListener(this);
1494
1534
 		menu.add("-");
1495
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1496
-		memoryItem.addActionListener(this);
1497
1535
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1498
1536
 		analyzeItem.addActionListener(this);
1499
1537
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -2216,15 +2254,31 @@
2216
2254
 		} else
2217
2255
 		if (source == undoButton)
2218
2256
 		{
2257
+                        // Go to previous version
2258
+			//if (!Undo())
2259
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2219
2260
 			Undo();
2261
+		} else
2262
+		if (source == restoreButton)
2263
+		{
2264
+                        // Restore current version
2265
+			Restore();
2266
+		} else
2267
+		if (source == replaceButton)
2268
+		{
2269
+                        // Overwrite current version
2270
+			Replace();
2220
2271
 		} else
2221
2272
 		if (source == redoButton)
2222
2273
 		{
2274
+                        // Go to next version
2223
2275
 			Redo();
2224
2276
 		} else
2225
2277
 		if (source == saveButton)
2226
2278
 		{
2227
-			Save();
2279
+                        // Save a new version
2280
+			if (!Save(true))
2281
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2228
2282
 		} else
2229
2283
 		if (source == oneStepButton)
2230
2284
 		{
..
..
@@ -2233,17 +2287,14 @@
2233
2287
 		} else
2234
2288
 		if (source == screenfitButton)
2235
2289
 		{
2236
-			//Reload(lastConverter, lastFilename, true);
2237
2290
                     ScreenFit();
2238
2291
 		} else
2239
2292
 		if (source == screenfitpointButton)
2240
2293
 		{
2241
-			//Reload(lastConverter, lastFilename, true);
2242
2294
                     ScreenFitPoint();
2243
2295
 		} else
2244
2296
 		if (source == snapobjectButton)
2245
2297
 		{
2246
-			//Reload(lastConverter, lastFilename, true);
2247
2298
                     SnapObject();
2248
2299
 		} else
2249
2300
 //		if (event.getSource() == recompileButton)
..
..
@@ -3471,6 +3522,9 @@
3471
3522
                     }
3472
3523
                     
3473
3524
                     copy = group;
3525
+                    
3526
+                    SetUndoStates();
3527
+
3474
3528
                     //Globals.theRenderer.object = group;
3475
3529
                     if(!useclient)
3476
3530
                     {
..
..
@@ -3499,6 +3553,8 @@
3499
3553
                     radio.layout.doClick();
3500
3554
                     
3501
3555
                     ClearUnpinned();
3556
+                    Grafreed.Assert(group != null);
3557
+                    Grafreed.Assert(group.selection != null);
3502
3558
                     SetPinStates(group.selection.size() > 0);
3503
3559
                     if (group.selection.size() == 1)
3504
3560
                         EditSelection(false);
..
..
@@ -4731,7 +4787,7 @@
4731
4787
         void refreshContents(boolean cp)
4732
4788
         {
4733
4789
             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4790
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4735
4791
             {
4736
4792
                 objEditor.ClearInfo(); // .GetMaterial());
4737
4793
 
..
..
@@ -4830,8 +4886,8 @@
4830
4886
                 
4831
4887
 		if (cut)
4832
4888
 		{
4833
-        if (Globals.SAVEONMAKE)
4834
-                    Save();
4889
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4890
+//                    Save();
4835
4891
 			//int indices[] = jList.getSelectedIndices();
4836
4892
 			//for (int i = indices.length - 1; i >= 0; i--)
4837
4893
 			//jList.remove(indices[i]);
..
..
@@ -4934,6 +4990,10 @@
4934
4990
 	
4935
4991
 	void paste(boolean expand)
4936
4992
 	{
4993
+        if (Globals.REPLACEONMAKE)
4994
+            Save();
4995
+        boolean keep = Globals.REPLACEONMAKE;
4996
+        Globals.REPLACEONMAKE = false;
4937
4997
 	//	if (GrafreeD.clipboard == null)
4938
4998
 	//		return;
4939
4999
 		boolean first = true;
..
..
@@ -4993,6 +5053,7 @@
4993
5053
                         Grafreed.clipboard.get(0).parent = keepparent;
4994
5054
 		}
4995
5055
 		
5056
+        Globals.REPLACEONMAKE = keep;
4996
5057
 		ResetModel();
4997
5058
 		refreshContents();
4998
5059
 	}
..
..
@@ -5128,6 +5189,10 @@
5128
5189
         
5129
5190
 	void group(Object3D csg, boolean grab)
5130
5191
 	{
5192
+        if (Globals.REPLACEONMAKE)
5193
+            Save();
5194
+        boolean keep = Globals.REPLACEONMAKE;
5195
+        Globals.REPLACEONMAKE = false;
5131
5196
 		if (//false) // why??
5132
5197
                     !group.selection.isEmpty())
5133
5198
                 {
..
..
@@ -5241,10 +5306,15 @@
5241
5306
                 //node.add(csg);
5242
5307
 		//makeSomething(node);
5243
5308
 		makeSomething(csg);
5309
+        Globals.REPLACEONMAKE = keep;
5244
5310
 	}
5245
5311
 	
5246
5312
         void Ungroup(Object3D g)
5247
5313
         {
5314
+        if (Globals.REPLACEONMAKE)
5315
+            Save();
5316
+        boolean keep = Globals.REPLACEONMAKE;
5317
+        Globals.REPLACEONMAKE = false;
5248
5318
             if (g instanceof HiddenObject)
5249
5319
             {
5250
5320
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5261,6 +5331,7 @@
5261
5331
                     objEditor.makeSomething(g.get(i), false);
5262
5332
                 }
5263
5333
             }
5334
+        Globals.REPLACEONMAKE = keep;
5264
5335
         }
5265
5336
         
5266
5337
 	void ungroup()