Compressed undo stack.

Normand Briere

2019-06-11 4113164b3be1e50251ac40d6fd65660f0a6c2e63

Compressed undo stack.

 CameraPane.java
..
..
@@ -2265,7 +2265,7 @@
2265
2265
         LOOKAT ^= true;
2266
2266
     }
2267
2267
 
2268
-    void ToggleRandom()
2268
+    void ToggleSwitch()
2269
2269
     {
2270
2270
         SWITCH ^= true;
2271
2271
     }
 ObjEditor.java
..
..
@@ -2927,7 +2927,7 @@
2927
2927
             return;
2928
2928
         } else if (event.getSource() == toggleSwitchItem)
2929
2929
         {
2930
-            cameraView.ToggleRandom();
2930
+            cameraView.ToggleSwitch();
2931
2931
             cameraView.repaint();
2932
2932
             return;
2933
2933
         } else if (event.getSource() == toggleHandleItem)
..
..
@@ -3239,6 +3239,7 @@
3239
3239
 
3240
3240
     static public Object Uncompress(byte[] bytes)
3241
3241
     {
3242
+        System.out.println("#bytes = " + bytes.length);
3242
3243
         try
3243
3244
         {
3244
3245
             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
..
..
@@ -3308,7 +3309,7 @@
3308
3309
         copy.ExtractBigData(hashtable);
3309
3310
         
3310
3311
         //EditorFrame.m_MainFrame.requestFocusInWindow();
3311
-        tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
3312
+        tab.graphs[tab.undoindex++] = Compress(copy);
3312
3313
 
3313
3314
         copy.RestoreBigData(hashtable);
3314
3315
         
..
..
@@ -3393,7 +3394,7 @@
3393
3394
 
3394
3395
         tab.undoindex -= 1;
3395
3396
 
3396
-        CopyChanged(tab.graphs[tab.undoindex]);
3397
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3397
3398
     }
3398
3399
 
3399
3400
     public void Redo()
..
..
@@ -3408,7 +3409,7 @@
3408
3409
 
3409
3410
         tab.undoindex += 1;
3410
3411
 
3411
-        CopyChanged(tab.graphs[tab.undoindex]);
3412
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3412
3413
     }
3413
3414
 
3414
3415
         void ImportGFD()
 Object3D.java
..
..
@@ -166,7 +166,15 @@
166
166
 void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
167
 {
168
168
     if (hashtable.containsKey(GetUUID()))
169
+    {
170
+        Object3D o = hashtable.get(GetUUID());
171
+
172
+        assert(this.bRep == o.bRep);
173
+        if (this.bRep != null)
174
+            assert(this.bRep.support == o.transientrep);
175
+        
169
176
         return;
177
+    }
170
178
     
171
179
     Object3D o = new Object3D();
172
180
     o.bRep = this.bRep;
 cRadio.java
..
..
@@ -35,7 +35,7 @@
35
35
             camera = (Camera)Grafreed.clone(c);
36
36
     }
37
37
     
38
-    Object3D graphs[] = new Object3D[10000];
38
+    byte[] graphs[] = new byte[10000][];
39
39
     int undoindex = 0;
40
40
     
41
41
     Object3D object;