Rewind all.

Normand Briere

2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e

 ObjEditor.java
..
..
@@ -168,6 +168,7 @@
168
168
 //        objEditor.ctrlPanel.remove(remarkButton);
169
169
         
170
170
         objEditor.ctrlPanel.remove(setupPanel);
171
+        objEditor.ctrlPanel.remove(setupPanel2);
171
172
         objEditor.ctrlPanel.remove(commandsPanel);
172
173
         objEditor.ctrlPanel.remove(pushPanel);
173
174
         //objEditor.ctrlPanel.remove(fillPanel);
..
..
@@ -419,10 +420,10 @@
419
420
             e.printStackTrace();
420
421
         }
421
422
         
422
-        String selection = infoarea.getText();
423
-        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
424
-        java.awt.datatransfer.Clipboard clipboard = 
425
-                Toolkit.getDefaultToolkit().getSystemClipboard();
423
+//        String selection = infoarea.getText();
424
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
425
+//        java.awt.datatransfer.Clipboard clipboard = 
426
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
426
427
         //clipboard.setContents(data, data);
427
428
     }
428
429
     
..
..
@@ -747,6 +748,7 @@
747
748
     
748
749
     cGridBag namePanel;
749
750
     cGridBag setupPanel;
751
+    cGridBag setupPanel2;
750
752
     cGridBag commandsPanel;
751
753
     cGridBag pushPanel;
752
754
     cGridBag fillPanel;
..
..
@@ -939,21 +941,25 @@
939
941
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940
942
         markCB.setToolTipText("Set the animation target transform");
941
943
         
942
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
944
+            setupPanel2 = new cGridBag().setVertical(false);
945
+            
946
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943
947
         rewindCB.setToolTipText("Rewind animation");
944
948
         
945
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946
-        randomCB.setToolTipText("Option for switch node");
949
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
+        randomCB.setToolTipText("Rewind or Go back and forth randomly");
947
951
 
948
952
         if (Globals.ADVANCED)
949
953
         {
950
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
954
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
951
955
                 link2masterCB.setToolTipText("Attach to support");
952
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
956
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953
957
                 speedupCB.setToolTipText("Option motion capture");
954
958
         }
955
959
         
956
960
         oe.ctrlPanel.add(setupPanel);
961
+        oe.ctrlPanel.Return();
962
+        oe.ctrlPanel.add(setupPanel2);
957
963
         oe.ctrlPanel.Return();
958
964
         
959
965
             commandsPanel = new cGridBag().setVertical(false);
..
..
@@ -4295,6 +4301,7 @@
4295
4301
 
4296
4302
         try
4297
4303
         {
4304
+            // Try compressed version first.
4298
4305
             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4299
4306
             java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4300
4307
             java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..
..
@@ -4364,6 +4371,12 @@
4364
4371
 
4365
4372
     void LoadIt(Object obj)
4366
4373
     {
4374
+        if (obj == null)
4375
+        {
4376
+            // Invalid file
4377
+            return;
4378
+        }
4379
+        
4367
4380
         System.out.println("Loaded " + obj);
4368
4381
         //new Exception().printStackTrace();
4369
4382
         Object3D readobj = (Object3D) obj;