Figure panel.

Normand Briere

2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3

 GroupEditor.java
..
..
@@ -368,16 +368,6 @@
368
368
         refreshContents();
369
369
     }
370
370
 
371
-    public void Show3DView()
372
-    {
373
-        // bug
374
-        //gridPanel.setDividerLocation(1.0);
375
-        //bigPanel.setDividerLocation(0.0);
376
-        bigThree.ClearUI();
377
-        bigThree.add(centralPanel);
378
-        bigThree.FlushUI();
379
-    }
380
-
381
371
     //ObjEditor objEditor;
382
372
 	public void closeUI2()
383
373
 	{
..
..
@@ -766,10 +756,10 @@
766
756
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
767
757
 		shadowZItem.addActionListener(this);
768
758
                 
769
-        if (Globals.ADVANCED)
770
-        {
771
759
 		attributeItem = menu.add(new MenuItem("Attribute"));
772
760
 		attributeItem.addActionListener(this);
761
+        if (Globals.ADVANCED)
762
+        {
773
763
 		menu.add("-");
774
764
 		linkerItem = menu.add(new MenuItem("Linker"));
775
765
 		linkerItem.addActionListener(this);
..
..
@@ -1081,13 +1071,17 @@
1081
1071
 //                        }
1082
1072
 //                });
1083
1073
                 
1074
+		oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+                fullScreenButton.setToolTipText("Full-screen window");
1076
+		fullScreenButton.addActionListener(this);
1077
+                
1084
1078
 		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1085
1079
                 collapseButton.setToolTipText("Collapse toolbar");
1086
1080
 		collapseButton.addActionListener(this);
1087
1081
                 
1088
-		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
-                maximize3DButton.setToolTipText("Maximize 3D view");
1090
-		maximize3DButton.addActionListener(this);
1082
+//		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1083
+//                maximize3DButton.setToolTipText("Maximize 3D view");
1084
+//		maximize3DButton.addActionListener(this);
1091
1085
                 
1092
1086
 		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1093
1087
                 twoButton.setToolTipText("Show 3D view only");
..
..
@@ -1107,10 +1101,6 @@
1107
1101
 //                sevenButton.setToolTipText("3-column layout");
1108
1102
 //		sevenButton.addActionListener(this);
1109
1103
                 //
1110
-                
1111
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
-                fullButton.setToolTipText("Full-screen window");
1113
-		fullButton.addActionListener(this);
1114
1104
                 
1115
1105
 		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1116
1106
                 screenfitButton.setToolTipText("Screen fit");
..
..
@@ -2722,11 +2712,11 @@
2722
2712
                     if (!group.selection.isEmpty())
2723
2713
                     {
2724
2714
                         Composite csg = new GroupLeaf();
2715
+			group(csg);
2725
2716
                         csg.count = 5;
2726
2717
                         Composite child = new cGroup("Branch");
2727
2718
                         csg.addChild(child);
2728
2719
                         child.addChild(csg);
2729
-			group(csg);
2730
2720
                     }
2731
2721
 		} else
2732
2722
 		if (source == doubleItem)
..
..
@@ -2734,6 +2724,7 @@
2734
2724
                     if (!group.selection.isEmpty())
2735
2725
                     {
2736
2726
                         Composite csg = new GroupLeaf("Fork");
2727
+			group(csg);
2737
2728
                         csg.count = 5;
2738
2729
                         Composite child = new cGroup("Branch A");
2739
2730
                         csg.addChild(child);
..
..
@@ -2741,7 +2732,6 @@
2741
2732
                         child = new cGroup("Branch B");
2742
2733
                         csg.addChild(child);
2743
2734
                         child.addChild(csg);
2744
-			group(csg);
2745
2735
                     }
2746
2736
 		} else
2747
2737
 		if (source == tripleItem)
..
..
@@ -2807,7 +2797,7 @@
2807
2797
 		{
2808
2798
 			Maximize();
2809
2799
 		} else
2810
-		if (source == fullButton)
2800
+		if (source == fullScreenButton)
2811
2801
 		{
2812
2802
 			ToggleFullScreen();
2813
2803
 		} else
..
..
@@ -2816,13 +2806,13 @@
2816
2806
                         this.expandedLayout = radio.layout;
2817
2807
 			CollapseToolbar();
2818
2808
 		} else
2819
-		if (source == maximize3DButton)
2820
-		{
2821
-                        this.expandedLayout = radio.layout;
2822
-                        radio.layout = twoButton;
2823
-                        Show3DView();
2824
-			CollapseToolbar();
2825
-		} else
2809
+//		if (source == maximize3DButton)
2810
+//		{
2811
+//                        this.expandedLayout = radio.layout;
2812
+//                        radio.layout = twoButton;
2813
+//			CollapseToolbar();
2814
+//                        Show3DView();
2815
+//		} else
2826
2816
 		if (source == previousVersionButton)
2827
2817
 		{
2828
2818
                         // Go to previous version
..
..
@@ -4169,9 +4159,10 @@
4169
4159
             // and check if any of these nodes are reachable below the root.
4170
4160
             Grafreed.grafreed.universe.TagObjects(copy, true);
4171
4161
             
4172
-            if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4162
+            if (copy instanceof Composite && !copy.HasTags())
4173
4163
             {
4174
-                copy.versionlist = new Object3D[100];
4164
+                if (copy.versionlist == null)
4165
+                    copy.versionlist = new Object3D[100];
4175
4166
                 
4176
4167
                 //Save(true);
4177
4168
             }
..
..
@@ -5374,7 +5365,7 @@
5374
5365
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5375
5366
                             // a camera
5376
5367
                         {
5377
-                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5368
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5378
5369
                             {
5379
5370
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5380
5371
                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..
..
@@ -5426,7 +5417,7 @@
5426
5417
 
5427
5418
         void refreshContents(boolean cp)
5428
5419
         {
5429
-            if (Globals.ADVANCED)
5420
+            if (Globals.SHOWINFO)
5430
5421
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5431
5422
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5432
5423
             {