blame | history | patch | commit | commitdiff
Normand Briere
2018-07-08 f4160780a4d8278920b99ada1050f320d6e30a73 
 GroupEditor.java
....@@ -520,6 +520,9 @@
520520 		
521521 		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522522 		flashSelectionButton.addActionListener(this);
523
+                
524
+		oe.toolbarPanel.add(new cButton("     ", false));
525
+                
523526 		oe.aConstraints.gridx += 1;
524527 		oe.aConstraints.weighty = 0;
525528 		oe.aConstraints.gridwidth = 1;
....@@ -715,8 +718,7 @@
715718                     dropAttributes |= Object3D.TEXTURE;
716719                 else
717720                     dropAttributes &= ~Object3D.TEXTURE;
718
-            }
719
-            else if(e.getSource() == liveCB)
721
+            } else if(e.getSource() == liveCB)
720722             {
721723                 cameraView.ToggleLive();
722724             }
....@@ -1794,7 +1796,7 @@
17941796 		if (event.getSource() == invariantsItem)
17951797 		{
17961798                     System.out.println("Invariants:");
1797
-                    GrafreeD.theApplet3D.universe.invariants();
1799
+                    GrafreeD.grafreeD.universe.invariants();
17981800 		} else
17991801 		if (event.getSource() == memoryItem)
18001802 		{
....@@ -2638,8 +2640,8 @@
26382640                     // bug
26392641                     //gridPanel.setDividerLocation(1.0);
26402642                     //bigPanel.setDividerLocation(0.0);
2641
-                    bigThree.remove(jtp);
2642
-                    bigThree.remove(cameraPanel);
2643
+                    bigThree.remove(scenePanel);
2644
+                    bigThree.remove(centralPanel);
26432645                     bigThree.remove(XYZPanel);
26442646                     aWindowConstraints.gridx = 0;
26452647                     aWindowConstraints.gridy = 0;
....@@ -2654,7 +2656,7 @@
26542656             //        aConstraints.gridheight = 3;
26552657                     aWindowConstraints.gridx = 1;
26562658                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2657
-                    bigThree.add(cameraPanel, aWindowConstraints);
2659
+                    bigThree.add(centralPanel, aWindowConstraints);
26582660                     aWindowConstraints.weightx = 0;
26592661                     aWindowConstraints.gridx = 4;
26602662                     aWindowConstraints.gridwidth = 1;
....@@ -2666,8 +2668,8 @@
26662668 		if (event.getSource() == threeButton)
26672669 		{
26682670                     radio.layout = threeButton;
2669
-                    bigThree.remove(jtp);
2670
-                    bigThree.remove(cameraPanel);
2671
+                    bigThree.remove(scenePanel);
2672
+                    bigThree.remove(centralPanel);
26712673                     bigThree.remove(XYZPanel);
26722674                     aWindowConstraints.gridx = 0;
26732675                     aWindowConstraints.gridy = 0;
....@@ -2682,7 +2684,7 @@
26822684             //        aConstraints.gridheight = 3;
26832685                     aWindowConstraints.gridx = 1;
26842686                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2685
-                    bigThree.add(cameraPanel, aWindowConstraints);
2687
+                    bigThree.add(centralPanel, aWindowConstraints);
26862688                     aWindowConstraints.weightx = 0;
26872689                     aWindowConstraints.gridx = 4;
26882690                     aWindowConstraints.gridwidth = 1;
....@@ -2694,8 +2696,8 @@
26942696 		if (event.getSource() == fourButton)
26952697 		{
26962698                     radio.layout = fourButton;
2697
-                    bigThree.remove(jtp);
2698
-                    bigThree.remove(cameraPanel);
2699
+                    bigThree.remove(scenePanel);
2700
+                    bigThree.remove(centralPanel);
26992701                     bigThree.remove(XYZPanel);
27002702                     aWindowConstraints.gridx = 0;
27012703                     aWindowConstraints.gridy = 0;
....@@ -2704,7 +2706,7 @@
27042706                     aWindowConstraints.fill = GridBagConstraints.BOTH;
27052707                     aWindowConstraints.weightx = 1;
27062708                     aWindowConstraints.weighty = 1;
2707
-                    bigThree.add(jtp, aWindowConstraints);
2709
+                    bigThree.add(scenePanel, aWindowConstraints);
27082710                     aWindowConstraints.weightx = 1;
27092711                     aWindowConstraints.gridwidth = 3;
27102712               //      aConstraints.gridheight = 3;
....@@ -2722,8 +2724,8 @@
27222724 		if (event.getSource() == sixButton)
27232725 		{
27242726                     radio.layout = sixButton;
2725
-                    bigThree.remove(jtp);
2726
-                    bigThree.remove(cameraPanel);
2727
+                    bigThree.remove(scenePanel);
2728
+                    bigThree.remove(centralPanel);
27272729                     bigThree.remove(XYZPanel);
27282730                     aWindowConstraints.gridx = 0;
27292731                     aWindowConstraints.gridy = 0;
....@@ -2732,13 +2734,13 @@
27322734                     aWindowConstraints.fill = GridBagConstraints.VERTICAL;
27332735                     aWindowConstraints.weightx = 0;
27342736                     aWindowConstraints.weighty = 1;
2735
-                    bigThree.add(jtp, aWindowConstraints);
2737
+                    bigThree.add(scenePanel, aWindowConstraints);
27362738                     aWindowConstraints.weightx = 1;
27372739                     aWindowConstraints.gridwidth = 3;
27382740               //      aWindowConstraints.gridheight = 3;
27392741                     aWindowConstraints.gridx = 1;
27402742                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2741
-                    bigThree.add(cameraPanel, aWindowConstraints);
2743
+                    bigThree.add(centralPanel, aWindowConstraints);
27422744                     aWindowConstraints.weightx = 0;
27432745                     aWindowConstraints.gridx = 4;
27442746                     aWindowConstraints.gridwidth = 1;
....@@ -2750,8 +2752,8 @@
27502752 		if (event.getSource() == sevenButton)
27512753 		{
27522754                     radio.layout = sevenButton;
2753
-                    bigThree.remove(jtp);
2754
-                    bigThree.remove(cameraPanel);
2755
+                    bigThree.remove(scenePanel);
2756
+                    bigThree.remove(centralPanel);
27552757                     bigThree.remove(XYZPanel);
27562758                     aWindowConstraints.gridx = 0;
27572759                     aWindowConstraints.gridy = 0;
....@@ -2760,13 +2762,13 @@
27602762                     aWindowConstraints.fill = GridBagConstraints.VERTICAL;
27612763                     aWindowConstraints.weightx = 0;
27622764                     aWindowConstraints.weighty = 1;
2763
-                    bigThree.add(jtp, aWindowConstraints);
2765
+                    bigThree.add(scenePanel, aWindowConstraints);
27642766                     aWindowConstraints.weightx = 1;
27652767                     aWindowConstraints.gridwidth = 3;
27662768                //     aWindowConstraints.gridheight = 3;
27672769                     aWindowConstraints.gridx = 1;
27682770                     aWindowConstraints.fill = GridBagConstraints.BOTH;
2769
-                    bigThree.add(cameraPanel, aWindowConstraints);
2771
+                    bigThree.add(centralPanel, aWindowConstraints);
27702772                     aWindowConstraints.weightx = 0;
27712773                     aWindowConstraints.gridx = 4;
27722774                     aWindowConstraints.gridwidth = 1;