blame | history | patch | commit | commitdiff
Normand Briere
2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15 
 ObjEditor.java
....@@ -44,61 +44,47 @@
4444     
4545     cButton GetButton(String name, boolean border)
4646     {
47
-        try
48
-        {
49
-            ImageIcon icon = GetIcon(name);
50
-            return new cButton(icon, border);
51
-        }
52
-        catch (Exception e)
53
-        {
54
-            return new cButton(name, border);
55
-        }
47
+        ImageIcon icon = GetIcon(name);
48
+        return new cButton(icon, border);
5649     }
5750 
5851     cToggleButton GetToggleButton(String name, boolean border)
5952     {
60
-        try
61
-        {
62
-            ImageIcon icon = GetIcon(name);
63
-            return new cToggleButton(icon, border);
64
-        }
65
-        catch (Exception e)
66
-        {
67
-            return new cToggleButton(name, border);
68
-        }
53
+        ImageIcon icon = GetIcon(name);
54
+        return new cToggleButton(icon, border);
6955     }
7056 
7157     cCheckBox GetCheckBox(String name, boolean border)
7258     {
59
+        ImageIcon icon = GetIcon(name);
60
+        return new cCheckBox(icon, border);
61
+    }
62
+
63
+    private ImageIcon GetIcon(String name)
64
+    {
7365         try
7466         {
75
-            ImageIcon icon = GetIcon(name);
76
-            return new cCheckBox(icon, border);
67
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68
+
69
+            if (image.getWidth() != 24 && image.getHeight() != 24)
70
+            {
71
+                BufferedImage resized = new BufferedImage(24, 24, image.getType());
72
+                Graphics2D g = resized.createGraphics();
73
+                g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
+                //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
+                g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76
+                g.dispose();
77
+
78
+                image = resized;
79
+            }
80
+
81
+            javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
+            return icon;
7783         }
7884         catch (Exception e)
7985         {
80
-            return new cCheckBox(name, border);
86
+            return null;
8187         }
82
-    }
83
-
84
-    private ImageIcon GetIcon(String name) throws IOException
85
-    {
86
-        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-        
88
-        if (image.getWidth() != 24 && image.getHeight() != 24)
89
-        {
90
-            BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
-            Graphics2D g = resized.createGraphics();
92
-            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
-            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
-            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
-            g.dispose();
96
-            
97
-            image = resized;
98
-        }
99
-        
100
-        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
-        return icon;
10288     }
10389     
10490     // SCRIPT
....@@ -282,6 +268,12 @@
282268         client = inClient;
283269         copy = client;
284270 
271
+        if (copy.versions == null)
272
+        {
273
+            copy.versions = new byte[100][];
274
+            copy.versionindex = -1;
275
+        }
276
+        
285277         // "this" is not called: SetupUI2(objEditor);
286278     }
287279 
....@@ -295,6 +287,12 @@
295287         client = inClient;
296288         copy = client;
297289 
290
+        if (copy.versions == null)
291
+        {
292
+            copy.versions = new byte[100][];
293
+            copy.versionindex = -1;
294
+        }
295
+        
298296         SetupUI2(callee.GetEditor());
299297     }
300298 
....@@ -327,6 +325,12 @@
327325         copy = localCopy;
328326         copy.editWindow = this;
329327 
328
+        if (copy.versions == null)
329
+        {
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
332
+        }
333
+        
330334         SetupMenu();
331335 
332336         //SetupName(objEditor); // new
....@@ -419,11 +423,12 @@
419423     
420424         toolbarPanel = new JPanel();
421425         toolbarPanel.setName("Toolbar");
426
+        
422427         treePanel = new cGridBag();
423428         treePanel.setName("Tree");
424429         
425430         editPanel = new cGridBag().setVertical(true);
426
-        editPanel.setName("Edit");
431
+        //editPanel.setName("Edit");
427432         
428433         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429434         
....@@ -432,10 +437,10 @@
432437         editPanel.add(ctrlPanel);
433438                 
434439         toolboxPanel = new cGridBag().setVertical(false);
435
-        toolboxPanel.setName("Toolbox");
440
+        //toolboxPanel.setName("Toolbox");
436441         
437442         materialPanel = new cGridBag().setVertical(true);
438
-        materialPanel.setName("Material");
443
+        //materialPanel.setName("Material");
439444         
440445         /*JTextPane*/
441446         infoarea = createTextPane();
....@@ -443,6 +448,7 @@
443448 
444449         infoarea.setEditable(true);
445450         SetText();
451
+        
446452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447453 //            infoarea.setOpaque(false);
448454 //            //infoarea.setForeground(textcolor);
....@@ -450,7 +456,7 @@
450456 // TEXTAREA           infoarea.setWrapStyleWord(true);
451457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452458         infoPanel.setPreferredSize(new Dimension(1, 1));
453
-        infoPanel.setName("Info");
459
+        //infoPanel.setName("Info");
454460         //infoPanel.setLayout(new BorderLayout());
455461         //infoPanel.add(createTextPane());
456462 
....@@ -968,7 +974,7 @@
968974 //    NumberSlider vDivsField;
969975 //    JCheckBox endcaps;
970976     JCheckBox liveCB;
971
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
972978     JCheckBox hideCB;
973979     JCheckBox link2masterCB;
974980     JCheckBox markCB;
....@@ -1180,9 +1186,10 @@
11801186             
11811187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11821188                 liveCB.setToolTipText("Animate object");
1183
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1184
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
11851191 //            Return();
1192
+                
11861193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11871194                 hideCB.setToolTipText("Hide object");
11881195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
....@@ -1474,6 +1481,7 @@
14741481         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14751482         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14761483         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1484
+        //XYZPanel.setName("XYZ");
14771485 
14781486         /*
14791487         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1511,16 +1519,23 @@
15111519         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15121520         //tmp.setName("Edit");
15131521         objectPanel.add(materialPanel);
1522
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15141523 //        JPanel north = new JPanel(new BorderLayout());
15151524 //        north.setName("Edit");
15161525 //        north.add(ctrlPanel, BorderLayout.NORTH);
15171526 //        objectPanel.add(north);
15181527         objectPanel.add(editPanel);
1528
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
15191529         
15201530         //if (Globals.ADVANCED)
15211531             objectPanel.add(infoPanel);
1532
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1533
+        
1534
+        objectPanel.add(XYZPanel);
1535
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
15221536         
15231537         objectPanel.add(toolboxPanel);
1538
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
15241539 
15251540         /*
15261541         aConstraints.gridx = 0;
....@@ -1541,7 +1556,7 @@
15411556         scrollpane.addMouseWheelListener(this); // Default not fast enough
15421557 
15431558         /*JTabbedPane*/ scenePanel = new cGridBag();
1544
-        scenePanel.preferredWidth = 6;
1559
+        scenePanel.preferredWidth = 5;
15451560         
15461561         JTabbedPane tabbedPane = new JTabbedPane();
15471562         tabbedPane.add(scrollpane);
....@@ -1617,9 +1632,9 @@
16171632         /**/
16181633 
16191634         bigThree = new cGridBag();
1620
-        bigThree.addComponent(scenePanel);
16211635         bigThree.addComponent(centralPanel);
1622
-        bigThree.addComponent(XYZPanel);
1636
+        bigThree.addComponent(scenePanel);
1637
+        //bigThree.addComponent(XYZPanel);
16231638         
16241639 //                // SIDE EFFECT!!!
16251640 //		aConstraints.gridx = 0;
....@@ -3236,7 +3251,7 @@
32363251         {
32373252             copy.live ^= true;
32383253             return;
3239
-        } else if (event.getSource() == selectCB)
3254
+        } else if (event.getSource() == selectableCB)
32403255         {
32413256             copy.dontselect ^= true;
32423257             return;
....@@ -3731,18 +3746,42 @@
37313746     cButton replaceButton;
37323747     cButton redoButton;
37333748         
3749
+    boolean muteSlider;
3750
+    
3751
+    int VersionCount()
3752
+    {
3753
+        int count = 0;
3754
+        
3755
+        for (int i = copy.versions.length; --i >= 0;)
3756
+        {
3757
+            if (copy.versions[i] != null)
3758
+                count++;
3759
+        }
3760
+        
3761
+        return count;
3762
+    }
3763
+    
37343764     void SetUndoStates()
37353765     {
37363766         cRadio tab = GetCurrentTab();
37373767         
37383768         restoreButton.setEnabled(copy.versionindex != -1);
37393769         replaceButton.setEnabled(copy.versionindex != -1);
3770
+        
37403771         undoButton.setEnabled(copy.versionindex > 0);
37413772         redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3773
+        
3774
+        muteSlider = true;
3775
+        versionSlider.setMaximum(VersionCount() - 1);
3776
+        versionSlider.setInteger(copy.versionindex);
3777
+        muteSlider = false;
37423778     }
37433779     
37443780     public boolean Undo()
37453781     {
3782
+        // Option?
3783
+        Replace();
3784
+        
37463785         System.err.println("Undo");
37473786         
37483787         cRadio tab = GetCurrentTab();
....@@ -3809,6 +3848,9 @@
38093848 
38103849     public void Redo()
38113850     {
3851
+        // Option?
3852
+        Replace();
3853
+        
38123854         cRadio tab = GetCurrentTab();
38133855         
38143856         if (copy.versions[copy.versionindex + 1] == null)
....@@ -4118,14 +4160,17 @@
41184160         //copy.Touch();
41194161     }
41204162 
4121
-    cNumberSlider versionField;
4163
+    cNumberSlider versionSlider;
41224164     
41234165     public void stateChanged(ChangeEvent e)
41244166     {
41254167         //    assert(false);
4126
-        if (e.getSource() == versionField)
4168
+        if (e.getSource() == versionSlider)
41274169         {
4128
-            int version = versionField.getInteger();
4170
+            if (muteSlider)
4171
+                return;
4172
+            
4173
+            int version = versionSlider.getInteger();
41294174             
41304175             if (copy.versions[version] != null)
41314176             {
....@@ -4724,7 +4769,9 @@
47244769             readobj.ResetDisplayList();
47254770         } catch (Exception e)
47264771         {
4727
-            //e.printStackTrace();
4772
+            if (!e.toString().contains("GZIP"))
4773
+                e.printStackTrace();
4774
+            
47284775             try
47294776             {
47304777                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4844,6 +4891,7 @@
48444891                 }
48454892             } catch (ClassCastException e)
48464893             {
4894
+                e.printStackTrace();
48474895                 assert (false);
48484896                 Composite c = (Composite) copy;
48494897                 c.children.clear();
....@@ -4857,7 +4905,13 @@
48574905             copy.versions = readobj.versions;
48584906             copy.versionindex = readobj.versionindex;
48594907             
4860
-            SetUndoStates();
4908
+        if (copy.versions == null)
4909
+        {
4910
+            copy.versions = new byte[100][];
4911
+            copy.versionindex = -1;
4912
+        }
4913
+        
4914
+            //? SetUndoStates();
48614915             
48624916             ResetModel();
48634917             copy.HardTouch(); // recompile?
....@@ -4968,6 +5022,7 @@
49685022             //ps.print(buffer.toString());
49695023         } catch (IOException e)
49705024         {
5025
+            e.printStackTrace();
49715026         }
49725027     }
49735028