Merge lp:~tapaal-contributor/tapaal/bug894337 into lp:tapaal

[Mathias Andersen]

Selected components, constants, shared items, queries and now remembered when going to simulator and back.

When you return from simulation mode the previous selection of queries, constants and components will now be remembered.

When you enter simulation mode the currently selected component from the editor will also be selected in the simulator. If the currently selected component in the editor is not active the first active component in the list will be selected in the simulator.

[Jiri Srba (srba)]

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

review: Approve (code)

[TAPAAL Janitor (tapaal)]

Attempt to merge into lp:tapaal failed due to conflicts:

text conflict in src/dk/aau/cs/gui/TabContent.java

[TAPAAL Janitor (tapaal)]

Attempt to merge into lp:tapaal failed due to conflicts:

text conflict in src/dk/aau/cs/gui/TabContent.java

[Jiri Srba (srba)]

The conflict has been resolved. I guess we can merge it now?

[Kenneth Yrke Jørgensen (yrke)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2012-03-04 12:49:10 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2012-03-08 07:33:20 +0000
@@ -69,9 +69,14 @@
 	protected JSplitPane animationHistorySplitter;
 	protected SharedPlacesAndTransitionsPanel sharedPTPanel;
 	
+	// protected JSplitPane outerSplitPane;
+	// protected JSplitPane topSplitPane;
 	protected JSplitPane animatorOuterSplitPane;
 	protected JSplitPane animatorTopSplitPane;
 
+	private Integer selectedTemplate = 0;
+	private Boolean selectedTemplateWasActive = false;
+
 	public TabContent() { 
 		for (TimedArcPetriNet net: tapnNetwork.allTemplates()){
 			guiModels.put(net, new DataLayer());
@@ -126,6 +131,30 @@
 		gbc.weighty = 1.0;
 		editorLeftPane.add(editorOuterSplitPane, gbc);
 	}
+	
+	public void selectFirstActiveTemplate(){
+		templateExplorer.selectFirst();
+	}
+	
+	public Boolean templateWasActiveBeforeSimulationMode() {
+		return selectedTemplateWasActive;
+	}
+	
+	public void resetSelectedTemplateWasActive() {
+		selectedTemplateWasActive = false;
+	}
+	
+	public void setSelectedTemplateWasActive() {
+		selectedTemplateWasActive = true;
+	}
+	
+	public void rememberSelectedTemplate() {
+		selectedTemplate = templateExplorer.indexOfSelectedTemplate();
+	}
+	
+	public void restoreSelectedTemplate() {
+		templateExplorer.restoreSelectedTemplate(selectedTemplate);
+	}
 
 	public void updateConstantsList() {
 		constantsPanel.showConstants();
@@ -402,7 +431,6 @@
 
 	public void setQueries(Iterable<TAPNQuery> queries) {
 		this.queries.setQueries(queries);
-
 	}
 
 	public void removeQuery(TAPNQuery queryToRemove) {

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2012-02-28 19:51:27 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2012-03-08 07:33:20 +0000
@@ -109,6 +109,14 @@
 		undoManager = parent.drawingSurface().getUndoManager();
 		init(hideButtons);
 	}
+	
+	public Integer indexOfSelectedTemplate() {
+		return new Integer(templateList.getSelectedIndex());
+	}
+	
+	public void restoreSelectedTemplate(Integer value) {
+		templateList.setSelectedIndex(value);
+	}
 
 	private void init(boolean hideButtons) {
 		setLayout(new BorderLayout());

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2012-03-01 11:17:06 +0000
+++ src/pipe/gui/GuiFrame.java	2012-03-08 07:33:20 +0000
@@ -1539,9 +1539,20 @@
 					
 					if (!appView.isInAnimationMode()) {
 						if (CreateGui.getCurrentTab().numberOfActiveTemplates() > 0) {
+							CreateGui.getCurrentTab().rememberSelectedTemplate();
+							if (CreateGui.getCurrentTab().currentTemplate().isActive()){
+								CreateGui.getCurrentTab().setSelectedTemplateWasActive();
+							}
 							restoreMode();
 							PetriNetObject.ignoreSelection(true);
 							setAnimationMode(!appView.isInAnimationMode());
+							if (CreateGui.getCurrentTab().templateWasActiveBeforeSimulationMode()) {								
+								CreateGui.getCurrentTab().restoreSelectedTemplate();
+								CreateGui.getCurrentTab().resetSelectedTemplateWasActive();
+							}
+							else {
+								CreateGui.getCurrentTab().selectFirstActiveTemplate();
+							}
 						} else {
 							JOptionPane.showMessageDialog(GuiFrame.this, 
 									"You need at least one active template to enter simulation mode",
@@ -1553,7 +1564,7 @@
 						PetriNetObject.ignoreSelection(false);
 						appView.getSelectionObject().clearSelection();
 						setAnimationMode(!appView.isInAnimationMode());
-
+						CreateGui.getCurrentTab().restoreSelectedTemplate();
 					}
 				} catch (Exception e) {
 					System.err.println(e);
@@ -1576,9 +1587,7 @@
 				a.dispose();
 				if(getGUIMode().equals(GUIMode.draw)){
 					activateSelectAction();
-				}
-				
-				CreateGui.getCurrentTab().selectFirstElements();
+				}				
 				
 				break;