Merge lp:~tapaal-contributor/tapaal/constants-blink-1853902 into lp:tapaal

[Peter Haahr Taankvist]

Make constants blink when selected in the side panel

[Jiri Srba (srba)]

There is a problem if you move fast through constants, so that at the end some constants
say highlighted in blue, even though they are not selected. To reproduce, open webserver.tapm
example net, selection periodB constant and then quickly press four time arrow up, so that we move through the other constants. Now there are several blue names, even if they are not "deadline".

Also, the blinking is not very visible as it only changes colour. I would suggest to clear and redraw the text (not only the colour) when it is blinking (like in the simulation mode when we select a transition), so that the change is visually more noticable.

review: Needs Fixing

[Peter Haahr Taankvist (ptaank)]

Set the text visible/invisible instead of changing the color. Also fixed the bug by having a global timer. When one is selected while one is still blinking, it will stop the blinking, recolor and start blinking the newly selected.

review: Needs Resubmitting

[Jiri Srba (srba)]

Works very nice.

review: Approve

[Jiri Srba (srba)]

Actually, there is still a problem with tran-level-crossing example. Open the example and move down the constants.Once you reach to minTimeToLeveler it will not blink, but once you move to maxTimeToLever it does blink.

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/constants-blink-1853902]

1036. By Peter Taankvist <email address hidden> on 2020-02-03

fixed bug relating to upper/lower bound constants cancelling each other out

[Peter Haahr Taankvist (ptaank)]

fixed bug relating to upper/lower bound constants cancelling each other out.

When you had a guard with both a constant in the upper and the lower bound, and you clicked the one in the lower bound, it would be set invisible, but when checking the one in the upper bound it would instantly be set visible again.

Seems to work now

review: Needs Resubmitting

[Jiri Srba (srba)]

Works very nice.

review: Approve

=== modified file 'src/dk/aau/cs/model/tapn/Constant.java'
--- src/dk/aau/cs/model/tapn/Constant.java	2016-04-28 13:18:00 +0000
+++ src/dk/aau/cs/model/tapn/Constant.java	2020-02-03 20:24:41 +0000
@@ -13,6 +13,7 @@
 	private int upperBound;
 	private boolean isUsed;
 	private boolean isFocused;
+	private boolean visible = true;
 
 	public Constant(String name, int value) {
 		setName(name);
@@ -50,6 +51,14 @@
 	public void setFocused(boolean focused){
 		isFocused = focused;
 	}
+	
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+	}
+	
+	public boolean getVisible() {
+		return visible;
+	}
 
 	public String name() {
 		return name;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java	2019-05-06 12:21:58 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java	2020-02-03 20:24:41 +0000
@@ -90,6 +90,7 @@
 			if(((ConstantWeight) getWeight()).constant().hasFocus()){
 				focusedConstant = true;
 			}
+			pnName.setVisible(((ConstantWeight) getWeight()).constant().getVisible());
 		}
 		if(focusedConstant){
 			pnName.setForeground(Pipe.SELECTION_TEXT_COLOUR);

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2019-05-06 12:21:58 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-02-03 20:24:41 +0000
@@ -138,26 +138,38 @@
 				
 				// Handle constant highlighting
 				boolean focusedConstant = false;
+				boolean isvisible = true;
 				if(inputArc.interval().lowerBound() instanceof ConstantBound){
 					if(((ConstantBound) inputArc.interval().lowerBound()).constant().hasFocus()){
 						focusedConstant = true;
 					}
+					
+					if(!((ConstantBound) inputArc.interval().lowerBound()).constant().getVisible()) {
+						isvisible = false;
+					}
 				}
 				if(inputArc.interval().upperBound() instanceof ConstantBound){
 					if(((ConstantBound) inputArc.interval().upperBound()).constant().hasFocus()){
 						focusedConstant = true;
 					}
+					if(!((ConstantBound) inputArc.interval().upperBound()).constant().getVisible()){
+						isvisible = false;
+					}
 				}
 				if(getWeight() instanceof ConstantWeight){
 					if(((ConstantWeight) getWeight()).constant().hasFocus()){
 						focusedConstant = true;
 					}
+					if(((ConstantWeight) getWeight()).constant().getVisible()){
+						isvisible = false;
+					}									
 				}
 				if(focusedConstant){
 					pnName.setForeground(Pipe.SELECTION_TEXT_COLOUR);
 				}else{
 					pnName.setForeground(Pipe.ELEMENT_TEXT_COLOUR);
 				}
+				pnName.setVisible(isvisible);
 				
 			}
 			this.setLabelPosition();

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2019-03-13 07:17:48 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2020-02-03 20:24:41 +0000
@@ -34,6 +34,8 @@
 import dk.aau.cs.gui.Context;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.model.tapn.Bound.InfBound;
+import dk.aau.cs.model.tapn.Constant;
+import dk.aau.cs.model.tapn.Bound;
 import dk.aau.cs.model.tapn.ConstantBound;
 import dk.aau.cs.model.tapn.TimeInvariant;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
