blame | history | patch | commit | commitdiff
Normand Briere
2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df 
 GroupEditor.java
....@@ -154,6 +154,12 @@
154154 		oe.menuBar.add(menu = new Menu("Edit"));
155155 		//editItem = menu.add(new MenuItem("Edit"));
156156 		//editItem.addActionListener(this);
157
+                
158
+//		undoItem = menu.add(new MenuItem("Undo"));
159
+//		undoItem.addActionListener(this);
160
+//		redoItem = menu.add(new MenuItem("Redo"));
161
+//		redoItem.addActionListener(this);
162
+//		menu.add("-");
157163 		duplicateItem = menu.add(new MenuItem("Duplicate"));
158164 		duplicateItem.addActionListener(this);
159165 		cloneItem = menu.add(new MenuItem("Clone"));
....@@ -170,7 +176,6 @@
170176 		copyItem.addActionListener(this);
171177 		pasteItem = menu.add(new MenuItem("Paste"));
172178 		pasteItem.addActionListener(this);
173
-		menu.add("-");
174179                 
175180 		menu.add("-");
176181 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -197,7 +202,7 @@
197202         //zBufferItem.addActionListener(this);
198203         //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199204         //normalLensItem.addActionListener(this);
200
-        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
205
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
201206         revertCameraItem.addActionListener(this);
202207         
203208         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
....@@ -240,7 +245,7 @@
240245 
241246                 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242247                 toggleDebugItem.addItemListener(this);
243
-                toggleDebugItem.setState(CameraPane.DEBUG);
248
+                toggleDebugItem.setState(Globals.DEBUG);
244249 
245250                 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246251                 toggleFrustumItem.addItemListener(this);
....@@ -261,7 +266,7 @@
261266 //		animationItem.addItemListener(this);
262267 //                    animationItem.setState(CameraPane.ANIMATION);
263268         cameraMenu.add("-");
264
-        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
269
+        cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265270         editCameraItem.addActionListener(this);
266271         
267272         if (Globals.ADVANCED)
....@@ -363,11 +368,11 @@
363368 		billboardItem.addActionListener(this);
364369 		csgItem = menu.add(new MenuItem("CSG"));
365370 		csgItem.addActionListener(this);
366
-                shadowXItem = menu.add(new MenuItem("Shadow X"));
371
+                shadowXItem = menu.add(new MenuItem("Shadow Red"));
367372 		shadowXItem.addActionListener(this);
368
-                shadowYItem = menu.add(new MenuItem("Shadow Y"));
373
+                shadowYItem = menu.add(new MenuItem("Shadow Green"));
369374 		shadowYItem.addActionListener(this);
370
-                shadowZItem = menu.add(new MenuItem("Shadow Z"));
375
+                shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371376 		shadowZItem.addActionListener(this);
372377         if (Globals.ADVANCED)
373378         {
....@@ -464,6 +469,14 @@
464469 		markleavesItem.addActionListener(this);
465470 		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466471 		unmarkleavesItem.addActionListener(this);
472
+		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473
+		rewindleavesItem.addActionListener(this);
474
+		unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
475
+		unrewindleavesItem.addActionListener(this);
476
+		randomleavesItem = menu.add(new MenuItem("Random Leaves"));
477
+		randomleavesItem.addActionListener(this);
478
+		unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
479
+		unrandomleavesItem.addActionListener(this);
467480 		menu.add("-");
468481 		flipVItem = menu.add(new MenuItem("Flip V"));
469482 		flipVItem.addActionListener(this);
....@@ -521,6 +534,18 @@
521534 	
522535 	void SetupUI2(ObjEditor oe)
523536 	{
537
+            // June 2019
538
+            if (oe == null)
539
+            {
540
+                //super.SetupUI2(this);
541
+                //return;
542
+            }
543
+            
544
+            if (copy != group)
545
+            {
546
+                //super.SetupUI2(this);
547
+            }
548
+            
524549             //new Exception().printStackTrace();
525550                 
526551         oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -551,11 +576,35 @@
551576          */
552577                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553578                 
579
+		//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580
+                //minButton.setToolTipText("Minimize window");
581
+		//minButton.addActionListener(this);
582
+                
583
+		oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584
+                maxButton.setToolTipText("Maximize window");
585
+		maxButton.addActionListener(this);
586
+                
587
+		oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588
+                fullButton.setToolTipText("Full-screen window");
589
+		fullButton.addActionListener(this);
590
+                
591
+		oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
+                undoButton.setToolTipText("Undo changes");
593
+		undoButton.addActionListener(this);
594
+                
595
+		oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+                redoButton.setToolTipText("Redo changes");
597
+		redoButton.addActionListener(this);
598
+                
599
+		oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
+                saveButton.setToolTipText("Save changes");
601
+		saveButton.addActionListener(this);
602
+                
554603                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555604                 liveCB.setToolTipText("Enable animation");
556605                                 liveCB.addItemListener(this);
557606 
558
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559608                 oneStepButton.setToolTipText("Animate one step forward");
560609 		oneStepButton.addActionListener(this);
561610                 
....@@ -563,7 +612,7 @@
563612                 fastCB.setToolTipText("Fast mode");
564613                                 fastCB.addItemListener(this);
565614                                 
566
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
615
+                oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
567616                 trackCB.setToolTipText("Enable tracking");
568617                                 trackCB.addItemListener(this);
569618 
....@@ -587,19 +636,19 @@
587636                 
588637 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589638                 
590
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591640                 twoButton.setToolTipText("Show center view only");
592641 		twoButton.addActionListener(this);
593
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594643 		fourButton.addActionListener(this);
595644                 fourButton.setToolTipText("Show left panel only");
596
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645
+		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597646                 sixButton.setToolTipText("2-column layout left");
598647 		sixButton.addActionListener(this);
599
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
648
+		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600649                 threeButton.setToolTipText("2-column layout right");
601650 		threeButton.addActionListener(this);
602
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651
+		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603652                 sevenButton.setToolTipText("3-column layout");
604653 		sevenButton.addActionListener(this);
605654                 //
....@@ -614,32 +663,30 @@
614663 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615664 		//clearButton.addActionListener(this);
616665                         
617
-                cGridBag commandsPanel = new cGridBag();
618
-                
619
-		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666
+		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620667                 editButton.setToolTipText("Edit selection");
621668 		editButton.addActionListener(this);
622669 
623
-		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624671                 uneditButton.setToolTipText("Unedit selection");
625672 		uneditButton.addActionListener(this);
626673 
627
-		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
674
+		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628675                 allParamsButton.setToolTipText("Edit all params");
629676 		allParamsButton.addActionListener(this);
630677 
631
-		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
678
+		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632679                 clearPanelButton.setToolTipText("Clear edit panel");
633680 		clearPanelButton.addActionListener(this);
634681 
635
-		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
+		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636683                 unselectButton.setToolTipText("Unselect");
637684 		unselectButton.addActionListener(this);
638685 
639
-                commandsPanel.preferredHeight = 1;
686
+                editCommandsPanel.preferredHeight = 1;
640687                 
641
-                oe.treePanel.add(commandsPanel);
642
-                oe.treePanel.Return();
688
+//                oe.treePanel.add(commandsPanel);
689
+//                oe.treePanel.Return();
643690                 
644691 //		oe.aConstraints.gridx += 1;
645692 //		oe.aConstraints.weighty = 0;
....@@ -791,6 +838,8 @@
791838         
792839         void SetupViews(ObjEditor oe)
793840         {
841
+                    theFrame = this;
842
+                    
794843             oe.SetupViews();
795844             
796845 		System.out.println("SetupViews");
....@@ -853,6 +902,7 @@
853902             } else if(e.getSource() == liveCB)
854903             {
855904                 cameraView.ToggleLive();
905
+                refreshContents(false);
856906             }
857907             else if(e.getSource() == supportCB)
858908             {
....@@ -1260,7 +1310,7 @@
12601310 		memoryItem.addActionListener(this);
12611311 		menu.add(analyzeItem = new MenuItem("Analyze"));
12621312 		analyzeItem.addActionListener(this);
1263
-		menu.add(dumpItem = new MenuItem("Dump"));
1313
+		menu.add(dumpItem = new MenuItem("Print"));
12641314 		dumpItem.addActionListener(this);
12651315 //		menu.add(pathItem = new MenuItem("From-to path"));
12661316 //		pathItem.addActionListener(this);
....@@ -1401,6 +1451,7 @@
14011451             shadow.material = new cMaterial(obj.material);
14021452             shadow.material.diffuse = 0.0001f;
14031453             shadow.material.specular = 0.0001f;
1454
+            //shadow.projectedVertices[1].x = 300;
14041455             
14051456             makeSomething(shadow);
14061457         }
....@@ -1951,6 +2002,30 @@
19512002 		{
19522003                     DumpObject();
19532004 		} else
2005
+		if (source == minButton)
2006
+		{
2007
+			Minimize();
2008
+		} else
2009
+		if (source == maxButton)
2010
+		{
2011
+			Maximize();
2012
+		} else
2013
+		if (source == fullButton)
2014
+		{
2015
+			ToggleFullScreen();
2016
+		} else
2017
+		if (source == undoButton)
2018
+		{
2019
+			Undo();
2020
+		} else
2021
+		if (source == redoButton)
2022
+		{
2023
+			Redo();
2024
+		} else
2025
+		if (source == saveButton)
2026
+		{
2027
+			Save();
2028
+		} else
19542029 		if (source == oneStepButton)
19552030 		{
19562031                     Globals.ONESTEP = true;
....@@ -2004,6 +2079,14 @@
20042079 		if (source == cutItem || source == clearButton)
20052080 		{
20062081 			loadClipboard(true);
2082
+		} else
2083
+		if (source == undoItem)
2084
+		{
2085
+			Undo();
2086
+		} else
2087
+		if (source == redoItem)
2088
+		{
2089
+			Redo();
20072090 		} else
20082091 		if (source == duplicateItem)
20092092 		{
....@@ -2504,7 +2587,7 @@
25042587 		} else
25052588 		if (source == genNormalsMESHItem)
25062589                 {
2507
-			GenNormals(true); // TODO
2590
+			GenNormalsMESH();
25082591 		} else
25092592 		if (source == genNormalsORGANItem)
25102593                 {
....@@ -2569,6 +2652,22 @@
25692652 		if (source == unmarkleavesItem)
25702653                 {
25712654 			MarkLeaves(false);
2655
+		} else
2656
+		if (source == rewindleavesItem)
2657
+                {
2658
+			RewindLeaves(true);
2659
+		} else
2660
+		if (source == unrewindleavesItem)
2661
+                {
2662
+			RewindLeaves(false);
2663
+		} else
2664
+		if (source == randomleavesItem)
2665
+                {
2666
+			RandomLeaves(true);
2667
+		} else
2668
+		if (source == unrandomleavesItem)
2669
+                {
2670
+			RandomLeaves(false);
25722671 		} else
25732672 		if (source == flipVItem)
25742673                 {
....@@ -2836,6 +2935,24 @@
28362935                     bigThree.ClearUI();
28372936                     bigThree.add(centralPanel);
28382937                     bigThree.FlushUI();
2938
+                    
2939
+                    cameraView.requestFocusInWindow();
2940
+                    
2941
+//                    refreshContents(true);
2942
+//                    
2943
+//                    try
2944
+//                    {
2945
+//                        java.awt.Robot bot = new java.awt.Robot();
2946
+//                        int mask = InputEvent.BUTTON1_MASK;
2947
+//                        bot.mouseMove(100, 100);           
2948
+//                        bot.mousePress(mask);     
2949
+//                        bot.mouseRelease(mask);                    
2950
+//                    }
2951
+//                    catch (Exception e)
2952
+//                    {
2953
+//                        
2954
+//                    }
2955
+                    
28392956                 } else
28402957 		if (source == threeButton)
28412958 		{
....@@ -2872,6 +2989,8 @@
28722989                     bigThree.add(centralPanel);
28732990                     bigThree.add(XYZPanel);
28742991                     bigThree.FlushUI();
2992
+                    
2993
+                    cameraView.requestFocusInWindow();
28752994                 } else
28762995 		if (source == fourButton)
28772996 		{
....@@ -2907,6 +3026,8 @@
29073026                     bigThree.ClearUI();
29083027                     bigThree.add(scenePanel);
29093028                     bigThree.FlushUI();
3029
+                    
3030
+                    cameraView.requestFocusInWindow();
29103031                 } else
29113032 		if (source == sixButton)
29123033 		{
....@@ -2943,6 +3064,8 @@
29433064                     bigThree.add(scenePanel);
29443065                     bigThree.add(centralPanel);
29453066                     bigThree.FlushUI();
3067
+                    
3068
+                    cameraView.requestFocusInWindow();
29463069                 } else
29473070 		if (source == sevenButton)
29483071 		{
....@@ -2980,6 +3103,8 @@
29803103                     bigThree.add(centralPanel);
29813104                     bigThree.add(XYZPanel);
29823105                     bigThree.FlushUI();
3106
+                    
3107
+                    cameraView.requestFocusInWindow();
29833108                 } else
29843109 		if (source == rootButton)
29853110 		{
....@@ -2991,6 +3116,7 @@
29913116                                 EditObject(obj);
29923117                     }
29933118 
3119
+                    cameraView.requestFocusInWindow();
29943120                     refreshContents(true);
29953121 		} else
29963122 		if (source == closeButton)
....@@ -3012,6 +3138,8 @@
30123138                                 break;
30133139                             }
30143140                     }
3141
+                    
3142
+                    cameraView.requestFocusInWindow();
30153143                     refreshContents(true);
30163144 		} else
30173145 		if (source == editItem || source == editButton)
....@@ -3028,7 +3156,7 @@
30283156 				child.CloseUI();
30293157                                 listUI.remove(child);
30303158                                 
3031
-                                child.editWindow = null; // ???????????
3159
+                                //child.editWindow = null; // ???????????
30323160 			}
30333161 			objEditor.ctrlPanel.FlushUI();
30343162 			//objEditor.jTree.clearSelection();
....@@ -3115,7 +3243,8 @@
31153243                         sideView.object = group;
31163244                     }
31173245                     
3118
-// fix "+" issue                    group.editWindow = this;
3246
+// fix "+" issue
3247
+                    //group.editWindow = this;
31193248                     
31203249                     /*
31213250                     currentLayout = radio.layout;
....@@ -3128,6 +3257,8 @@
31283257                     //group.parent = null; // ROOT
31293258                     //group.attributes = -1;
31303259                     ResetModel();
3260
+                    
3261
+                    cameraView.requestFocusInWindow();
31313262                     refreshContents(true);
31323263                 } else if (event.getSource() == editCameraItem)
31333264                 {
....@@ -3151,7 +3282,6 @@
31513282 	}
31523283         
31533284         boolean useclient = false;
3154
-        cRadio radio;
31553285         
31563286         void ToggleRoot()
31573287         {
....@@ -3390,7 +3520,8 @@
33903520                     
33913521                     int size = obj.MemorySize();
33923522                     
3393
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3523
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3524
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33943525                 }
33953526             }
33963527             catch (Exception e)
....@@ -3471,6 +3602,13 @@
34713602 	void GenNormals(boolean crease)
34723603 	{
34733604 		group.GenNormalsS(crease);
3605
+		
3606
+		refreshContents();
3607
+	}
3608
+	
3609
+	void GenNormalsMESH()
3610
+	{
3611
+		group.GenNormalsMeshS();
34743612 		
34753613 		refreshContents();
34763614 	}
....@@ -4098,6 +4236,18 @@
40984236 		refreshContents();
40994237 	}
41004238 	
4239
+	void RewindLeaves(boolean hide)
4240
+	{
4241
+		group.selection.RewindLeaves(hide);
4242
+		refreshContents();
4243
+	}
4244
+	
4245
+	void RandomLeaves(boolean hide)
4246
+	{
4247
+		group.selection.RandomLeaves(hide);
4248
+		refreshContents();
4249
+	}
4250
+	
41014251 	void SetTexRes(int tr)
41024252 	{
41034253 		group.selection.SetTexRes(tr);
....@@ -4273,7 +4423,6 @@
42734423 			//case 702: // Event.LIST_DESELECT
42744424 			group.deselectAll();
42754425 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276
-			objEditor.ClearInfo(); // .GetMaterial());
42774426 			if (tps != null)
42784427 			{
42794428 				for (int i=0; i < tps.length; i++)
....@@ -4282,10 +4431,8 @@
42824431 					
42834432 					//if (child.parent != null)
42844433 						//child.parent.addSelectee(child);
4434
+                    objEditor.SetMaterial(child);
42854435 					group.addSelectee(child);
4286
-					objEditor.SetMaterial(child); // .GetMaterial());
4287
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4288
-            System.err.println("info : " + child.GetPath());
42894436 				}
42904437 			}
42914438 //			else
....@@ -4295,16 +4442,17 @@
42954442 //            System.err.println("info : " + group.GetPath());
42964443 //                        }
42974444 			
4298
-                        objEditor.SetText(); // jan 2014
4299
-                        
4300
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4445
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43014446 				CameraPane.flash = true;
43024447                         
4303
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4448
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
43044449                             // a camera
43054450                         {
4306
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4307
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4451
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4452
+                            {
4453
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4454
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4455
+                            }
43084456                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
43094457                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
43104458                         }
....@@ -4317,6 +4465,26 @@
43174465 		
43184466 		freezemodel = false;
43194467 	}
4468
+        
4469
+        void refreshContents(boolean cp)
4470
+        {
4471
+            if (!Globals.MOUSEDRAGGED)
4472
+            {
4473
+                objEditor.ClearInfo(); // .GetMaterial());
4474
+
4475
+                for (int i=0; i < group.selection.Size(); i++)
4476
+                {
4477
+                    Object3D child = (Object3D) group.selection.get(i);
4478
+
4479
+                    objEditor.AddInfo(child, this, true);
4480
+    System.err.println("info : " + child.GetPath());
4481
+                }
4482
+
4483
+                objEditor.SetText(); // jan 2014
4484
+            }
4485
+                        
4486
+            super.refreshContents(cp);
4487
+        }
43204488 	
43214489 	void linkSomething(Object3D thing)
43224490 	{
....@@ -4388,6 +4556,7 @@
43884556 	{
43894557 		if (group.selection.isEmpty())
43904558 			return;
4559
+                
43914560 		Grafreed.clipboardIsTempGroup = false;
43924561 		Composite tGroup = null;
43934562 		if (group.selection.size() > 0) // 1)
....@@ -4398,6 +4567,7 @@
43984567                 
43994568 		if (cut)
44004569 		{
4570
+                    Save();
44014571 			//int indices[] = jList.getSelectedIndices();
44024572 			//for (int i = indices.length - 1; i >= 0; i--)
44034573 			//jList.remove(indices[i]);
....@@ -4487,8 +4657,10 @@
44874657 			}
44884658 			
44894659 		}
4660
+                
44904661 		if (Grafreed.clipboardIsTempGroup)
44914662 			Grafreed.clipboard = tGroup;
4663
+                
44924664 		if (cut)
44934665                 {
44944666                     ResetModel();
....@@ -5113,6 +5285,12 @@
51135285 	cButton clearpanelButton;
51145286 	cButton unselectButton;
51155287 	
5288
+	cButton minButton;
5289
+	cButton maxButton;
5290
+	cButton fullButton;
5291
+	cButton undoButton;
5292
+	cButton redoButton;
5293
+	cButton saveButton;
51165294 	cButton oneStepButton;
51175295         
51185296 	cButton screenfitButton;
....@@ -5126,14 +5304,6 @@
51265304 
51275305 	cButton setsupportButton;
51285306         
5129
-	cButton twoButton;
5130
-	cButton sixButton;
5131
-	cButton threeButton;
5132
-	cButton sevenButton;
5133
-	cButton fourButton; // full panel
5134
-	cButton oneButton; // full XYZ
5135
-        //cButton currentLayout;
5136
-        
51375307 	//
51385308         //Composite
51395309         Object3D // to do !!
....@@ -5145,6 +5315,8 @@
51455315 	private MenuItem lookFromItem;
51465316 	private MenuItem switchItem;
51475317 	private MenuItem cutItem;
5318
+	private MenuItem undoItem;
5319
+	private MenuItem redoItem;
51485320 	private MenuItem duplicateItem;
51495321 	private MenuItem cloneItem;
51505322 	private MenuItem cloneSupportItem;
....@@ -5208,6 +5380,10 @@
52085380 	private MenuItem showleavesItem;
52095381 	private MenuItem markleavesItem;
52105382 	private MenuItem unmarkleavesItem;
5383
+	private MenuItem rewindleavesItem;
5384
+	private MenuItem unrewindleavesItem;
5385
+	private MenuItem randomleavesItem;
5386
+	private MenuItem unrandomleavesItem;
52115387         
52125388 	private MenuItem flipVItem;
52135389 	private MenuItem unflipVItem;