Fix icon view

lochel · lochel · commit 34bb7af0f1e0 · 2015-03-19T13:27:45.000+01:00
diff --git a/ConPNlib/Examples/Test10.mo b/ConPNlib/Examples/Test10.mo
@@ -16,5 +16,5 @@ equation
   connect(T2.outPlaces[1], P4.inTransition[1]) annotation(Line(points = {{4.7, -40}, {50.9434, -40}, {50.9434, -40}, {50.7, -40}}));
   connect(T1.outPlaces[1], P3.inTransition[1]) annotation(Line(points = {{4.7, 40}, {50.4717, 40}, {50.4717, 40}, {50.7, 40}}));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-50.7, 40}, {-4.71698, 40}, {-4.71698, 39.5}, {-4.7, 39.5}}));
-  annotation(experiment(StartTime = 0, StopTime = 3, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-80, -60}, {80, 60}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-80, -60}, {80, 60}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 3, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-80, -60}, {80, 60}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})));
 end Test10;
diff --git a/ConPNlib/Examples/Test11.mo b/ConPNlib/Examples/Test11.mo
@@ -37,6 +37,5 @@ equation
       color={0,0,0},
       smooth=Smooth.None));
   annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent={{-80,-20},
-            {80,20}},                                                                                                    preserveAspectRatio=false,   initialScale = 0.1, grid = {2, 2}),
-        graphics),                                                                                                    Icon(coordinateSystem(extent = {{-80, -20}, {80, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+            {80,20}}, preserveAspectRatio=false, initialScale = 0.1, grid = {2, 2}), graphics));
 end Test11;
diff --git a/ConPNlib/Examples/Test12.mo b/ConPNlib/Examples/Test12.mo
@@ -35,6 +35,5 @@ equation
       color={0,0,0},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-60,-40},
-            {60,40}}),         graphics), Icon(coordinateSystem(extent={{-60,-40},
-            {60,40}})));
+            {60,40}}), graphics));
 end Test12;
diff --git a/ConPNlib/Examples/Test1a.mo b/ConPNlib/Examples/Test1a.mo
@@ -1,5 +1,5 @@
 within ConPNlib.Examples;
 model Test1a
   ConPNlib.PC P1 annotation(Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  annotation(experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{0, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{0, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{0, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
 end Test1a;
diff --git a/ConPNlib/Examples/Test1b.mo b/ConPNlib/Examples/Test1b.mo
@@ -1,5 +1,5 @@
 within ConPNlib.Examples;
 model Test1b
   ConPNlib.TC T1 annotation(Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  annotation(experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-40, -20}, {0, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-40, -20}, {0, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-40, -20}, {0, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
 end Test1b;
diff --git a/ConPNlib/Examples/Test2.mo b/ConPNlib/Examples/Test2.mo
@@ -4,5 +4,5 @@ model Test2
   ConPNlib.PC P1(nOut = 1, startMarks = 1) annotation(Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-10.7, 0}, {-10.7, 0}, {15.3, 0}}));
-  annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-40, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-40, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-40, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
 end Test2;
diff --git a/ConPNlib/Examples/Test3.mo b/ConPNlib/Examples/Test3.mo
@@ -4,5 +4,5 @@ model Test3
   ConPNlib.PC P1(nIn = 1) annotation(Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-15.3, 0}, {10.7, 0}}));
-  annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-40, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-40, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-40, -20}, {40, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
 end Test3;
diff --git a/ConPNlib/Examples/Test4.mo b/ConPNlib/Examples/Test4.mo
@@ -8,5 +8,5 @@ equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-50.7, 0}, {-24.7, 0}}));
   connect(P2.inTransition[1], T1.outPlaces[1]) annotation(Line(points = {{10.7, 0}, {-15.3, 0}}));
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points = {{29.3, 0}, {55.3, 0}}));
-  annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-80, -20}, {80, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-80, -20}, {80, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-80, -20}, {80, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
 end Test4;
diff --git a/ConPNlib/Examples/Test5.mo b/ConPNlib/Examples/Test5.mo
@@ -6,5 +6,5 @@ model Test5
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points = {{4.7, 10}, {4.7, 10}, {20.7, 10}}));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-20.7, 10}, {-20.7, 10}, {-4.7, 10}}));
-  annotation(Diagram(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2}), graphics), Icon(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006));
+  annotation(Diagram(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2}), graphics), experiment(StartTime = 0, StopTime = 2, Tolerance = 1e-006));
 end Test5;
diff --git a/ConPNlib/Examples/Test6.mo b/ConPNlib/Examples/Test6.mo
@@ -6,5 +6,5 @@ model Test6
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points = {{4.7, 10}, {4.7, 10}, {20.7, 10}}));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-20.7, 10}, {-20.7, 10}, {-4.7, 10}}));
-  annotation(Diagram(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006));
+  annotation(Diagram(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006));
 end Test6;
diff --git a/ConPNlib/Examples/Test7.mo b/ConPNlib/Examples/Test7.mo
@@ -6,5 +6,5 @@ model Test7
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points = {{4.7, 10}, {4.7, 10}, {20.7, 10}}));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-20.7, 10}, {-20.7, 10}, {-4.7, 10}}));
-  annotation(Diagram(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006));
+  annotation(Diagram(coordinateSystem(extent = {{-60, -20}, {60, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006));
 end Test7;
diff --git a/ConPNlib/Examples/Test8.mo b/ConPNlib/Examples/Test8.mo
@@ -10,5 +10,5 @@ equation
   connect(T2.outPlaces[1], P3.inTransition[1]) annotation(Line(points = {{4.7, -30}, {4.7, -30}, {20.7, -30}}));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-20.7, -10.5}, {-12.354, -10.5}, {-12.354, 10}, {-4.7, 10}}));
   connect(P1.outTransition[2], T2.inPlaces[1]) annotation(Line(points = {{-20.7, -9.5}, {-12, -9.5}, {-12, -30}, {-4.7, -30}}, color = {0, 0, 0}, smooth = Smooth.None));
-  annotation(Diagram(coordinateSystem(extent = {{-60, -60}, {60, 40}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2}), graphics), Icon(coordinateSystem(extent = {{-40, -60}, {30, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006));
+  annotation(Diagram(coordinateSystem(extent = {{-60, -60}, {60, 40}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2}), graphics), experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-006));
 end Test8;
diff --git a/ConPNlib/Examples/Test9.mo b/ConPNlib/Examples/Test9.mo
@@ -14,5 +14,5 @@ equation
           {-9.19811,0},{-9.19811,0},{-9.3,0}}));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-30.7,0},
           {-24.7642,0},{-24.7642,0},{-24.7,0}}));
-  annotation(experiment(StartTime = 0, StopTime = 3, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-60, -20}, {60, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})), Icon(coordinateSystem(extent = {{-60, -20}, {60, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
+  annotation(experiment(StartTime = 0, StopTime = 3, Tolerance = 1e-006), Diagram(coordinateSystem(extent = {{-60, -20}, {60, 20}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2, 2})));
 end Test9;
