Skip to content

Commit 2f7d5d3

Browse files
beutlichbeutlich
committed
Improve icon and diagram of ComplexMath.Add/Add3 blocks
1 parent 17068b5 commit 2f7d5d3

File tree

1 file changed

+26
-76
lines changed

1 file changed

+26
-76
lines changed

‎Modelica/ComplexBlocks.mo‎

Lines changed: 26 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -638,57 +638,28 @@ result in the following equation:
638638
639639
</html>"),
640640
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
641-
100,100}}), graphics={Text(
642-
extent={{-98,-52},{7,-92}},
643-
textString="%k2"),Text(
644-
extent={{-100,90},{5,50}},
645-
textString="%k1"), Line(points={{-100,60},{-40,60},{-30,40}},
646-
color={0,0,255}),Ellipse(extent={{-50,50},{50,-50}}, lineColor={0,
647-
0,255}),Line(points={{-100,-60},{-40,-60},{-30,-40}}, color={0,0,255}),
648-
Line(points={{-15,-25.99},{15,25.99}}),
649-
Rectangle(
650-
extent={{-100,-100},{100,100}},
651-
lineColor={0,0,127},
652-
fillColor={255,255,255},
653-
fillPattern=FillPattern.Solid),Line(points={{50,0},{100,0}},
654-
color={0,0,255}),Line(points={{-100,60},{-74,24},{-44,24}}, color=
655-
{0,0,127}),Line(points={{-100,-60},{-74,-24},{-44,-24}}, color={
656-
0,0,127}),Ellipse(extent={{-50,50},{50,-50}}, lineColor={0,0,127}),
657-
Line(points={{50,0},{100,0}}, color={0,0,127}),Text(
658-
extent={{-40,40},{40,-40}},
659-
textString="+"),Text(
660-
extent={{-100,52},{5,92}},
661-
textString="%k1"),Text(
662-
extent={{-100,-52},{5,-92}},
663-
textString="%k2")}),
641+
100,100}}), graphics={Text(extent={{-98,-52},{5,-92}},
642+
textString="%k2"), Text(extent={{-98,92},{5,52}}, textString="%k1"),
643+
Line(points={{50,0},{100,0}},color={0,0,255}),
644+
Line(points={{-100,60},{-74,24},{-44,24}},color={0,0,127}),
645+
Line(points={{-100,-60},{-74,-24},{-44,-24}},color={0,0,127}),
646+
Ellipse(extent={{-50,50},{50,-50}}, lineColor={0,0,127}),
647+
Line(points={{50,0},{100,0}}, color={0,0,127}),
648+
Text(extent={{-40,40},{40,-40}},textString="+")}),
664649
Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
665650
{100,100}}), graphics={Rectangle(
666651
extent={{-100,-100},{100,100}},
667652
lineColor={0,0,255},
668653
fillColor={255,255,255},
669-
fillPattern=FillPattern.Solid),Text(
670-
extent={{-98,-52},{7,-92}},
671-
textString="%k2"),Text(
672-
extent={{-100,90},{5,50}},
673-
textString="%k1"),Line(points={{-100,60},{-40,60},{-30,40}},
674-
color={0,0,255}),Ellipse(extent={{-50,50},{50,-50}}, lineColor={0,
675-
0,255}),Line(points={{-100,-60},{-40,-60},{-30,-40}}, color={0,0,255}),
676-
Line(points={{-15,-25.99},{15,25.99}}),
677-
Rectangle(
678-
extent={{-100,-100},{100,100}},
679-
lineColor={0,0,127},
680-
fillColor={255,255,255},
681-
fillPattern=FillPattern.Solid),Line(points={{50,0},{100,0}},
682-
color={0,0,255}),Line(points={{-100,60},{-74,24},{-44,24}}, color=
683-
{0,0,127}),Line(points={{-100,-60},{-74,-24},{-44,-24}}, color={
684-
0,0,127}),Ellipse(extent={{-50,50},{50,-50}}, lineColor={0,0,127}),
685-
Line(points={{50,0},{100,0}}, color={0,0,127}),Text(
686-
extent={{-40,40},{40,-40}},
687-
textString="+"),Text(
688-
extent={{-100,52},{5,92}},
689-
textString="k1"),Text(
690-
extent={{-100,-52},{5,-92}},
691-
textString="k2")}));
654+
fillPattern=FillPattern.Solid),
655+
Ellipse(extent={{-50,50},{50,-50}}, lineColor={0,0,255}),
656+
Line(points={{50,0},{100,0}},color={0,0,255}),
657+
Line(points={{-100,60},{-74,24},{-44,24}},color={0,0,255}),
658+
Line(points={{-100,-60},{-74,-24},{-44,-24}}, color={0,0,255}),
659+
Line(points={{50,0},{100,0}},color={0,0,255}),
660+
Text(extent={{-40,40},{40,-40}},textString="+"),
661+
Text(extent={{-100,52},{5,92}}, textString="k1"),
662+
Text(extent={{-100,-52},{5,-92}}, textString="k2")}));
692663
end Add;
693664

694665
block Add3 "Output the sum of the three inputs"
@@ -750,41 +721,20 @@ three input signals <code>u1</code>, <code>u2</code> and <code>u3</code>. Option
750721
751722
</html>"),
752723
Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
753-
100,100}}), graphics={Text(
754-
extent={{-100,50},{5,90}},
755-
textString="%k1"),Text(
756-
extent={{-100,-20},{5,20}},
757-
textString="%k2"),Text(
758-
extent={{-100,-50},{5,-90}},
759-
textString="%k3"),Text(
760-
extent={{10,40},{90,-40}},
761-
textString="+")}),
724+
100,100}}), graphics={Text(extent={{-98,50},{5,90}}, textString="%k1"),
725+
Text(extent={{-98,-20},{5,20}}, textString="%k2"),
726+
Text(extent={{-98,-50},{5,-90}}, textString="%k3"),
727+
Text(extent={{10,40},{90,-40}}, textString="+")}),
762728
Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
763729
{100,100}}), graphics={Rectangle(
764730
extent={{-100,-100},{100,100}},
765731
lineColor={0,0,255},
766732
fillColor={255,255,255},
767-
fillPattern=FillPattern.Solid),Text(
768-
extent={{-100,50},{5,90}},
769-
textString="%k1"),Text(
770-
extent={{-100,-20},{5,20}},
771-
textString="%k2"),Text(
772-
extent={{-100,-50},{5,-90}},
773-
textString="%k3"),Text(
774-
extent={{2,36},{100,-44}},
775-
textString="+"),Rectangle(
776-
extent={{-100,-100},{100,100}},
777-
lineColor={0,0,255},
778-
fillColor={255,255,255},
779-
fillPattern=FillPattern.Solid),Text(
780-
extent={{-100,50},{5,90}},
781-
textString="k1"),Text(
782-
extent={{-100,-20},{5,20}},
783-
textString="k2"),Text(
784-
extent={{-100,-50},{5,-90}},
785-
textString="k3"),Text(
786-
extent={{10,40},{90,-40}},
787-
textString="+")}));
733+
fillPattern=FillPattern.Solid),
734+
Text(extent={{10,40},{90,-40}}, textString="+"),
735+
Text(extent={{-100,50},{5,90}}, textString="k1"),
736+
Text(extent={{-100,-20},{5,20}}, textString="k2"),
737+
Text(extent={{-100,-50},{5,-90}}, textString="k3")}));
788738
end Add3;
789739

790740
block Product "Output product of the two inputs"

0 commit comments

Comments
 (0)