~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -246,7 +246,7 @@
246	246
247	247	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	248	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
250	250
251	251	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	252	toggleFrustumItem.addItemListener(this);
..	..	@@ -470,6 +470,14 @@
470	470	markleavesItem.addActionListener(this);
471	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
473	481	menu.add("-");
474	482	flipVItem = menu.add(new MenuItem("Flip V"));
475	483	flipVItem.addActionListener(this);
..	..	@@ -527,6 +535,18 @@
527	535
528	536	void SetupUI2(ObjEditor oe)
529	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
530	550	//new Exception().printStackTrace();
531	551
532	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -557,15 +577,27 @@
557	577	*/
558	578	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	579
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	593	undoButton.setToolTipText("Undo changes");
562	594	undoButton.addActionListener(this);
563	595
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	597	redoButton.setToolTipText("Redo changes");
566	598	redoButton.addActionListener(this);
567	599
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	601	saveButton.setToolTipText("Save changes");
570	602	saveButton.addActionListener(this);
571	603
..	..	@@ -573,7 +605,7 @@
573	605	liveCB.setToolTipText("Enable animation");
574	606	liveCB.addItemListener(this);
575	607
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	609	oneStepButton.setToolTipText("Animate one step forward");
578	610	oneStepButton.addActionListener(this);
579	611
..	..	@@ -581,7 +613,7 @@
581	613	fastCB.setToolTipText("Fast mode");
582	614	fastCB.addItemListener(this);
583	615
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
585	617	trackCB.setToolTipText("Enable tracking");
586	618	trackCB.addItemListener(this);
587	619
..	..	@@ -809,6 +841,8 @@
809	841
810	842	void SetupViews(ObjEditor oe)
811	843	{
	844	+ theFrame = this;
	845	+
812	846	oe.SetupViews();
813	847
814	848	System.out.println("SetupViews");
..	..	@@ -1970,6 +2004,18 @@
1970	2004	{
1971	2005	DumpObject();
1972	2006	} else
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
1973	2019	if (source == undoButton)
1974	2020	{
1975	2021	Undo();
..	..	@@ -2609,6 +2655,22 @@
2609	2655	{
2610	2656	MarkLeaves(false);
2611	2657	} else
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
	2673	+ } else
2612	2674	if (source == flipVItem)
2613	2675	{
2614	2676	FlipV(true);
..	..	@@ -2875,6 +2937,24 @@
2875	2937	bigThree.ClearUI();
2876	2938	bigThree.add(centralPanel);
2877	2939	bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2878	2958	} else
2879	2959	if (source == threeButton)
2880	2960	{
..	..	@@ -2911,6 +2991,8 @@
2911	2991	bigThree.add(centralPanel);
2912	2992	bigThree.add(XYZPanel);
2913	2993	bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2914	2996	} else
2915	2997	if (source == fourButton)
2916	2998	{
..	..	@@ -2946,6 +3028,8 @@
2946	3028	bigThree.ClearUI();
2947	3029	bigThree.add(scenePanel);
2948	3030	bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2949	3033	} else
2950	3034	if (source == sixButton)
2951	3035	{
..	..	@@ -2982,6 +3066,8 @@
2982	3066	bigThree.add(scenePanel);
2983	3067	bigThree.add(centralPanel);
2984	3068	bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2985	3071	} else
2986	3072	if (source == sevenButton)
2987	3073	{
..	..	@@ -3019,6 +3105,8 @@
3019	3105	bigThree.add(centralPanel);
3020	3106	bigThree.add(XYZPanel);
3021	3107	bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
3022	3110	} else
3023	3111	if (source == rootButton)
3024	3112	{
..	..	@@ -3030,6 +3118,7 @@
3030	3118	EditObject(obj);
3031	3119	}
3032	3120
	3121	+ cameraView.requestFocusInWindow();
3033	3122	refreshContents(true);
3034	3123	} else
3035	3124	if (source == closeButton)
..	..	@@ -3051,6 +3140,8 @@
3051	3140	break;
3052	3141	}
3053	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
3054	3145	refreshContents(true);
3055	3146	} else
3056	3147	if (source == editItem \|\| source == editButton)
..	..	@@ -3155,7 +3246,7 @@
3155	3246	}
3156	3247
3157	3248	// fix "+" issue
3158		- group.editWindow = this;
	3249	+ //group.editWindow = this;
3159	3250
3160	3251	/*
3161	3252	currentLayout = radio.layout;
..	..	@@ -3168,6 +3259,8 @@
3168	3259	//group.parent = null; // ROOT
3169	3260	//group.attributes = -1;
3170	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
3171	3264	refreshContents(true);
3172	3265	} else if (event.getSource() == editCameraItem)
3173	3266	{
..	..	@@ -3191,7 +3284,6 @@
3191	3284	}
3192	3285
3193	3286	boolean useclient = false;
3194		- cRadio radio;
3195	3287
3196	3288	void ToggleRoot()
3197	3289	{
..	..	@@ -4143,6 +4235,18 @@
4143	4235	void MarkLeaves(boolean hide)
4144	4236	{
4145	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
4146	4250	refreshContents();
4147	4251	}
4148	4252
..	..	@@ -5183,9 +5287,12 @@
5183	5287	cButton clearpanelButton;
5184	5288	cButton unselectButton;
5185	5289
5186		- cButton saveButton;
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
5187	5293	cButton undoButton;
5188	5294	cButton redoButton;
	5295	+ cButton saveButton;
5189	5296	cButton oneStepButton;
5190	5297
5191	5298	cButton screenfitButton;
..	..	@@ -5198,14 +5305,6 @@
5198	5305	cButton closeButton;
5199	5306
5200	5307	cButton setsupportButton;
5201		-
5202		- cButton twoButton;
5203		- cButton sixButton;
5204		- cButton threeButton;
5205		- cButton sevenButton;
5206		- cButton fourButton; // full panel
5207		- cButton oneButton; // full XYZ
5208		- //cButton currentLayout;
5209	5308
5210	5309	//
5211	5310	//Composite
..	..	@@ -5283,6 +5382,10 @@
5283	5382	private MenuItem showleavesItem;
5284	5383	private MenuItem markleavesItem;
5285	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
5286	5389
5287	5390	private MenuItem flipVItem;
5288	5391	private MenuItem unflipVItem;