blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009 
 ObjEditor.java
....@@ -83,7 +83,10 @@
8383     cButton GetButton(String name, boolean border)
8484     {
8585         ImageIcon icon = GetIcon(name);
86
-        return new cButton(icon, border);
86
+        if (icon != null)
87
+            return new cButton(icon, border);
88
+        else
89
+            return new cButton(name, border);
8790     }
8891 
8992     cLabel GetLabel(String name, boolean border)
....@@ -965,8 +968,13 @@
965968         object.versionlist = null;
966969         object.versiontable = null;
967970         
971
+        Object3D parent = object.parent;
972
+        object.parent = null;
973
+        
968974         //byte[] compress = Compress(copy);
969975         Object3D compress = (Object3D)Grafreed.clone(object);
976
+        
977
+        object.parent = parent;
970978         
971979         object.versionlist = versions;
972980         object.versiontable = versiontable; // if Grafreed.grafreed.universe
....@@ -1624,6 +1632,42 @@
16241632         //frontView.object = copy;
16251633         //sideView.object = copy;
16261634 
1635
+        transformPanel = new cGridBag().setVertical(true);
1636
+        
1637
+        cGridBag resetTransformPanel = new cGridBag();
1638
+        
1639
+        resetTransformPanel.preferredHeight = 2;
1640
+        
1641
+        cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
1642
+        resetTransform.addMouseListener(new MouseAdapter()
1643
+        {
1644
+            public void mouseClicked(MouseEvent e)
1645
+            {
1646
+                ResetTransform();
1647
+            }
1648
+        });
1649
+        resetTransformPanel.add(resetTransform);
1650
+        
1651
+        resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
1652
+        resetTransform.addMouseListener(new MouseAdapter()
1653
+        {
1654
+            public void mouseClicked(MouseEvent e)
1655
+            {
1656
+                ResetTransform(1);
1657
+            }
1658
+        });
1659
+        resetTransformPanel.add(resetTransform);
1660
+        
1661
+        resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
1662
+        resetTransform.addMouseListener(new MouseAdapter()
1663
+        {
1664
+            public void mouseClicked(MouseEvent e)
1665
+            {
1666
+                ResetTransform(2);
1667
+            }
1668
+        });
1669
+        resetTransformPanel.add(resetTransform);
1670
+        
16271671         XYZPanel = new cGridBag().setVertical(true);
16281672         //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
16291673 
....@@ -1633,6 +1677,9 @@
16331677         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
16341678         //XYZPanel.setName("XYZ");
16351679 
1680
+        transformPanel.add(resetTransformPanel);
1681
+        transformPanel.add(XYZPanel);
1682
+        
16361683         /*
16371684         gridPanel = new JPanel(); //new BorderLayout());
16381685         gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1640,12 +1687,12 @@
16401687         gridPanel.add(cameraView);
16411688         gridPanel.add(XYZPanel);
16421689          */
1643
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1644
-        gridPanel.setContinuousLayout(true);
1645
-        gridPanel.setOneTouchExpandable(true);
1646
-        gridPanel.setDividerLocation(1.0);
1647
-        gridPanel.setDividerSize(9);
1648
-        gridPanel.setResizeWeight(0.85);
1690
+//        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1691
+//        gridPanel.setContinuousLayout(true);
1692
+//        gridPanel.setOneTouchExpandable(true);
1693
+//        gridPanel.setDividerLocation(1.0);
1694
+//        gridPanel.setDividerSize(9);
1695
+//        gridPanel.setResizeWeight(0.85);
16491696 
16501697 //                aConstraints.weighty = 0;
16511698         //System.out.println("THIS = " + this);
....@@ -1688,9 +1735,9 @@
16881735         objectPanel.setIconAt(3, GetIcon("icons/write.png"));
16891736         objectPanel.setToolTipTextAt(3, "Edit controls");
16901737         
1691
-        objectPanel.add(XYZPanel);
1738
+        objectPanel.add(transformPanel);
16921739         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1693
-        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1740
+        objectPanel.setToolTipTextAt(4, "TRS transform");
16941741         
16951742         patchMaterial = true;
16961743         cameraView.patchMaterial = this;
....@@ -1757,13 +1804,13 @@
17571804         jtp.add(tree);
17581805          */
17591806 
1760
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1761
-        bigPanel.setContinuousLayout(true);
1762
-        bigPanel.setOneTouchExpandable(true);
1763
-        bigPanel.setDividerLocation(0.8);
1764
-        bigPanel.setDividerSize(15);
1765
-        bigPanel.setResizeWeight(0.15);
1766
-        bigPanel.setName("Scene");
1807
+//        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1808
+//        bigPanel.setContinuousLayout(true);
1809
+//        bigPanel.setOneTouchExpandable(true);
1810
+//        bigPanel.setDividerLocation(0.8);
1811
+//        bigPanel.setDividerSize(15);
1812
+//        bigPanel.setResizeWeight(0.15);
1813
+//        bigPanel.setName("Scene");
17671814 
17681815         //bigPanel.setLayout(new BorderLayout());
17691816         //bigPanel.setSize(new Dimension(10,10));
....@@ -1847,7 +1894,7 @@
18471894         
18481895                     cameraView.requestFocusInWindow();
18491896                     
1850
-        gridPanel.setDividerLocation(1.0);
1897
+//        gridPanel.setDividerLocation(1.0);
18511898         
18521899         frame.validate();
18531900 
....@@ -4432,6 +4479,8 @@
44324479         return count;
44334480     }
44344481     
4482
+    public cGridBag versionSliderPane;
4483
+    
44354484     void SetVersionStates()
44364485     {
44374486         //if (true)
....@@ -4439,21 +4488,36 @@
44394488                     
44404489         //cRadio tab = GetCurrentTab();
44414490         
4442
-        restoreButton.setEnabled(copy.versionindex != -1);
4443
-        replaceButton.setEnabled(copy.versionindex != -1);
4444
-        
4445
-        previousVersionButton.setEnabled(copy.versionindex > 0);
4446
-        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4447
-        
4448
-        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
-                                        //copy.versionlist[copy.versionindex + 1] != null);
4450
-        
4451
-        muteSlider = true;
4452
-        versionSlider.setMinimum(0);
4453
-        versionSlider.setMaximum(VersionCount() - 1);
4454
-        versionSlider.setInteger(copy.versionindex);
4455
-        versionSlider.setEnabled(copy.versionindex != -1);
4456
-        muteSlider = false;
4491
+        if (copy.versionlist == null)
4492
+        {
4493
+            saveVersionButton.setEnabled(false);
4494
+            restoreButton.setEnabled(false);
4495
+            replaceButton.setEnabled(false);
4496
+            previousVersionButton.setEnabled(false);
4497
+            nextVersionButton.setEnabled(false);
4498
+            deleteVersionButton.setEnabled(false);
4499
+            versionSliderPane.setVisible(false);
4500
+        }
4501
+        else
4502
+        {
4503
+            restoreButton.setEnabled(copy.versionindex != -1);
4504
+            replaceButton.setEnabled(copy.versionindex != -1);
4505
+
4506
+            previousVersionButton.setEnabled(copy.versionindex > 0);
4507
+            nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4508
+
4509
+            deleteVersionButton.setEnabled(copy.versionindex != -1);
4510
+                                            //copy.versionlist[copy.versionindex + 1] != null);
4511
+
4512
+            muteSlider = true;
4513
+            versionSlider.setMinimum(0);
4514
+            versionSlider.setMaximum(VersionCount() - 1);
4515
+            versionSlider.setInteger(copy.versionindex);
4516
+            versionSlider.setEnabled(copy.versionindex != -1);
4517
+            muteSlider = false;
4518
+            
4519
+            versionSliderPane.setVisible(true);
4520
+        }
44574521     }
44584522     
44594523     public boolean PreviousVersion()
....@@ -4873,7 +4937,7 @@
48734937     
48744938     public void stateChanged(ChangeEvent e)
48754939     {
4876
-        //    assert(false);
4940
+        // assert(false);
48774941         if (e.getSource() == versionSlider)
48784942         {
48794943             if (muteSlider)
....@@ -5986,6 +6050,7 @@
59866050     boolean materialFlushed;
59876051     Object3D latestObject;
59886052     
6053
+    cGridBag transformPanel;
59896054     cGridBag XYZPanel;
59906055     
59916056     JSplitPane gridPanel;