modelica#4107 missing commits in master (modelica#4140)

* Resolved issue modelica#4072 (for Modelica/Electrical) * Resolved issue modelica#4072 (for rest of Modelica) * Squash doubled point {0,-50.5} * Delete doubled connection's coordinate * Delete doubled connection's coordinate * Delete doubled connection's coordinate * Delete doubled connection's coordinate * Delete doubled connection's coordinate * Delete doubled connection's coordinate * Delete doubled connection's coordinate * Fix near-zero coordinate in connection's annotation * Merge branch 'DagBruck_01' of https://github.com/modelica/ModelicaStandardLibrary into DagBruck_01 --------- Co-authored-by: Dag Brück <dag.brueck@3ds.com> Co-authored-by: tobolar <tobolar@users.noreply.github.com> Co-authored-by: tobolar <jakub.tobolar@dlr.de>
AHaumer · Jun 1, 2023 · a963d5b · a963d5b
1 parent 07b45a6
commit a963d5b
Show file tree

Hide file tree

Showing 38 changed files with 66 additions and 82 deletions.
diff --git a/Modelica/Electrical/Analog/Examples/Utilities/Conductor.mo b/Modelica/Electrical/Analog/Examples/Utilities/Conductor.mo
@@ -39,7 +39,7 @@ equation
           {40,80},{40,8},{23,8}}, color={0,0,127}));
   connect(currentToVoltage1.pin_p, conductor.p) annotation (Line(points={{-18,8},
           {-10,8},{-10,10},{0,10}}, color={0,0,255}));
-  connect(conductor.p, currentToVoltage2.pin_p) annotation (Line(points={{1.77636e-015,
+  connect(conductor.p, currentToVoltage2.pin_p) annotation (Line(points={{0,
           10},{10,10},{10,8},{18,8}}, color={0,0,255}));
   connect(currentToVoltage1.pin_n, conductor.n) annotation (Line(points={{-18,-8},
           {-10,-8},{-10,-10},{0,-10}}, color={0,0,255}));

diff --git a/Modelica/Electrical/Analog/Examples/Utilities/DirectCapacitor.mo b/Modelica/Electrical/Analog/Examples/Utilities/DirectCapacitor.mo
@@ -37,18 +37,18 @@ equation
   connect(iDrive, currentSource.i)
     annotation (Line(points={{-120,0},{-52,0}}, color={0,0,127}));
   connect(capacitor.p, currentToVoltage.pin_p) annotation (Line(points={{
-          1.77636e-015,10},{10,10},{10,8},{18.4,8}},
+          0,10},{10,10},{10,8},{18.4,8}},
                                   color={0,0,255}));
   connect(capacitor.n, currentToVoltage.pin_n) annotation (Line(points={{
-          -1.77636e-015,-10},{10,-10},{10,-8},{18.4,-8}},
+          0,-10},{10,-10},{10,-8},{18.4,-8}},
                                      color={0,0,255}));
   connect(currentSource.p, ground.p)
     annotation (Line(points={{-40,-10},{-20,-10}}, color={0,0,255}));
   connect(ground.p, capacitor.n)
