Reset transform, fix loop versioning.

Normand Briere

2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009

 GroupEditor.java
..
..
@@ -1038,9 +1038,9 @@
1038
1038
         oe.radioPanel.add(dummyButton);
1039
1039
         oe.buttonGroup.add(dummyButton);
1040
1040
          */
1041
-                cGridBag copyOptionsPanel = new cGridBag();
1041
+                cGridBag versionManagerPanel = new cGridBag();
1042
1042
                                         
1043
-                copyOptionsPanel.preferredHeight = 3;
1043
+                versionManagerPanel.preferredHeight = 4;
1044
1044
                 
1045
1045
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1046
1046
                 
..
..
@@ -1071,7 +1071,7 @@
1071
1071
                 collapseButton.setToolTipText("Collapse toolbar");
1072
1072
 		collapseButton.addActionListener(this);
1073
1073
                 
1074
-		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
1075
                 maximize3DButton.setToolTipText("Maximize 3D view");
1076
1076
 		maximize3DButton.addActionListener(this);
1077
1077
                 
..
..
@@ -1106,16 +1106,16 @@
1106
1106
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1107
1107
 		restoreCameraButton.addActionListener(this);
1108
1108
                 
1109
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
1110
                 saveVersionButton.setToolTipText("Duplicate current version");
1111
1111
 		saveVersionButton.addActionListener(this);
1112
1112
                                                 
1113
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1114
1114
                 deleteVersionButton.setToolTipText("Delete current version");
1115
1115
 		deleteVersionButton.addActionListener(this);
1116
1116
                 deleteVersionButton.setEnabled(false);
1117
1117
                                                 
1118
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1119
1119
                 previousVersionButton.setToolTipText("Previous version");
1120
1120
 		previousVersionButton.addActionListener(this);
1121
1121
                 previousVersionButton.setEnabled(false);
..
..
@@ -1131,9 +1131,9 @@
1131
1131
 		replaceButton.addActionListener(this);
1132
1132
                 replaceButton.setEnabled(false);
1133
1133
                 
1134
-                copyOptionsPanel.add(updown);
1134
+                versionManagerPanel.add(updown);
1135
1135
                 
1136
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1137
1137
                 nextVersionButton.setToolTipText("Next version");
1138
1138
 		nextVersionButton.addActionListener(this);
1139
1139
                 nextVersionButton.setEnabled(false);
..
..
@@ -1311,6 +1311,8 @@
1311
1311
                 
1312
1312
                 cGridBag jSPPanel = new cGridBag();
1313
1313
 
1314
+            jSPPanel.preferredHeight = 20;
1315
+            
1314
1316
                 JScrollPane jSP;
1315
1317
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1316
1318
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1319,11 +1321,11 @@
1319
1321
                 oe.treePanel.add(jSPPanel);
1320
1322
                 oe.treePanel.Return();
1321
1323
 
1322
-                oe.treePanel.add(copyOptionsPanel);
1324
+                oe.treePanel.add(versionManagerPanel);
1323
1325
                 oe.treePanel.Return();
1324
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1325
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1326
-            sliderPane.preferredHeight = 2;
1326
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1327
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1328
+            versionSliderPane.preferredHeight = 3;
1327
1329
                 
1328
1330
 //        mainPanel.setDividerLocation(0.1); //1.0);
1329
1331
         mainPanel.setResizeWeight(0.4);
..
..
@@ -3968,6 +3970,8 @@
3968
3970
 		if (source == closeButton)
3969
3971
 		{
3970
3972
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3973
+                    Replace();
3974
+                    
3971
3975
                     cRadio ab;
3972
3976
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3973
3977
                     {
..
..
@@ -4066,6 +4070,8 @@
4066
4070
 		} else
4067
4071
                 if(source instanceof cRadio)
4068
4072
 		{
4073
+                    Replace();
4074
+                    
4069
4075
                     group.parent = keepparent;
4070
4076
                         group.attributes = 0;
4071
4077
                     //group.editWindow = null;
..
..
@@ -4121,13 +4127,21 @@
4121
4127
                     
4122
4128
         if (copy.versionlist == null)
4123
4129
         {
4124
-            copy.versionlist = new Object3D[100];
4125
4130
             copy.versionindex = -1;
4126
4131
             
4127
4132
             // Cannot work with loops
4128
-            // To fix this issue, first mark all nodes above the root,
4133
+            // To fix this issue, we first mark all nodes above the root,
4129
4134
             // and check if any of these nodes are reachable below the root.
4130
-            //Save(true);
4135
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4136
+            
4137
+            if (!copy.HasTags())
4138
+            {
4139
+                copy.versionlist = new Object3D[100];
4140
+                
4141
+                Save(true);
4142
+            }
4143
+            
4144
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4131
4145
         }
4132
4146
         
4133
4147
                     SetVersionStates();
..
..
@@ -4275,7 +4289,7 @@
4275
4289
                         TouchTransform(obj);
4276
4290
                         continue;
4277
4291
                     }
4278
-                    if ((mask&2) != 0) // Scale
4292
+                    if ((mask&2) != 0) // Scale/rotation
4279
4293
                     {
4280
4294
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4281
4295
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4283,10 +4297,6 @@
4283
4297
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4284
4298
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4285
4299
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4286
-                    }
4287
-                    if ((mask&4) != 0) // Rotation
4288
-                    {
4289
-                        // ?
4290
4300
                     }
4291
4301
                     if ((mask&1) != 0) // Translation
4292
4302
                     {
..
..
@@ -5385,6 +5395,7 @@
5385
5395
 
5386
5396
         void refreshContents(boolean cp)
5387
5397
         {
5398
+            if (false)
5388
5399
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5389
5400
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5390
5401
             {