Timeline activated

Normand Briere

2018-07-08 f4160780a4d8278920b99ada1050f320d6e30a73

 ObjEditor.java
..
..
@@ -292,9 +292,11 @@
292
292
         //normalLensItem.addActionListener(this);
293
293
         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294
294
         revertCameraItem.addActionListener(this);
295
-        cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
-        toggleFullItem.addItemListener(this);
297
-        toggleFullItem.setState(CameraPane.FULLSCREEN);
295
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296
+        toggleFullScreenItem.addItemListener(this);
297
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299
+        toggleTimelineItem.addItemListener(this);
298
300
         cameraMenu.add("-");
299
301
         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300
302
         toggleTextureItem.addItemListener(this);
..
..
@@ -1158,11 +1160,14 @@
1158
1160
         //JPanel worldPanel =
1159
1161
         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160
1162
         //worldPanel.setName("World");
1161
-		/*JPanel*/ cameraPanel =
1162
-                new JPanel(new BorderLayout());
1163
-        cameraPanel.add(cameraView);
1164
-        //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
1163
+	centralPanel = new JPanel(new BorderLayout());
1164
+	timelinePanel = new JPanel(new BorderLayout());
1165
+        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1165
1166
 
1167
+        centralPanel.add(cameraView);
1168
+        //frame.setJMenuBar(timelineMenubar);
1169
+        //centralPanel.add(timelinePanel);
1170
+        
1166
1171
         //topView.camera = ;
1167
1172
         //frontView.camera = new Camera(2);
1168
1173
         //sideView.camera = new Camera(3);
..
..
@@ -1192,7 +1197,7 @@
1192
1197
         gridPanel.add(cameraView);
1193
1198
         gridPanel.add(XYZPanel);
1194
1199
          */
1195
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1200
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1196
1201
         gridPanel.setContinuousLayout(true);
1197
1202
         gridPanel.setOneTouchExpandable(true);
1198
1203
         gridPanel.setDividerLocation(1.0);
..
..
@@ -1304,7 +1309,7 @@
1304
1309
         //	aConstraints.gridheight = 3;
1305
1310
         aWindowConstraints.gridx = 1;
1306
1311
         aWindowConstraints.fill = GridBagConstraints.BOTH;
1307
-        bigThree.add(cameraPanel, aWindowConstraints);
1312
+        bigThree.add(centralPanel, aWindowConstraints);
1308
1313
         aWindowConstraints.weightx = 0;
1309
1314
         aWindowConstraints.gridx = 4;
1310
1315
         aWindowConstraints.gridwidth = 1;
..
..
@@ -2959,7 +2964,26 @@
2959
2964
             // june 2013           copy.HardTouch();
2960
2965
             cameraView.repaint();
2961
2966
             return;
2962
-        } else if (event.getSource() == toggleFullItem)
2967
+        } else if (event.getSource() == toggleTimelineItem)
2968
+        {
2969
+            copy.timeline ^= true;
2970
+
2971
+            if (copy.timeline)
2972
+            {
2973
+                centralPanel.remove(cameraView);
2974
+                centralPanel.add(timelinePanel);
2975
+                frame.setJMenuBar(timelineMenubar);
2976
+            }
2977
+            else
2978
+            {
2979
+                centralPanel.remove(timelinePanel);
2980
+                centralPanel.add(cameraView);
2981
+                frame.setJMenuBar(null);
2982
+            }
2983
+
2984
+            frame.validate();
2985
+            return;
2986
+        } else if (event.getSource() == toggleFullScreenItem)
2963
2987
         {
2964
2988
             if (CameraPane.FULLSCREEN)
2965
2989
             {
..
..
@@ -3221,9 +3245,9 @@
3221
3245
             cameraView.RevertCamera();
3222
3246
             cameraView.repaint();
3223
3247
             return;
3224
-        } else if (event.getSource() == textureButton)
3225
-        {
3226
-            return; // true;
3248
+//        } else if (event.getSource() == textureButton)
3249
+//        {
3250
+//            return; // true;
3227
3251
         } else // combos...
3228
3252
         if (event.getSource() == texresMenu)
3229
3253
         {
..
..
@@ -4445,7 +4469,8 @@
4445
4469
     MenuItem revertCameraItem;
4446
4470
     CheckboxMenuItem toggleLiveItem;
4447
4471
     MenuItem stepItem;
4448
-    CheckboxMenuItem toggleFullItem;
4472
+    CheckboxMenuItem toggleFullScreenItem;
4473
+    CheckboxMenuItem toggleTimelineItem;
4449
4474
     CheckboxMenuItem toggleRenderItem;
4450
4475
     CheckboxMenuItem toggleDebugItem;
4451
4476
     CheckboxMenuItem toggleFrustumItem;
..
..
@@ -4473,10 +4498,12 @@
4473
4498
     JSplitPane bigPanel;
4474
4499
     JPanel bigThree;
4475
4500
     JTabbedPane scenePanel;
4476
-    JPanel cameraPanel;
4501
+    JPanel centralPanel;
4502
+    JPanel timelinePanel;
4503
+    JMenuBar timelineMenubar;
4477
4504
     JSplitPane framePanel;
4478
4505
     JTextArea/*Field*/ nameField;
4479
-    cButton textureButton;
4506
+    //cButton textureButton;
4480
4507
     cButton okButton;
4481
4508
     cButton applyButton;
4482
4509
     cButton cancelButton;