@@ -363,10 +365,13 @@
 			
 			// Handle constant highlighting
 			boolean focusedConstant = false;
-			if(place.invariant().upperBound() instanceof ConstantBound){
-				if(((ConstantBound) place.invariant().upperBound()).constant().hasFocus()){
+			Bound bound = place.invariant().upperBound();
+			if(bound instanceof ConstantBound){
+				Constant constant = ((ConstantBound) bound).constant();
+				if(constant.hasFocus()){
 					focusedConstant = true;
 				}
+				pnName.setVisible(constant.getVisible());
 			}
 			if(focusedConstant){
 				pnName.setForeground(Pipe.SELECTION_TEXT_COLOUR);

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2019-05-06 12:21:58 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2020-02-03 20:24:41 +0000
@@ -117,26 +117,37 @@
 			
 			// Handle constant highlighting
 			boolean focusedConstant = false;
+			boolean isvisible = true;
 			if(underlyingTransportArc.interval().lowerBound() instanceof ConstantBound){
 				if(((ConstantBound) underlyingTransportArc.interval().lowerBound()).constant().hasFocus()){
 					focusedConstant = true;
 				}
+				if(!((ConstantBound) underlyingTransportArc.interval().lowerBound()).constant().getVisible()){
+					focusedConstant = false;
+				}
 			}
 			if(underlyingTransportArc.interval().upperBound() instanceof ConstantBound){
-				if(((ConstantBound) underlyingTransportArc.interval().upperBound()).constant().hasFocus()){
+				if(((ConstantBound) underlyingTransportArc.interval().upperBound()).constant().getVisible()){
 					focusedConstant = true;
 				}
+				if(!((ConstantBound) underlyingTransportArc.interval().upperBound()).constant().getVisible()){
+					isvisible = false;
+				}
 			}
 			if(getWeight() instanceof ConstantWeight){
 				if(((ConstantWeight) getWeight()).constant().hasFocus()){
 					focusedConstant = true;
 				}
+				if(!((ConstantWeight) getWeight()).constant().hasFocus()){
+					isvisible = false;
+				}
 			}
 			if(focusedConstant){
 				pnName.setForeground(Pipe.SELECTION_TEXT_COLOUR);
 			}else{
 				pnName.setForeground(Pipe.ELEMENT_TEXT_COLOUR);
 			}
+			pnName.setVisible(isvisible);
 			
 		} else if (!isInPreSet) {
 			pnName.setText(" : " + String.valueOf(getGroup()));

=== modified file 'src/pipe/gui/widgets/ConstantsPane.java'
--- src/pipe/gui/widgets/ConstantsPane.java	2019-01-24 20:01:38 +0000
+++ src/pipe/gui/widgets/ConstantsPane.java	2020-02-03 20:24:41 +0000
@@ -30,6 +30,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
+import javax.swing.Timer;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 import javax.swing.event.ListSelectionEvent;
@@ -67,6 +68,7 @@
 	private final static String toolTipMoveUp = "Move the selected constant up";
 	private final static String toolTipMoveDown = "Move the selected constant down";
 	//private static final String toolTipGlobalConstantsLabel = "Here you can define a global constant for reuse in different places.";
+	Timer timer;
 
 
 	public ConstantsPane(boolean enableAddButton, TabContent currentTab) {
@@ -236,13 +238,19 @@
 	private void highlightConstant(int index){
 		ListModel model = constantsList.getModel();
 		Constant c = (Constant) model.getElementAt(index);
-		
+		if(timer != null) {
+			timer.stop();
+		}
 		if(c != null && !c.hasFocus()){
 			for(int i = 0; i < model.getSize(); i++){
 				((Constant) model.getElementAt(i)).setFocused(false);
 			}
+			for(int i = 0; i < model.getSize(); i++){
+				((Constant) model.getElementAt(i)).setVisible(true);
+			}
 			c.setFocused(true);
 			CreateGui.getCurrentTab().drawingSurface().repaintAll();
+			blinkConstant(c);
 		}
 	}
 	
@@ -257,6 +265,29 @@
 			// It is okay, the tab has just been closed
 		}
 	}
+	
+	private void blinkConstant(final Constant c) {
+		timer = new Timer(300, new ActionListener() {
+			long startTime = System.currentTimeMillis();
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if(System.currentTimeMillis() - startTime < 2100) {
+					if(!c.getVisible()) {
+						c.setVisible(true);
+						CreateGui.getCurrentTab().drawingSurface().repaintAll();
+					} else {
+						c.setVisible(false);
+						CreateGui.getCurrentTab().drawingSurface().repaintAll();
+					}
+				} else {
+					((Timer) e.getSource()).stop();
+				}
+			}
+		});
+		timer.setRepeats(true);
+	    timer.setCoalesce(true);
+		timer.restart();
+	}
 
 	private void addConstantsButtons(boolean enableAddButton) {
 		editBtn = new JButton("Edit");
@@ -449,5 +480,4 @@
 		constantsList.setSelectedIndex(0);
 
 	}
-
 }