From 21ac57b36a9e3b909853c7d64ac29b7ad72490a3 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 02 Sep 2019 16:52:19 -0400
Subject: [PATCH] Figure panel.

---
 ObjEditor.java |   62 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/ObjEditor.java b/ObjEditor.java
index 46f9842..530b091 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -504,7 +504,7 @@
         //povItem.addActionListener(this);
         closeItem.addActionListener(this);
 
-        objectPanel = new JTabbedPane();
+        objectTabbedPane = new JTabbedPane();
         
         ChangeListener changeListener = new ChangeListener()
         {
@@ -555,13 +555,13 @@
 //                        }
 //                    }
 //                }
-                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
+                cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 4;
                 
 //                refreshContents(false); // To refresh Info tab
                 cameraView.repaint();
             }
         };
-        objectPanel.addChangeListener(changeListener);
+        objectTabbedPane.addChangeListener(changeListener);
     
         toolbarPanel = new JPanel();
         toolbarPanel.setName("Toolbar");
@@ -604,7 +604,7 @@
         //infoPanel.setLayout(new BorderLayout());
         //infoPanel.add(createTextPane());
 
-        mainPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePanel, objectPanel);
+        mainPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePanel, objectTabbedPane);
         mainPanel.setName("Main");
         mainPanel.setContinuousLayout(true);
         mainPanel.setOneTouchExpandable(true);
@@ -1589,6 +1589,8 @@
 
         return null;
     }
+    
+    int objectTabCount;
 
     void SetupViews()
     {
@@ -1761,33 +1763,42 @@
 
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         //tmp.setName("Edit");
-        objectPanel.add(skyboxPanel);
-        objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
-        objectPanel.setToolTipTextAt(0, "Backgrounds");
         
-        objectPanel.add(toolboxPanel);
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
+        objectTabCount = 0;
+        
+        objectTabbedPane.add(skyboxPanel);
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/skybox.jpg"));
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Backgrounds");
+        
+        objectTabbedPane.add(toolboxPanel);
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/primitives.png"));
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Objects & textures");
 
-        objectPanel.add(materialPanel);
-        objectPanel.setIconAt(2, GetIcon("icons/material.png"));
-        objectPanel.setToolTipTextAt(2, "Material");
+        objectTabbedPane.add(materialPanel);
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/material.png"));
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Material");
     
+        figurePanel = new cGridBag();
+        figurePanel.add(new cButton("FIGURES amd POSES coming soon!"));
+        objectTabbedPane.add(figurePanel);
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/run.png"));
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
+        
 //        JPanel north = new JPanel(new BorderLayout());
 //        north.setName("Edit");
 //        north.add(ctrlPanel, BorderLayout.NORTH);
 //        objectPanel.add(north);
-        objectPanel.add(editPanel);
-        objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
-        objectPanel.setToolTipTextAt(3, "Edit controls");
+        objectTabbedPane.add(editPanel);
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/writewhite.png"));
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Edit controls");
         
-        objectPanel.add(transformPanel);
-        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
-        objectPanel.setToolTipTextAt(4, "TRS transform");
+        objectTabbedPane.add(transformPanel);
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/XYZ.png"));
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "TRS transform");
         
         patchMaterial = true;
         cameraView.patchMaterial = this;
-        objectPanel.setSelectedIndex(2);
+        objectTabbedPane.setSelectedIndex(2);
                 
         /*
         aConstraints.gridx = 0;
@@ -1808,7 +1819,7 @@
         scrollpane.addMouseWheelListener(this); // Default not fast enough
 
         /*JTabbedPane*/ scenePanel = new cGridBag();
-        scenePanel.preferredWidth = 5;
+        scenePanel.preferredWidth = 6;
         
         JTabbedPane tabbedPane = new JTabbedPane();
         tabbedPane.add(scrollpane);
@@ -1917,9 +1928,9 @@
         
         if (Globals.SHOWINFO)
         {
-            objectPanel.add(infoPanel);
-            objectPanel.setIconAt(5, GetIcon("icons/info.png"));
-            objectPanel.setToolTipTextAt(4, "Information");
+            objectTabbedPane.add(infoPanel);
+            objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/info.png"));
+            objectTabbedPane.setToolTipTextAt(objectTabCount++, "Information");
         }
 
         /*
@@ -6299,12 +6310,13 @@
     cGridBag skyboxPanel;
     cGridBag materialPanel;
     cGridBag ctrlPanel;
+    cGridBag figurePanel;
     
     JScrollPane infoPanel;
     
     cGridBag optionsPanel;
     
-    JTabbedPane objectPanel;
+    JTabbedPane objectTabbedPane;
     boolean materialFlushed;
     Object3D latestObject;
     

--
Gitblit v1.6.2