-    annotation (Line(points={{-20,-10},{-1.77636e-015,-10}},
+    annotation (Line(points={{-20,-10},{0,-10}},
                                                    color={0,0,255}));
   connect(currentSource.n, capacitor.p)
-    annotation (Line(points={{-40,10},{1.77636e-015,10}},
+    annotation (Line(points={{-40,10},{0,10}},
                                                  color={0,0,255}));
   annotation (Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-100,-100},{100,100}}),

diff --git a/Modelica/Electrical/Batteries/BaseClasses/BaseCellWithSensors.mo b/Modelica/Electrical/Batteries/BaseClasses/BaseCellWithSensors.mo
@@ -65,8 +65,8 @@ equation
   connect(multiSensor.power, cellBus.power) annotation (Line(points={{-71,-6},{-90,
           -6},{-90,-80},{-59.95,-80},{-59.95,-79.95}},
                                                    color={0,0,127}));
-  connect(heatFlowSensor.port_b, internalHeatPort) annotation (Line(points={{
-          -1.77636e-15,-70},{-1.77636e-15,-75},{0,-75},{0,-80}}, color={191,0,0}));
+  connect(heatFlowSensor.port_b, internalHeatPort) annotation (Line(
+        points={{0,-70},{0,-80}}, color={191,0,0}));
   connect(heatFlowSensor.port_a, cell.heatPort)
     annotation (Line(points={{0,-50},{0,-10}}, color={191,0,0}));
   connect(heatFlowSensor.Q_flow, cellBus.lossPower) annotation (Line(points={{-11,-60},

diff --git a/Modelica/Electrical/Batteries/BatteryStacks/package.mo b/Modelica/Electrical/Batteries/BatteryStacks/package.mo
@@ -14,6 +14,6 @@ package BatteryStacks "Battery stacks built from cells"
         Rectangle(extent={{-70,50},{70,-50}}, lineColor={95,95,95},
           fillColor={215,215,215},
           fillPattern=FillPattern.HorizontalCylinder,
-          origin={-7.10543e-15,-10},
+          origin={0,-10},
           rotation=90)}));
 end BatteryStacks;
diff --git a/Modelica/Electrical/Batteries/BatteryStacksWithSensors/package.mo b/Modelica/Electrical/Batteries/BatteryStacksWithSensors/package.mo
@@ -14,7 +14,7 @@ package BatteryStacksWithSensors "Battery cells and stacks with sensors"
         Rectangle(extent={{-70,50},{70,-50}}, lineColor={95,95,95},
           fillColor={215,215,215},
           fillPattern=FillPattern.HorizontalCylinder,
-          origin={-7.10543e-15,-10},
+          origin={0,-10},
           rotation=90),
         Polygon(
           points={{-40,25},{40,25},{50,15},{40,-20},{30,-25},{-30,-25},{-40,-20},{-50,15}},

diff --git a/Modelica/Electrical/Batteries/Examples/SuperCapDischargeCharge.mo b/Modelica/Electrical/Batteries/Examples/SuperCapDischargeCharge.mo
@@ -45,8 +45,7 @@ equation
     annotation (Line(points={{10,40},{10,50},{20,50}}, color={0,0,255}));
   connect(powerSensor.power, energy.u)
     annotation (Line(points={{10,29},{10,20},{58,20}}, color={0,0,127}));
-  connect(gain.y, signalCurrent.i) annotation (Line(points={{-29,0},{-12,0},
-          {-12,6.66134e-16}}, color={0,0,127}));
+  connect(gain.y, signalCurrent.i) annotation (Line(points={{-29,0},{-12,0}}, color={0,0,127}));
   connect(pulseSeries.y, gain.u)
     annotation (Line(points={{-59,0},{-52,0}}, color={0,0,127}));
   annotation (experiment(

diff --git a/Modelica/Electrical/Batteries/package.mo b/Modelica/Electrical/Batteries/package.mo
@@ -11,7 +11,7 @@ package Batteries "Simple battery models"
         Rectangle(extent={{-70,50},{70,-50}}, lineColor={95,95,95},
           fillColor={215,215,215},
           fillPattern=FillPattern.HorizontalCylinder,
-          origin={-7.10543e-15,-10},
+          origin={0,-10},
           rotation=90),
         Ellipse(extent={{-10,50},{10,-50}},lineColor={95,95,95},
           fillColor={215,215,215},

diff --git a/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/IdealDcDc.mo b/Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/IdealDcDc.mo
@@ -55,7 +55,7 @@ equation
   connect(powerMot.pc, powerMot.pv)
     annotation (Line(points={{20,-70},{20,-60},{30,-60}}, color={0,0,255}));
   connect(powerBat.power, feedback.u2) annotation (Line(points={{40,81},
-          {40,88},{70,88},{70,-4.44089e-16},{58,-4.44089e-16}},
+          {40,88},{70,88},{70,0},{58,0}},
                                   color={0,0,127}));
   connect(powerMot.power, feedback.u1) annotation (Line(points={{20,-81},
           {20,-88},{50,-88},{50,-8}},

diff --git a/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_CurrentControlled.mo b/Modelica/Electrical/Machines/Examples/DCMachines/DCPM_CurrentControlled.mo
@@ -90,7 +90,7 @@ equation
   connect(dcpm.flange, loadInertia.flange_a) annotation (Line(
       points={{20,-20},{40,-20}}));
   connect(dcpm.pin_an, ground.p)
-    annotation (Line(points={{4,-10},{4,-1.77636e-15},{-8,-1.77636e-15}},
+    annotation (Line(points={{4,-10},{4,0},{-8,0}},
                                                    color={0,0,255}));
   connect(signalVoltage.p, currentSensor.p)
     annotation (Line(points={{20,30},{20,20}}, color={0,0,255}));

diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Inverter.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_Inverter.mo
@@ -88,7 +88,7 @@ equation
   connect(loadTorqueStep.flange, loadInertia.flange_b)
     annotation (Line(points={{70,-40},{60,-40}}));
   connect(signalVoltage.plug_p, currentQuasiRMSSensor.plug_p)
-    annotation (Line(points={{30,20},{30,10},{-10,10},{-10,-1.77636e-15}},
+    annotation (Line(points={{30,20},{30,10},{-10,10},{-10,0}},
                                                     color={0,0,255}));
   connect(terminalBox.plugSupply, currentQuasiRMSSensor.plug_n)
     annotation (Line(

diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_DOL.mo
@@ -164,8 +164,7 @@ equation
   connect(sineVoltage.plug_p, idealCloser.plug_p)
     annotation (Line(points={{-20,90},{0,90},{0,80}}, color={0,0,255}));
   connect(idealCloser.plug_n, electricalPowerSensor.plug_p) annotation (Line(
-        points={{-1.77636e-015,60},{0,60},{0,50},{1.77636e-015,50}}, color={0,0,
-          255}));
+        points={{0,60},{0,50}}, color={0,0,255}));
   connect(booleanReplicator.y, idealCloser.control)
     annotation (Line(points={{-29,70},{-12,70}}, color={255,0,255}));
   connect(booleanStep.y, booleanReplicator.u)

diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo
@@ -74,9 +74,10 @@ equation
     annotation (Line(points={{-20,10},{-20,12},{-10,12}},color={0,0,255}));
   connect(potentialSensor.plug_p, terminalBox.plugSupply)
     annotation (Line(points={{0,20},{0,12}}, color={0,0,255}));
-  connect(potentialSensor.phi, toSpacePhasor.u) annotation (Line(points={{8.88178e-16,
-          41},{8.88178e-16,50},{8,50}}, color={0,0,127}));
-  connect(speed.flange, smpm.flange) annotation (Line(points={{30,0},{10,0}}));
+  connect(potentialSensor.phi, toSpacePhasor.u) annotation (Line(points={{0,
+          41},{0,50},{8,50}}, color={0,0,127}));
+  connect(constantSpeed.flange, smpm.flange)
+    annotation (Line(points={{32,0},{10,0}}));
   connect(smpm.flange, hallSensor.flange)
     annotation (Line(points={{10,0},{20,0},{20,-30},{30,-30}}));
   connect(toSpacePhasor.y, toPolar.u)

diff --git a/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_VoltageSource.mo b/Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_VoltageSource.mo
@@ -154,7 +154,7 @@ equation
   connect(dqCurrentController.y, signalVoltage.v)
     annotation (Line(points={{-29,50},{-22,50}}, color={0,0,127}));
   connect(currentSensor.i, dqCurrentController.iActual) annotation (Line(
-        points={{-21,1.9984e-015},{-46,1.9984e-015},{-46,38}}, color={0,0,
+        points={{-21,0},{-46,0},{-46,38}}, color={0,0,
           127}));
   connect(inertiaLoad.flange_a, multiSensor.flange_b)
     annotation (Line(points={{60,-40},{50,-40}}));

diff --git a/Modelica/Electrical/Machines/Sensors/CurrentQuasiRMSSensor.mo b/Modelica/Electrical/Machines/Sensors/CurrentQuasiRMSSensor.mo
@@ -39,7 +39,7 @@ equation
   connect(ToSpacePhasor1.y, ToPolar1.u) annotation (Line(
       points={{0,-1},{0,-18}}, color={0,0,127}));
   connect(ToPolar1.y[1], Gain1.u) annotation (Line(
-      points={{-1.9984e-15,-41},{-1.9984e-15,-50.5},{0,-50.5},{0,-58}},
+      points={{0,-41},{0,-50.5},{0,-58}},
                                                           color={0,0,127}));
   connect(Gain1.y, I) annotation (Line(
       points={{0,-81},{0,-110}}, color={0,0,127}));

diff --git a/Modelica/Electrical/Machines/Sensors/VoltageQuasiRMSSensor.mo b/Modelica/Electrical/Machines/Sensors/VoltageQuasiRMSSensor.mo
@@ -40,8 +40,7 @@ equation
   connect(ToSpacePhasor1.y, ToPolar1.u) annotation (Line(
       points={{0,-1},{0,-18}}, color={0,0,127}));
   connect(ToPolar1.y[1], Gain1.u) annotation (Line(
-      points={{-1.9984e-15,-41},{-1.9984e-15,-49.5},{0,-49.5},{0,-58}},
-                                                          color={0,0,127}));
+      points={{0,-41},{0,-58}}, color={0,0,127}));
   connect(Gain1.y, V) annotation (Line(
       points={{0,-81},{0,-110}}, color={0,0,127}));
   annotation (defaultComponentName="voltageRMSSensor",

diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2mPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTap2mPulse.mo
@@ -75,11 +75,9 @@ equation
   connect(thyristor_n.plug_n, star_n.plug_p) annotation (Line(
       points={{0,-60},{72,-60}}, color={0,0,255}));
   connect(andCondition_p.y, thyristor_p.fire) annotation (Line(
-      points={{-60,-69},{-60,80},{1.77636e-15,80},{1.77636e-15,71.8}},
-                                                   color={255,0,255}));
+      points={{-60,-69},{-60,80},{0,80},{0,71.8}}, color={255,0,255}));
   connect(andCondition_n.y, thyristor_n.fire) annotation (Line(
-      points={{60,-69},{60,-40},{1.77636e-15,-40},{1.77636e-15,-48.2}},
-                                                    color={255,0,255}));
+      points={{60,-69},{60,-40},{0,-40},{0,-48.2}}, color={255,0,255}));
   annotation (defaultComponentName="rectifier",
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
             100,100}}), graphics={

diff --git a/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTapmPulse.mo b/Modelica/Electrical/PowerConverters/ACDC/ThyristorCenterTapmPulse.mo
@@ -51,8 +51,7 @@ equation
   connect(ac, thyristor.plug_p) annotation (Line(
       points={{-100,0},{-20,0}}, color={0,0,255}));
   connect(andCondition_p.y, thyristor.fire) annotation (Line(
-      points={{-60,-69},{-60,20},{1.77636e-15,20},{1.77636e-15,11.8}},
-                                                   color={255,0,255}));
+      points={{-60,-69},{-60,20},{0,20},{0,11.8}}, color={255,0,255}));
   annotation (defaultComponentName="rectifier",
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
             100,100}}), graphics={

diff --git a/Modelica/Electrical/PowerConverters/DCDC/ChopperStepUp.mo b/Modelica/Electrical/PowerConverters/DCDC/ChopperStepUp.mo
@@ -52,9 +52,8 @@ equation
     annotation (Line(points={{10,60},{100,60}}, color={0,0,255}));
   connect(dc_n1, dc_n2)
     annotation (Line(points={{-100,-60},{100,-60}}, color={0,0,255}));
-  connect(transistor.heatPort, heatPort) annotation (Line(points={{-30,
-          -4.44089e-16},{-16,-4.44089e-16},{-16,0},{0,0},{0,-100}}, color={
-          191,0,0}));
+  connect(transistor.heatPort, heatPort) annotation (Line(points={
+          {-30,0},{0,0},{0,-100}}, color={191,0,0}));
   connect(heatPort, diode.heatPort)
     annotation (Line(points={{0,-100},{0,50}}, color={191,0,0}));
   annotation (defaultComponentName="dcdc",

diff --git a/Modelica/Electrical/PowerConverters/DCDC/Control/Voltage2DutyCycle.mo b/Modelica/Electrical/PowerConverters/DCDC/Control/Voltage2DutyCycle.mo
@@ -43,9 +43,9 @@ equation
   else
     dutyCycle =1 - vLimInt/max(v, vLimInt);
   end if;
-  connect(vLim, vLimInt) annotation (Line(points={{0,120},{0,80},{4.44089e-16,
-          80}}, color={0,0,127}));
-  connect(vLimInt, vLimConst.y) annotation (Line(points={{4.44089e-16,80},
+  connect(vLim, vLimInt) annotation (Line(points={
+          {0,120},{0,80}}, color={0,0,127}));
+  connect(vLimInt, vLimConst.y) annotation (Line(points={{0,80},
           {19,80}}, color={0,0,127}));
   annotation (defaultComponentName="adaptor", Icon(graphics={
         Rectangle(

diff --git a/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_R.mo b/Modelica/Electrical/PowerConverters/Examples/ACAC/Dimmer_R.mo
@@ -9,7 +9,7 @@ model Dimmer_R "Dimmer with resistive load"
         origin={50,10})));
 equation
   connect(ground.p, loadResistor.n) annotation (Line(points={{-80,-20},{50,-20},
-          {50,-3.55271e-15}}, color={0,0,255}));
+          {50,0}}, color={0,0,255}));
   connect(loadResistor.p, multiSensor.nc)
     annotation (Line(points={{50,20},{50,40},{30,40}}, color={0,0,255}));
   annotation (experiment(

diff --git a/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo b/Modelica/Electrical/PowerConverters/Examples/ACAC/SoftStarter.mo
@@ -151,7 +151,7 @@ equation
   connect(multiSensor.pc, multiSensor.pv)
     annotation (Line(points={{-10,40},{-10,50},{0,50}}, color={0,0,255}));
   connect(multiSensor.nv,star2. plug_p)
-    annotation (Line(points={{0,30},{0,10},{1.77636e-15,10}},
+    annotation (Line(points={{0,30},{0,10}},
                                              color={0,0,255}));
   connect(terminalBox.plug_sn, imc.plug_sn)
     annotation (Line(points={{14,10},{14,10}}, color={0,0,255}));
@@ -162,8 +162,7 @@ equation
   connect(triac.fire2, adaptor.fire_n)
     annotation (Line(points={{-24,28},{-24,11}}, color={255,0,255}));
   connect(voltageSensor.v, adaptor.v)
-    annotation (Line(points={{-49,-8.88178e-16},{-46,-8.88178e-16},{-46,0},{-42,
-          0}},                                 color={0,0,127}));
+    annotation (Line(points={{-49,0},{-42,0}}, color={0,0,127}));
   connect(currentQuasiRMSSensor.plug_p, sineVoltage.plug_p)
     annotation (Line(points={{-80,20},{-80,10}}, color={0,0,255}));
   connect(currentQuasiRMSSensor.plug_n, triac.plug_p)

diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperStepDown/ChopperStepDown_R.mo b/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperStepDown/ChopperStepDown_R.mo
@@ -25,7 +25,7 @@ equation
   connect(loadResistor.n, currentSensor.p)
     annotation (Line(points={{40,30},{40,-10},{30,-10}}, color={0,0,255}));
   connect(loadResistor.p, capacitor.p) annotation (Line(points={{40,50},{40,60},
-          {1.77636e-15,60},{1.77636e-15,10}}, color={0,0,255}));
+          {0,60},{0,10}}, color={0,0,255}));
   connect(adaptor.dutyCycle, signalPWM.dutyCycle)
     annotation (Line(points={{-70,-49},{-70,-40},{-42,-40}}, color={0,0,127}));
   connect(vRef.y, adaptor.v)

diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperStepDown/ChopperStepDown_RL.mo b/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperStepDown/ChopperStepDown_RL.mo
@@ -29,7 +29,7 @@ model ChopperStepDown_RL "Step down chopper with R-L load"
     annotation (Placement(transformation(extent={{100,-90},{80,-70}})));
 equation
   connect(loadResistor.p, capacitor.p) annotation (Line(points={{40,50},{40,60},
-          {1.77636e-15,60},{1.77636e-15,10}}, color={0,0,255}));
+          {0,60},{0,10}}, color={0,0,255}));
   connect(loadInductor.n, currentSensor.p)
     annotation (Line(points={{40,0},{40,-10},{30,-10}}, color={0,0,255}));
   connect(loadResistor.n, loadInductor.p)

diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperStepUp/ChopperStepUp_R.mo b/Modelica/Electrical/PowerConverters/Examples/DCDC/ChopperStepUp/ChopperStepUp_R.mo
@@ -25,7 +25,7 @@ equation
   connect(loadResistor.n, currentSensor.p)
     annotation (Line(points={{40,30},{40,-10},{30,-10}}, color={0,0,255}));
   connect(loadResistor.p, capacitor.p) annotation (Line(points={{40,50},{40,60},
-          {1.77636e-15,60},{1.77636e-15,10}}, color={0,0,255}));
+          {0,60},{0,10}}, color={0,0,255}));
   connect(adaptor.dutyCycle, signalPWM.dutyCycle)
     annotation (Line(points={{-70,-49},{-70,-40},{-42,-40}}, color={0,0,127}));
   connect(vRef.y, adaptor.v)

diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/ExampleTemplates/ChopperStepDown.mo b/Modelica/Electrical/PowerConverters/Examples/DCDC/ExampleTemplates/ChopperStepDown.mo
@@ -64,16 +64,13 @@ equation
   connect(chopperStepDown.dc_p2, inductor.p)
     annotation (Line(points={{-40,6},{-30,6},{-30,10}}, color={0,0,255}));
   connect(inductor.n, capacitor.p)
-    annotation (Line(points={{-10,10},{1.77636e-15,10}},
-                                               color={0,0,255}));
+    annotation (Line(points={{-10,10},{0,10}}, color={0,0,255}));
   connect(voltageSensor.p, capacitor.p)
-    annotation (Line(points={{60,20},{60,60},{1.77636e-15,60},{
-          1.77636e-15,10}},                                  color={0,0,255}));
+    annotation (Line(points={{60,20},{60,60},{0,60},{0,10}}, color={0,0,255}));
   connect(chopperStepDown.dc_n2, capacitor.n) annotation (Line(points={
-          {-40,-6},{-20,-6},{-20,-10},{-1.77636e-15,-10}}, color={0,0,
-          255}));
+          {-40,-6},{-20,-6},{-20,-10},{0,-10}}, color={0,0,255}));
   connect(capacitor.n, currentSensor.n) annotation (Line(points={{
-          -1.77636e-15,-10},{10,-10}}, color={0,0,255}));
+          0,-10},{10,-10}}, color={0,0,255}));
   annotation (Documentation(
         info="<html>
 <p>Step down chopper example template including supply and sensors; load is not yet included</p>

diff --git a/Modelica/Electrical/PowerConverters/Examples/DCDC/ExampleTemplates/ChopperStepUp.mo b/Modelica/Electrical/PowerConverters/Examples/DCDC/ExampleTemplates/ChopperStepUp.mo
@@ -64,17 +64,13 @@ equation
   connect(inductor.n, chopperStepUp.dc_p1) annotation (Line(points={{-50,
           10},{-50,6},{-40,6}}, color={0,0,255}));
   connect(voltageSensor.p, capacitor.p)
-    annotation (Line(points={{60,20},{60,60},{1.77636e-15,60},{
-          1.77636e-15,10}},                                  color={0,0,255}));
+    annotation (Line(points={{60,20},{60,60},{0,60},{0,10}}, color={0,0,255}));
   connect(capacitor.p, chopperStepUp.dc_p2) annotation (Line(points={{
-          1.77636e-15,10},{-10,10},{-10,6},{-20,6}},
-                                color={0,0,255}));
+          0,10},{-10,10},{-10,6},{-20,6}}, color={0,0,255}));
   connect(chopperStepUp.dc_n2, capacitor.n) annotation (Line(points={{-20,-6},
-          {-10,-6},{-10,-10},{-1.77636e-15,-10}},
-                                  color={0,0,255}));
+          {-10,-6},{-10,-10},{0,-10}}, color={0,0,255}));
   connect(capacitor.n, currentSensor.n)
