Skip to content

Commit a0d57d3

Browse files
tbeutbeu
committed
Remove default smooth and color modifiers
1 parent 578bb0d commit a0d57d3

24 files changed

+258
-649
lines changed

‎Blocks/Examples/TestHardwareIOComedi.mo

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,22 @@ extends Modelica.Icons.Example;
5050
equation
5151
connect(sine.y, realToInteger.u) annotation (Line(
5252
points={{-79,30},{-74,30}},
53-
color={0,0,127},
54-
smooth=Smooth.None));
53+
color={0,0,127}));
5554
connect(realToInteger.y, dataWrite.u) annotation (Line(
5655
points={{-51,30},{-42,30}},
57-
color={255,127,0},
58-
smooth=Smooth.None));
56+
color={255,127,0}));
5957
connect(const.y, less.u2) annotation (Line(
6058
points={{-79,-50},{-76,-50},{-76,-18},{-72,-18}},
61-
color={0,0,127},
62-
smooth=Smooth.None));
59+
color={0,0,127}));
6360
connect(less.u1, sine.y) annotation (Line(
6461
points={{-72,-10},{-78,-10},{-78,30},{-79,30}},
65-
color={0,0,127},
66-
smooth=Smooth.None));
62+
color={0,0,127}));
6763
connect(less.y, dioWrite.u) annotation (Line(
6864
points={{-49,-10},{-42,-10}},
69-
color={255,0,255},
70-
smooth=Smooth.None));
65+
color={255,0,255}));
7166
connect(sine1.y, dataWrite1.u) annotation (Line(
7267
points={{-79,-90},{-72,-90},{-72,-70},{-62,-70}},
73-
color={0,0,127},
74-
smooth=Smooth.None));
68+
color={0,0,127}));
7569
annotation (Diagram(graphics={Text(
7670
extent={{-108,106},{108,76}},
7771
lineColor={0,0,255},

‎Blocks/Examples/TestSerialPackager.mo

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,51 +35,34 @@ extends Modelica.Icons.Example;
3535
equation
3636
connect(integerExpression.y, packInt.u) annotation (Line(
3737
points={{-59,10},{-42,10}},
38-
color={255,127,0},
39-
smooth=Smooth.None));
38+
color={255,127,0}));
4039
connect(packager.pkgOut, packInt.pkgIn) annotation (Line(
4140
points={{-30,39.2},{-30,20.8}},
42-
color={0,0,0},
43-
pattern=LinePattern.None,
44-
smooth=Smooth.None));
41+
pattern=LinePattern.None));
4542
connect(integerExpression2.y, addInteger.u[1]) annotation (Line(
4643
points={{-55,-68},{-48,-68},{-48,-66},{-42,-66}},
47-
color={255,127,0},
48-
smooth=Smooth.None));
44+
color={255,127,0}));
4945
connect(integerExpression1.y, packInt1.u) annotation (Line(
5046
points={{-59,-28},{-42,-28}},
51-
color={255,127,0},
52-
smooth=Smooth.None));
47+
color={255,127,0}));
5348
connect(packInt.pkgOut[1], packInt1.pkgIn) annotation (Line(
5449
points={{-30,-0.8},{-30,-17.2}},
55-
color={0,0,0},
56-
pattern=LinePattern.None,
57-
smooth=Smooth.None));
50+
pattern=LinePattern.None));
5851
connect(packInt1.pkgOut[1], addInteger.pkgIn) annotation (Line(
5952
points={{-30,-38.8},{-30,-55.2}},
60-
color={0,0,0},
61-
pattern=LinePattern.None,
62-
smooth=Smooth.None));
53+
pattern=LinePattern.None));
6354
connect(addInteger.pkgOut[1], resetPointer.pkgIn) annotation (Line(
6455
points={{-30,-76.8},{-30,-86},{10,-86},{10,64},{46,64},{46,56.8}},
65-
color={0,0,0},
66-
pattern=LinePattern.None,
67-
smooth=Smooth.None));
56+
pattern=LinePattern.None));
6857
connect(resetPointer.pkgOut[1], unpackInt.pkgIn) annotation (Line(
6958
points={{46,35.2},{46,22.8}},
70-
color={0,0,0},
71-
pattern=LinePattern.None,
72-
smooth=Smooth.None));
59+
pattern=LinePattern.None));
7360
connect(unpackInt.pkgOut[1], unpackInt1.pkgIn) annotation (Line(
7461
points={{46,1.2},{46,-13.2}},
75-
color={0,0,0},
76-
pattern=LinePattern.None,
77-
smooth=Smooth.None));
62+
pattern=LinePattern.None));
7863
connect(unpackInt1.pkgOut[1], getInteger.pkgIn) annotation (Line(
7964
points={{46,-34.8},{46,-51.2}},
80-
color={0,0,0},
81-
pattern=LinePattern.None,
82-
smooth=Smooth.None));
65+
pattern=LinePattern.None));
8366
annotation (experiment(StopTime=5.0),
8467
Documentation(info="<html>
8568
<p>

‎Blocks/Examples/TestSerialPackagerBitPack_UDP.mo

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -60,65 +60,43 @@ extends Modelica.Icons.Example;
6060
equation
6161
connect(integerExpression.y, packInt.u) annotation (Line(
6262
points={{-48.3,14},{-42,14}},
63-
color={255,127,0},
64-
smooth=Smooth.None));
63+
color={255,127,0}));
6564
connect(integerExpression1.y, packInt1.u) annotation (Line(
6665
points={{-48.2,-14},{-42,-14}},
67-
color={255,127,0},
68-
smooth=Smooth.None));
66+
color={255,127,0}));
6967
connect(integerConstant1.y,addInteger1. u[1]) annotation (Line(
7068
points={{-53.2,-40},{-42,-40}},
71-
color={255,127,0},
72-
smooth=Smooth.None));
69+
color={255,127,0}));
7370
connect(realExpression.y, addReal.u) annotation (Line(
7471
points={{-48.8,40},{-42,40}},
75-
color={0,0,127},
76-
smooth=Smooth.None));
72+
color={0,0,127}));
7773
connect(packager.pkgOut, addReal.pkgIn) annotation (Line(
7874
points={{-30,55.2},{-30,50.8}},
79-
color={0,0,0},
80-
pattern=LinePattern.None,
81-
smooth=Smooth.None));
75+
pattern=LinePattern.None));
8276
connect(addReal.pkgOut[1], packInt.pkgIn) annotation (Line(
8377
points={{-30,29.2},{-30,24.8}},
84-
color={0,0,0},
85-
pattern=LinePattern.None,
86-
smooth=Smooth.None));
78+
pattern=LinePattern.None));
8779
connect(packInt.pkgOut[1], packInt1.pkgIn) annotation (Line(
8880
points={{-30,3.2},{-30,-3.2}},
89-
color={0,0,0},
90-
pattern=LinePattern.None,
91-
smooth=Smooth.None));
81+
pattern=LinePattern.None));
9282
connect(packInt1.pkgOut[1], addInteger1.pkgIn) annotation (Line(
9383
points={{-30,-24.8},{-30,-29.2}},
94-
color={0,0,0},
95-
pattern=LinePattern.None,
96-
smooth=Smooth.None));
84+
pattern=LinePattern.None));
9785
connect(addInteger1.pkgOut[1], uDPSend.pkgIn) annotation (Line(
9886
points={{-30,-50.8},{-30,-57.2}},
99-
color={0,0,0},
100-
pattern=LinePattern.None,
101-
smooth=Smooth.None));
87+
pattern=LinePattern.None));
10288
connect(uDPReceive.pkgOut, getReal.pkgIn) annotation (Line(
10389
points={{30,57.2},{30,48.8}},
104-
color={0,0,0},
105-
pattern=LinePattern.None,
106-
smooth=Smooth.None));
90+
pattern=LinePattern.None));
10791
connect(getReal.pkgOut[1], unpackInt.pkgIn) annotation (Line(
10892
points={{30,27.2},{30,16.8}},
109-
color={0,0,0},
110-
pattern=LinePattern.None,
111-
smooth=Smooth.None));
93+
pattern=LinePattern.None));
11294
connect(unpackInt.pkgOut[1], unpackInt1.pkgIn) annotation (Line(
11395
points={{30,-4.8},{30,-13.2}},
114-
color={0,0,0},
115-
pattern=LinePattern.None,
116-
smooth=Smooth.None));
96+
pattern=LinePattern.None));
11797
connect(unpackInt1.pkgOut[1], getInteger1.pkgIn) annotation (Line(
11898
points={{30,-34.8},{30,-43.2}},
119-
color={0,0,0},
120-
pattern=LinePattern.None,
121-
smooth=Smooth.None));
99+
pattern=LinePattern.None));
122100
annotation (experiment(StopTime=5.0),
123101
Documentation(info="<html>
124102
<p>

‎Blocks/Examples/TestSerialPackager_SerialPort.mo

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,47 +46,31 @@ extends Modelica.Icons.Example;
4646
equation
4747
connect(unpackInt.pkgOut[1],getString. pkgIn) annotation (Line(
4848
points={{-8,-2.8},{-8,-13.2}},
49-
color={0,0,0},
50-
pattern=LinePattern.None,
51-
smooth=Smooth.None));
49+
pattern=LinePattern.None));
5250
connect(integerExpression.y,packInt. u) annotation (Line(
5351
points={{-72.7,10},{-58,10}},
54-
color={255,127,0},
55-
smooth=Smooth.None));
52+
color={255,127,0}));
5653
connect(packInt.pkgOut[1],addString. pkgIn) annotation (Line(
5754
points={{-46,-0.8},{-46,-9.2}},
58-
color={0,0,0},
59-
pattern=LinePattern.None,
60-
smooth=Smooth.None));
55+
pattern=LinePattern.None));
6156
connect(serialReceive.pkgOut, unpackInt.pkgIn) annotation (Line(
6257
points={{-9.2,50},{-8,50},{-8,18.8}},
63-
color={0,0,0},
64-
pattern=LinePattern.None,
65-
smooth=Smooth.None));
58+
pattern=LinePattern.None));
6659
connect(packager.pkgOut, packInt.pkgIn) annotation (Line(
6760
points={{-48,41.2},{-48,31.6},{-46,31.6},{-46,20.8}},
68-
color={0,0,0},
69-
pattern=LinePattern.None,
70-
smooth=Smooth.None));
61+
pattern=LinePattern.None));
7162
connect(addString.pkgOut[1], addInteger.pkgIn) annotation (Line(
7263
points={{-46,-30.8},{-46,-45.2}},
73-
color={0,0,0},
74-
pattern=LinePattern.None,
75-
smooth=Smooth.None));
64+
pattern=LinePattern.None));
7665
connect(addInteger.pkgOut[1], serialSend.pkgIn) annotation (Line(
7766
points={{-46,-66.8},{-46,-79.2}},
78-
color={0,0,0},
79-
pattern=LinePattern.None,
80-
smooth=Smooth.None));
67+
pattern=LinePattern.None));
8168
connect(integerExpression1.y, addInteger.u[1]) annotation (Line(
8269
points={{-70.6,-56},{-58,-56}},
83-
color={255,127,0},
84-
smooth=Smooth.None));
70+
color={255,127,0}));
8571
connect(getString.pkgOut[1], getInteger.pkgIn) annotation (Line(
8672
points={{-8,-34.8},{-8,-45.2}},
87-
color={0,0,0},
88-
pattern=LinePattern.None,
89-
smooth=Smooth.None));
73+
pattern=LinePattern.None));
9074
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
9175
-100},{100,100}}), graphics={Text(
9276
extent={{-104,96},{96,76}},

‎Blocks/Examples/TestSerialPackager_SharedMemory.mo

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,26 @@ equation
3636
connect(integerExpression.y, addInteger.u[1]) annotation (Line(
3737
points={{-59,-30},{-42,-30}},
3838
color={255,127,0},
39-
pattern=LinePattern.None,
40-
smooth=Smooth.None));
39+
pattern=LinePattern.None));
4140
connect(realExpression.y, addReal.u) annotation (Line(
4241
points={{-59,10},{-42,10}},
4342
color={0,0,127},
44-
pattern=LinePattern.None,
45-
smooth=Smooth.None));
43+
pattern=LinePattern.None));
4644
connect(packager.pkgOut, addReal.pkgIn) annotation (Line(
4745
points={{-30,39.2},{-30,20.8}},
48-
color={0,0,0},
49-
pattern=LinePattern.None,
50-
smooth=Smooth.None));
46+
pattern=LinePattern.None));
5147
connect(addReal.pkgOut[1], addInteger.pkgIn) annotation (Line(
5248
points={{-30,-0.8},{-30,-19.2}},
53-
color={0,0,0},
54-
pattern=LinePattern.None,
55-
smooth=Smooth.None));
49+
pattern=LinePattern.None));
5650
connect(addInteger.pkgOut[1], sharedMemoryWrite.pkgIn) annotation (Line(
5751
points={{-30,-40.8},{-30,-57.2}},
58-
color={0,0,0},
59-
pattern=LinePattern.None,
60-
smooth=Smooth.None));
52+
pattern=LinePattern.None));
6153
connect(sharedMemoryRead.pkgOut, getReal.pkgIn) annotation (Line(
6254
points={{50,39.2},{50,0.8}},
63-
color={0,0,0},
64-
pattern=LinePattern.None,
65-
smooth=Smooth.None));
55+
pattern=LinePattern.None));
6656
connect(getReal.pkgOut[1], getInteger.pkgIn) annotation (Line(
6757
points={{50,-20.8},{50,-39.2}},
68-
color={0,0,0},
69-
pattern=LinePattern.None,
70-
smooth=Smooth.None));
58+
pattern=LinePattern.None));
7159
annotation (experiment(StopTime=5.0),
7260
Documentation(info="<html>
7361
<p>

‎Blocks/Examples/TestSerialPackager_SocketCAN.mo

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,53 +48,36 @@ Modelica_DeviceDrivers.Blocks.OperatingSystem.SynchronizeRealtime
4848
equation
4949
connect(integerExpression1.y,addInteger. u[1]) annotation (Line(
5050
points={{-67,-12},{-50,-12}},
51-
color={255,127,0},
52-
smooth=Smooth.None));
51+
color={255,127,0}));
5352
connect(integerExpression2.y, packInt2.u)
5453
annotation (Line(
5554
points={{-67,-38},{-50,-38}},
56-
color={255,127,0},
57-
smooth=Smooth.None));
55+
color={255,127,0}));
5856
connect(integerConstant.y,packInt1. u) annotation (Line(
5957
points={{-67,14},{-50,14}},
60-
color={255,127,0},
61-
smooth=Smooth.None));
58+
color={255,127,0}));
6259
connect(packager.pkgOut,packInt1. pkgIn) annotation (Line(
6360
points={{-38,29.2},{-38,24.8}},
64-
color={0,0,0},
65-
pattern=LinePattern.None,
66-
smooth=Smooth.None));
61+
pattern=LinePattern.None));
6762
connect(packInt1.pkgOut[1],addInteger. pkgIn) annotation (Line(
6863
points={{-38,3.2},{-38,-1.2}},
69-
color={0,0,0},
70-
pattern=LinePattern.None,
71-
smooth=Smooth.None));
64+
pattern=LinePattern.None));
7265
connect(addInteger.pkgOut[1], packInt2.pkgIn)
7366
annotation (Line(
7467
points={{-38,-22.8},{-38,-27.2}},
75-
color={0,0,0},
76-
pattern=LinePattern.None,
77-
smooth=Smooth.None));
68+
pattern=LinePattern.None));
7869
connect(unpackInt1.pkgOut[1], getInteger.pkgIn) annotation (Line(
7970
points={{30,3.2},{30,-1.2}},
80-
color={0,0,0},
81-
pattern=LinePattern.None,
82-
smooth=Smooth.None));
71+
pattern=LinePattern.None));
8372
connect(getInteger.pkgOut[1], unpackInt2.pkgIn) annotation (Line(
8473
points={{30,-22.8},{30,-31.2}},
85-
color={0,0,0},
86-
pattern=LinePattern.None,
87-
smooth=Smooth.None));
74+
pattern=LinePattern.None));
8875
connect(packInt2.pkgOut[1], txMessage.pkgIn) annotation (Line(
8976
points={{-38,-48.8},{-38,-64},{-32.8,-64}},
90-
color={0,0,0},
91-
pattern=LinePattern.None,
92-
smooth=Smooth.None));
77+
pattern=LinePattern.None));
9378
connect(rxMessage.pkgOut, unpackInt1.pkgIn) annotation (Line(
9479
points={{40.8,40},{44,40},{44,28},{30,28},{30,24.8}},
95-
color={0,0,0},
96-
pattern=LinePattern.None,
97-
smooth=Smooth.None));
80+
pattern=LinePattern.None));
9881
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
9982
-100},{100,100}}),
10083
graphics={Text(

0 commit comments

Comments
 (0)