Fix extract big data.

Normand Briere

2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c

 GroupEditor.java
..
..
@@ -84,6 +84,10 @@
84
84
 
85
85
     void CloneSelection(boolean supports)
86
86
     {
87
+        if (Globals.SAVEONMAKE)
88
+            Save();
89
+        boolean keep = Globals.SAVEONMAKE;
90
+        Globals.SAVEONMAKE = false;
87
91
         //   Object3D keep = GrafreeD.clipboard;
88
92
            //Object3D obj;
89
93
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +98,7 @@
94
98
                
95
99
                makeSomething(clone, i==group.selection.size()-1);
96
100
            }
101
+        Globals.SAVEONMAKE = keep;
97
102
     }
98
103
 
99
104
     void CloneClipboard(boolean supports)
..
..
@@ -380,14 +385,14 @@
380
385
 		shadowYItem.addActionListener(this);
381
386
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
387
 		shadowZItem.addActionListener(this);
388
+		attributeItem = menu.add(new MenuItem("Attribute"));
389
+		attributeItem.addActionListener(this);
383
390
                 
384
391
         if (Globals.ADVANCED)
385
392
         {
386
393
 		menu.add("-");
387
394
 		linkerItem = menu.add(new MenuItem("Linker"));
388
395
 		linkerItem.addActionListener(this);
389
-		attributeItem = menu.add(new MenuItem("Attribute"));
390
-		attributeItem.addActionListener(this);
391
396
 		templateItem = menu.add(new MenuItem("Template"));
392
397
 		templateItem.addActionListener(this);
393
398
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -971,7 +976,7 @@
971
976
         {
972
977
             cRadio radioButton = new cRadio(obj.name);
973
978
             
974
-            // Patch to avoid bug with transparency.
979
+            // June 2019. Patch to avoid bug with transparency.
975
980
             radioButton.hadMaterial = obj.material != null;
976
981
             if (!radioButton.hadMaterial)
977
982
             {
..
..
@@ -1223,7 +1228,7 @@
1223
1228
 //                        return;
1224
1229
 //                    }
1225
1230
                     
1226
-                    String string = (String) object;
1231
+                    String string = object.toString();
1227
1232
                     
1228
1233
                     // File path for Mac and Windows
1229
1234
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1488,6 +1493,8 @@
1488
1493
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1489
1494
 		reduce34MorphItem.addActionListener(this);
1490
1495
 		menu.add("-");
1496
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1497
+		memoryItem.addActionListener(this);
1491
1498
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1492
1499
 		computeAOItem.addActionListener(this);
1493
1500
                 
..
..
@@ -1496,8 +1503,6 @@
1496
1503
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1497
1504
 		mirrorItem.addActionListener(this);
1498
1505
 		menu.add("-");
1499
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1500
-		memoryItem.addActionListener(this);
1501
1506
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1502
1507
 		analyzeItem.addActionListener(this);
1503
1508
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -4833,8 +4838,8 @@
4833
4838
                 
4834
4839
 		if (cut)
4835
4840
 		{
4836
-        if (Globals.SAVEONMAKE)
4837
-                    Save();
4841
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4842
+//                    Save();
4838
4843
 			//int indices[] = jList.getSelectedIndices();
4839
4844
 			//for (int i = indices.length - 1; i >= 0; i--)
4840
4845
 			//jList.remove(indices[i]);
..
..
@@ -4937,6 +4942,10 @@
4937
4942
 	
4938
4943
 	void paste(boolean expand)
4939
4944
 	{
4945
+        if (Globals.SAVEONMAKE)
4946
+            Save();
4947
+        boolean keep = Globals.SAVEONMAKE;
4948
+        Globals.SAVEONMAKE = false;
4940
4949
 	//	if (GrafreeD.clipboard == null)
4941
4950
 	//		return;
4942
4951
 		boolean first = true;
..
..
@@ -4996,6 +5005,7 @@
4996
5005
                         Grafreed.clipboard.get(0).parent = keepparent;
4997
5006
 		}
4998
5007
 		
5008
+        Globals.SAVEONMAKE = keep;
4999
5009
 		ResetModel();
5000
5010
 		refreshContents();
5001
5011
 	}
..
..
@@ -5131,6 +5141,10 @@
5131
5141
         
5132
5142
 	void group(Object3D csg, boolean grab)
5133
5143
 	{
5144
+        if (Globals.SAVEONMAKE)
5145
+            Save();
5146
+        boolean keep = Globals.SAVEONMAKE;
5147
+        Globals.SAVEONMAKE = false;
5134
5148
 		if (//false) // why??
5135
5149
                     !group.selection.isEmpty())
5136
5150
                 {
..
..
@@ -5244,10 +5258,15 @@
5244
5258
                 //node.add(csg);
5245
5259
 		//makeSomething(node);
5246
5260
 		makeSomething(csg);
5261
+        Globals.SAVEONMAKE = keep;
5247
5262
 	}
5248
5263
 	
5249
5264
         void Ungroup(Object3D g)
5250
5265
         {
5266
+        if (Globals.SAVEONMAKE)
5267
+            Save();
5268
+        boolean keep = Globals.SAVEONMAKE;
5269
+        Globals.SAVEONMAKE = false;
5251
5270
             if (g instanceof HiddenObject)
5252
5271
             {
5253
5272
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5264,6 +5283,7 @@
5264
5283
                     objEditor.makeSomething(g.get(i), false);
5265
5284
                 }
5266
5285
             }
5286
+        Globals.SAVEONMAKE = keep;
5267
5287
         }
5268
5288
         
5269
5289
 	void ungroup()