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,
....@@ -1187,7 +1189,8 @@
11871189 //JPanel worldPanel =
11881190 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11891191 //worldPanel.setName("World");
1190
- centralPanel = new JPanel(new BorderLayout());
1192
+ centralPanel = new cGridBag();
1193
+ centralPanel.preferredWidth = 20;
11911194 timelinePanel = new JPanel(new BorderLayout());
11921195 timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11931196
....@@ -1217,12 +1220,13 @@
12171220 //frontView.object = copy;
12181221 //sideView.object = copy;
12191222
1220
- XYZPanel = new JPanel();
1221
- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1223
+ XYZPanel = new cGridBag().setVertical(true);
1224
+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12221225
1223
- XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1224
- XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1225
- 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);
12261230
12271231 /*
12281232 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1284,10 +1288,13 @@
12841288 scrollpane.setWheelScrollingEnabled(true);
12851289 scrollpane.addMouseWheelListener(this); // Default not fast enough
12861290
1287
- /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
- scenePanel.add(scrollpane);
1291
+ /*JTabbedPane*/ scenePanel = new cGridBag();
1292
+ scenePanel.preferredWidth = 7;
1293
+
1294
+ JTabbedPane tabbedPane = new JTabbedPane();
1295
+ tabbedPane.add(scrollpane);
12891296
1290
- scenePanel.add(FSPane = new cFileSystemPane(this));
1297
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12911298
12921299 optionsPanel = new JPanel(new GridBagLayout());
12931300
....@@ -1295,8 +1302,9 @@
12951302
12961303 AddOptions(optionsPanel, aConstraints);
12971304
1298
- scenePanel.add(optionsPanel);
1299
-
1305
+ tabbedPane.add(optionsPanel);
1306
+
1307
+ scenePanel.add(tabbedPane);
13001308
13011309 /*
13021310 cTree jTree = new cTree(null);
....@@ -1330,6 +1338,7 @@
13301338 //bigPanel.setSize(new Dimension(10,10));
13311339 //bigPanel.add(ctrlPanel);
13321340 //bigPanel.add(gridPanel);
1341
+ /**
13331342 bigThree = new JPanel();
13341343 //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13351344 bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1353,7 +1362,13 @@
13531362 // aConstraints.gridheight = 3;
13541363 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13551364 bigThree.add(XYZPanel, aWindowConstraints);
1365
+ /**/
13561366
1367
+ bigThree = new cGridBag();
1368
+ bigThree.addComponent(scenePanel);
1369
+ bigThree.addComponent(centralPanel);
1370
+ bigThree.addComponent(XYZPanel);
1371
+
13571372 // // SIDE EFFECT!!!
13581373 // aConstraints.gridx = 0;
13591374 // aConstraints.gridy = 0;
....@@ -4546,12 +4561,12 @@
45464561 JScrollPane infoPanel;
45474562 JPanel optionsPanel;
45484563 JTabbedPane objectPanel;
4549
- JPanel XYZPanel;
4564
+ cGridBag XYZPanel;
45504565 JSplitPane gridPanel;
45514566 JSplitPane bigPanel;
4552
- JPanel bigThree;
4553
- JTabbedPane scenePanel;
4554
- JPanel centralPanel;
4567
+ cGridBag bigThree;
4568
+ cGridBag scenePanel;
4569
+ cGridBag centralPanel;
45554570 JSplitPane cameraPanel;
45564571 JPanel timelinePanel;
45574572 JMenuBar timelineMenubar;