-    annotation (Line(points={{-1.77636e-15,-10},{10,-10}},
-                                                color={0,0,255}));
+    annotation (Line(points={{0,-10},{10,-10}}, color={0,0,255}));
   annotation (Documentation(
         info="<html>
 <p>Step up chopper example template including supply and sensors; load is not yet included</p>

diff --git a/Modelica/Fluid/Valves.mo b/Modelica/Fluid/Valves.mo
@@ -449,8 +449,7 @@ it is open.
     // Isenthalpic state transformation (no storage and no loss of energy)
     port_a.h_outflow = inStream(port_b.h_outflow);
     port_b.h_outflow = inStream(port_a.h_outflow);
-    connect(open, openingGenerator.u) annotation (Line(points={{0,80},{0,42},{2.22045e-15,
-            42}}, color={255,0,255}));
+    connect(open, openingGenerator.u) annotation (Line(points={{0,80},{0,42}}, color={255,0,255}));
     annotation (
     Icon(coordinateSystem(
           preserveAspectRatio=false,

diff --git a/...ca/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo b/...ca/Magnetic/FluxTubes/Examples/Hysteresis/Components/Transformer3PhaseYyWithHysteresis.mo
@@ -362,7 +362,7 @@ equation
           textColor={0,0,255},
           textString="%name"),
         Polygon(
-          points={{-20,10},{0,-10},{1.22465e-016,-50},{-10,-60},{-20,-60},{-20,10}},
+          points={{-20,10},{0,-10},{0,-50},{-10,-60},{-20,-60},{-20,10}},
           fillColor={255,128,0},
           fillPattern=FillPattern.VerticalCylinder,
           origin={-60,-40},

diff --git a/Modelica/Magnetic/FluxTubes/Icons/HollowCylinderCircumferentialFlux.mo b/Modelica/Magnetic/FluxTubes/Icons/HollowCylinderCircumferentialFlux.mo
@@ -36,8 +36,7 @@ partial model HollowCylinderCircumferentialFlux
           startAngle=52,
           endAngle=180,
           closure=EllipseClosure.None),
-        Line(points={{40,-40},{2.22045e-16,1.35963e-32}},
-                                        color={255,128,0},
+        Line(points={{40,-40},{0,0}}, color={255,128,0},
           origin={36,-32},
           rotation=90),
         Line(points={{76,8},{78,12},{80,20}},  color={255,128,0})}));

diff --git a/Modelica/Magnetic/FluxTubes/Icons/HollowCylinderRadialFlux.mo b/Modelica/Magnetic/FluxTubes/Icons/HollowCylinderRadialFlux.mo
@@ -32,12 +32,12 @@ partial model HollowCylinderRadialFlux "Icon for cylinder with radial flux"
           origin={0,30},
           rotation=90),
         Line(
-          points={{-2,-1.22465e-16},{60,0}},
+          points={{-2,0},{60,0}},
           color={255,128,0},
           origin={60,-30},
           rotation=90),
         Line(
-          points={{-60,0},{-3.20085e-22,-1.95996e-38}},
+          points={{-60,0},{0,0}},
           color={255,128,0},
           origin={-60,30},
           rotation=90),

diff --git a/...Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_VoltageSource.mo b/...Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_VoltageSource.mo
@@ -162,7 +162,7 @@ equation
   connect(currentController.y, signalVoltage.v) annotation (Line(
       points={{-29,50},{-22,50}}, color={0,0,127}));
   connect(currentSensor.i,currentController. iActual) annotation (Line(
-      points={{-21,1.9984e-015},{-46,1.9984e-015},{-46,38}}, color={0,0,127}));
+      points={{-21,0},{-46,0},{-46,38}}, color={0,0,127}));
   connect(inertiaLoad.flange_a, torqueSensor.flange_b) annotation (Line(
       points={{50,-40},{50,-60}}));
   connect(torqueSensor.flange_a, smpm.flange) annotation (Line(

diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Icons/HollowCylinderCircumferentialFlux.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Icons/HollowCylinderCircumferentialFlux.mo
@@ -35,8 +35,8 @@ partial model HollowCylinderCircumferentialFlux "Icon for cylinder with circumfe
           startAngle=52,
           endAngle=180,
           closure=EllipseClosure.None),
-        Line(points={{40,-40},{2.22045e-16,1.35963e-32}},
-                                        color={255,170,85},
+        Line(points={{40,-40},{0,0}},
+          color={255,170,85},
           origin={36,-32},
           rotation=90),
         Line(points={{76,8},{78,12},{80,20}},  color={255,170,85})}));

diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Icons/HollowCylinderRadialFlux.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Icons/HollowCylinderRadialFlux.mo
@@ -32,12 +32,12 @@ partial model HollowCylinderRadialFlux "Icon for cylinder with radial flux"
           origin={0,30},
           rotation=90),
         Line(
-          points={{-2,-1.22465e-16},{60,0}},
+          points={{-2,0},{60,0}},
           color={255,128,0},
           origin={60,-30},
           rotation=90),
         Line(
-          points={{-60,0},{-3.20085e-22,-1.95996e-38}},
+          points={{-60,0},{0,0}},
           color={255,170,85},
           origin={-60,30},
           rotation=90),