blame | history | patch | commit | commitdiff
Normand Briere
2019-04-29 c0c300a9dbd4c0fc127e003e9481d3f9246bbe7a 
 ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020         matrix.Matrix;
2121 
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325         ActionListener, ChangeListener,
2426         InputMethodListener,
....@@ -31,6 +33,9 @@
3133         boolean timeline;
3234         boolean wasFullScreen;
3335 
36
+    GroupEditor callee;
37
+    JFrame frame;
38
+    
3439     // SCRIPT
3540     
3641     transient JFrame textpanel = null;
....@@ -121,14 +126,13 @@
121126     void keyPressed(int key, int modifiers)
122127     {
123128     System.out.println("KEY PRESSED");
124
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
125130     }
126131      */
127132 
128133     static GridBagConstraints aConstraints;
129134     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
135
+
132136     static int GRIDWIDTH = 100; // 4;
133137 
134138     public void closeUI()
....@@ -309,7 +313,7 @@
309313         toggleTextureItem.setState(CameraPane.textureon);
310314         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311315         toggleLiveItem.addItemListener(this);
312
-        toggleLiveItem.setState(CameraPane.isLIVE());
316
+        toggleLiveItem.setState(Globals.isLIVE());
313317         cameraMenu.add(stepItem = new MenuItem("Step"));
314318         stepItem.addActionListener(this);
315319 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -1185,10 +1189,18 @@
11851189         //JPanel worldPanel =
11861190         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11871191         //worldPanel.setName("World");
1188
-	centralPanel = new JPanel(new BorderLayout());
1192
+	centralPanel = new cGridBag();
1193
+        centralPanel.preferredWidth = 20;
11891194 	timelinePanel = new JPanel(new BorderLayout());
11901195         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11911196 
1197
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198
+        cameraPanel.setContinuousLayout(true);
1199
+        cameraPanel.setOneTouchExpandable(true);
1200
+//        cameraPanel.setDividerLocation(0.9);
1201
+//        cameraPanel.setDividerSize(9);
1202
+        cameraPanel.setResizeWeight(1.0);
1203
+        
11921204         centralPanel.add(cameraView);
11931205         //frame.setJMenuBar(timelineMenubar);
11941206         //centralPanel.add(timelinePanel);
....@@ -1208,12 +1220,13 @@
12081220         //frontView.object = copy;
12091221         //sideView.object = copy;
12101222 
1211
-        XYZPanel = new JPanel();
1212
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1223
+        XYZPanel = new cGridBag().setVertical(true);
1224
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12131225 
1214
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1215
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1216
-        XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1226
+        XYZPanel.preferredWidth = 5;
1227
+        XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1228
+        XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1229
+        XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
12171230 
12181231         /*
12191232         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1275,16 +1288,23 @@
12751288         scrollpane.setWheelScrollingEnabled(true);
12761289         scrollpane.addMouseWheelListener(this); // Default not fast enough
12771290 
1278
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1279
-        scenePanel.add(scrollpane);
1291
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1292
+        scenePanel.preferredWidth = 7;
1293
+        
1294
+        JTabbedPane tabbedPane = new JTabbedPane();
1295
+        tabbedPane.add(scrollpane);
12801296 
1281
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1297
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12821298 
12831299         optionsPanel = new JPanel(new GridBagLayout());
12841300 
12851301         optionsPanel.setName("Options");
1286
-        scenePanel.add(optionsPanel);
1287
-
1302
+        
1303
+        AddOptions(optionsPanel, aConstraints);
1304
+        
1305
+        tabbedPane.add(optionsPanel);
1306
+        
1307
+        scenePanel.add(tabbedPane);
12881308 
12891309         /*
12901310         cTree jTree = new cTree(null);
....@@ -1318,6 +1338,7 @@
13181338         //bigPanel.setSize(new Dimension(10,10));
13191339         //bigPanel.add(ctrlPanel);
13201340         //bigPanel.add(gridPanel);
1341
+        /**
13211342         bigThree = new JPanel();
13221343         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13231344         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1341,7 +1362,13 @@
13411362         //	aConstraints.gridheight = 3;
13421363         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13431364         bigThree.add(XYZPanel, aWindowConstraints);
1365
+        /**/
13441366 
1367
+        bigThree = new cGridBag();
1368
+        bigThree.addComponent(scenePanel);
1369
+        bigThree.addComponent(centralPanel);
1370
+        bigThree.addComponent(XYZPanel);
1371
+        
13451372 //                // SIDE EFFECT!!!
13461373 //		aConstraints.gridx = 0;
13471374 //		aConstraints.gridy = 0;
....@@ -1362,7 +1389,8 @@
13621389         //worldPane.add(bigPanel);
13631390         //worldPane.add(worldPanel);
13641391                 /**/
1365
-        frame.getContentPane().add(/*"Center",*/framePanel);
1392
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1393
+        frame.add(/*"Center",*/framePanel);
13661394         //frame.getContentPane().add(/*"Center",*/ worldPane);
13671395 
13681396 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1383,6 +1411,10 @@
13831411         });
13841412     }
13851413 
1414
+    void AddOptions(JPanel panel, GridBagConstraints constraints)
1415
+    {
1416
+    }
1417
+    
13861418     JTree GetTree()
13871419     {
13881420         return objEditor.jTree;
....@@ -2996,7 +3028,8 @@
29963028             if (timeline)
29973029             {
29983030                 centralPanel.remove(cameraView);
2999
-                centralPanel.add(timelinePanel);
3031
+                cameraPanel.add(cameraView);
3032
+                centralPanel.add(cameraPanel);
30003033                 frame.setJMenuBar(timelineMenubar);
30013034                 wasFullScreen = CameraPane.FULLSCREEN;
30023035                 if (!CameraPane.FULLSCREEN)
....@@ -3005,7 +3038,7 @@
30053038             }
30063039             else
30073040             {
3008
-                centralPanel.remove(timelinePanel);
3041
+                centralPanel.remove(cameraPanel);
30093042                 centralPanel.add(cameraView);
30103043                 frame.setJMenuBar(null);
30113044                 if (!wasFullScreen)
....@@ -3128,7 +3161,8 @@
31283161             objEditor.refreshContents();
31293162         } else if (event.getSource() == stepItem)
31303163         {
3131
-            cameraView.ONESTEP = true;
3164
+            //cameraView.ONESTEP = true;
3165
+            Globals.ONESTEP = true;
31323166             cameraView.repaint();
31333167             return;
31343168         } else if (event.getSource() == stepButton)
....@@ -3285,25 +3319,25 @@
32853319 
32863320     void ToggleAnimation()
32873321     {
3288
-        if (!CameraPane.ANIMATION)
3322
+        if (!Globals.ANIMATION)
32893323         {
32903324             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32913325             browser.show();
32923326             String filename = browser.getFile();
32933327             if (filename != null && filename.length() > 0)
32943328             {
3295
-                CameraPane.filename = browser.getDirectory() + filename;
3329
+                Globals.filename = browser.getDirectory() + filename;
32963330                 //CameraPane.framecount = 0;
3297
-                CameraPane.imagecount = 0;
3331
+                Globals.imagecount = 0;
32983332 
3299
-                CameraPane.ANIMATION ^= true;
3333
+                Globals.ANIMATION ^= true;
33003334 
33013335                 GrafreeD.wav.cursor = 0;
33023336                 GrafreeD.wav.loop = 0;
33033337             }
33043338         } else
33053339         {
3306
-            CameraPane.ANIMATION ^= true;
3340
+            Globals.ANIMATION ^= true;
33073341         }
33083342     }
33093343 
....@@ -4527,12 +4561,13 @@
45274561     JScrollPane infoPanel;
45284562     JPanel optionsPanel;
45294563     JTabbedPane objectPanel;
4530
-    JPanel XYZPanel;
4564
+    cGridBag XYZPanel;
45314565     JSplitPane gridPanel;
45324566     JSplitPane bigPanel;
4533
-    JPanel bigThree;
4534
-    JTabbedPane scenePanel;
4535
-    JPanel centralPanel;
4567
+    cGridBag bigThree;
4568
+    cGridBag scenePanel;
4569
+    cGridBag centralPanel;
4570
+    JSplitPane cameraPanel;
45364571     JPanel timelinePanel;
45374572     JMenuBar timelineMenubar;
45384573     JSplitPane framePanel;