Skip to content

Commit

Permalink
Merge pull request #4 from lochel/dev2
Browse files Browse the repository at this point in the history
Show always all connectors
  • Loading branch information
lochel committed Mar 13, 2015
2 parents 9c9b067 + 7467660 commit 7beaac2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions PNlib/PC.mo
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public
maxSpeed=maxSpeedIn,
prelimSpeed=prelimSpeedIn,
enabledByInPlaces=enabledByInPlaces) "connector for input transitions" annotation (Placement(
transformation(extent={{-114,-10},{-98,10}}, rotation=0),visible=DynamicSelect(true,if nIn==0 then false else true),
transformation(extent={{-114,-10},{-98,10}}, rotation=0),
iconTransformation(extent={{-116,-10},{-100,10}})));
Interfaces.PlaceOut outTransition[nOut](each t = t_,
each tint=1,
Expand All @@ -113,7 +113,7 @@ public
each testValue=-1,
each testValueint=-1,
each normalArc=2) "connector for output transitions" annotation (Placement(
transformation(extent={{100,-10},{116,10}}, rotation=0),visible=DynamicSelect(true,if nOut==0 then false else true)));
transformation(extent={{100,-10},{116,10}}, rotation=0)));
Modelica.Blocks.Interfaces.RealOutput pc_t=t
"connector for Simulink connection" annotation (Placement(
transformation(extent={{-36,68},{-16,88}}), iconTransformation(
Expand Down
4 changes: 2 additions & 2 deletions PNlib/PD.mo
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public
arcWeightint=arcWeightIn,
active=activeIn,
enabledByInPlaces=enabledByInPlaces) "connector for input transitions"
annotation (Placement(transformation(extent={{-114,-10},{-98,10}}, rotation=0),visible=DynamicSelect(true,if nIn==0 then false else true),
annotation (Placement(transformation(extent={{-114,-10},{-98,10}}, rotation=0),
iconTransformation(extent={{-116,-10},{-100,10}})));
PNlib.Interfaces.PlaceOut outTransition[nOut](
each t=pret,
Expand All @@ -93,7 +93,7 @@ public
each testValue=-1,
each testValueint=-1,
each normalArc=2) "connector for output transitions"
annotation (Placement(transformation(extent={{100,-10},{116,10}}, rotation=0),visible=DynamicSelect(true,if nOut==0 then false else true)));
annotation (Placement(transformation(extent={{100,-10},{116,10}}, rotation=0)));
Modelica.Blocks.Interfaces.IntegerOutput pd_t=t
"connector for Simulink connection" annotation (Placement(
transformation(extent={{-36,68},{-16,88}}), iconTransformation(
Expand Down
4 changes: 2 additions & 2 deletions PNlib/TC.mo
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public
decreasingFactor=decreasingFactorIn,
testValue=testValue,
testValueint=testValueInt,
normalArc=normalArc) "connector for input places" annotation (Placement(transformation(extent={{ -56,-10},{-40,10}}, rotation=0),visible=DynamicSelect(true,if nIn==0 then false else true)));
normalArc=normalArc) "connector for input places" annotation (Placement(transformation(extent={{ -56,-10},{-40,10}}, rotation=0)));
Interfaces.TransitionOut[nOut] outPlaces(each active=activation.active,
each fire=fire,
each enabledByInPlaces = true,
Expand All @@ -101,7 +101,7 @@ public
emptied=emptied,
disPlace=disPlaceOut,
speedSum=speedSumOut,decreasingFactor=decreasingFactorOut)
"connector for output places" annotation (Placement(transformation(extent={{40,-10},{56,10}}, rotation=0),visible=DynamicSelect(true,if nOut==0 then false else true)));
"connector for output places" annotation (Placement(transformation(extent={{40,-10},{56,10}}, rotation=0)));
equation
//****MAIN BEGIN****//
//firing process
Expand Down
4 changes: 2 additions & 2 deletions PNlib/TD.mo
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public
testValue=testValue,
testValueint=testValueInt,
normalArc=normalArc) "connector for input places"
annotation (Placement(transformation(extent={{-56,-10},{-40,10}}, rotation=0),visible=DynamicSelect(true,if nIn==0 then false else true)));
annotation (Placement(transformation(extent={{-56,-10},{-40,10}}, rotation=0)));
PNlib.Interfaces.TransitionOut outPlaces[nOut](
each active=delayPassed,
arcWeight=arcWeightOut,
Expand All @@ -98,7 +98,7 @@ public
maxTokensint=maxTokensInt,
disPlace=disPlaceOut,
enable=enableOut) "connector for output places" annotation (Placement(transformation(extent={
{40,-10},{56,10}}, rotation=0),visible=DynamicSelect(true,if nOut==0 then false else true)));
{40,-10},{56,10}}, rotation=0)));
equation
//****MAIN BEGIN****//
delay_=if delay<=0 then 10^(-6) else delay; //due to event problems if delay==0
Expand Down
4 changes: 2 additions & 2 deletions PNlib/TS.mo
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public
testValue=testValue,
testValueint=testValueInt,
normalArc=normalArc) "connector for input places" annotation (Placement(transformation(extent={{
-56,-10},{-40,10}}, rotation=0),visible=DynamicSelect(true,if nIn==0 then false else true)));
-56,-10},{-40,10}}, rotation=0)));

PNlib.Interfaces.TransitionOut outPlaces[nOut](
each active=delayPassed,
Expand All @@ -104,7 +104,7 @@ public
maxTokensint=maxTokensInt,
disPlace=disPlaceOut,
enable=enableOut) "connector for output places" annotation (Placement(transformation(extent={
{40,-10},{56,10}}, rotation=0),visible=DynamicSelect(true,if nOut==0 then false else true)));
{40,-10},{56,10}}, rotation=0)));
equation
//****MAIN BEGIN****//
//reset active when delay passed
Expand Down

0 comments on commit 7beaac2

Please sign in to comment.