Merge lp:~tapaal-contributor/tapaal/intervals-on-outgoing-arcs-1896451 into lp:tapaal

Proposed by Peter Haahr Taankvist
Status: Merged
Approved by: Jiri Srba
Approved revision: 1104
Merged at revision: 1106
Proposed branch: lp:~tapaal-contributor/tapaal/intervals-on-outgoing-arcs-1896451
Merge into: lp:tapaal
Diff against target: 26 lines (+5/-2)
1 file modified
src/pipe/gui/widgets/GuardDialogue.java (+5/-2)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/intervals-on-outgoing-arcs-1896451
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Peter Haahr Taankvist (community) Needs Resubmitting
Review via email: mp+391148@code.launchpad.net

Commit message

Interval editor is now properly hidden on Outgoing arcs and inhibitor arcs

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) wrote :

It should be hidden also on outgoing transport arc.

review: Needs Fixing
1104. By Peter Haahr Taankvist

Hide interval edit on outgoing transport arcs

Revision history for this message
Peter Haahr Taankvist (ptaank) wrote :

Interval editor panel is also hidden on outgoing transport arcs.

review: Needs Resubmitting
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pipe/gui/widgets/GuardDialogue.java'
2--- src/pipe/gui/widgets/GuardDialogue.java 2020-09-10 08:45:12 +0000
3+++ src/pipe/gui/widgets/GuardDialogue.java 2020-09-24 15:33:23 +0000
4@@ -32,9 +32,11 @@
5 import net.tapaal.swinghelpers.WidthAdjustingComboBox;
6 import pipe.gui.CreateGui;
7 import pipe.gui.graphicElements.PetriNetObject;
8+import pipe.gui.graphicElements.Transition;
9 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
10 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
11 import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
12+import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
13 import pipe.gui.undo.UndoManager;
14 import dk.aau.cs.model.tapn.Bound.InfBound;
15
16@@ -75,8 +77,9 @@
17 setLayout(new GridBagLayout());
18
19 initTimeGuardPanel();
20-
21- if(!objectToBeEdited.isTimed() ){
22+ guardEditPanel.setVisible(objectToBeEdited.isTimed() && objectToBeEdited instanceof TimedInputArcComponent
23+ && !(objectToBeEdited instanceof TimedInhibitorArcComponent));
24+ if(objectToBeEdited instanceof TimedTransportArcComponent && ((TimedTransportArcComponent) objectToBeEdited).getSource() instanceof Transition){
25 guardEditPanel.setVisible(false);
26 }
27

Subscribers

People subscribed via source and target branches