Release V 1.1 (#28)

OpenModelica · May 2, 2021 · e2c4b6c · e2c4b6c
1 parent 517a996
commit e2c4b6c
Show file tree

Hide file tree

Showing 207 changed files with 788 additions and 1,045 deletions.
diff --git a/BioChem/Compartments/Compartment.mo b/BioChem/Compartments/Compartment.mo
@@ -2,12 +2,7 @@ within BioChem.Compartments;
 
 model Compartment "Default compartment (constant volume)"
   extends BioChem.Interfaces.Compartments.Compartment(V(stateSelect=StateSelect.prefer));
+  extends BioChem.Icons.Compartments.Compartment;
 equation
   der(V)=0 "Compartment volume is constant";
-  annotation(Documentation(info="<html>
-<h1>Compartment</h1>
-<p>
-Default compartment model.
-</p>
-</html>", revisions=""), Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Text(fillColor={0,85,0}, fillPattern=FillPattern.Solid, extent={{-100,-170},{100,-120}}, textString="%name", fontName="Arial"),Rectangle(lineColor={0,85,0}, fillColor={199,199,149}, fillPattern=FillPattern.Solid, lineThickness=10, extent={{-110,-110},{110,110}}, radius=20)}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
 end Compartment;
diff --git a/BioChem/Compartments/MainCompartment.mo b/BioChem/Compartments/MainCompartment.mo
@@ -2,6 +2,7 @@ within BioChem.Compartments;
 
 model MainCompartment "Main compartment (constant volume)"
   extends BioChem.Interfaces.Compartments.MainCompartment(V(stateSelect = StateSelect.prefer));
+  extends Icons.Compartments.MainCompartment;
 equation
   der(V) = 0 "Compartment volume is constant";
   annotation(
@@ -11,7 +12,5 @@ equation
 <p>
 Main compartment model.
 </p>
-</html>", revisions = ""),
-    Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(fillColor = {0, 85, 0}, fillPattern = FillPattern.Solid, extent = {{-100, -170}, {100, -120}}, textString = "%name", fontName = "Arial"), Rectangle(lineColor = {0, 85, 0}, fillColor = {199, 199, 149}, fillPattern = FillPattern.Solid, lineThickness = 10, extent = {{-110, -110}, {110, 110}}, radius = 20), Text(fillPattern = FillPattern.Solid, extent = {{-82.12, -80}, {80, 80}}, textString = "main", fontName = "Arial", textStyle = {TextStyle.Bold})}),
-    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
+</html>", revisions = ""));
 end MainCompartment;
diff --git a/BioChem/Compartments/package.mo b/BioChem/Compartments/package.mo
@@ -1,7 +1,7 @@
 within BioChem;
 
 package Compartments "Different types of compartments used in the package"
-  extends Icons.Library;
+  extends Icons.Compartments;
 
   annotation(
     Documentation(info = "<html>

diff --git a/BioChem/Examples/package.mo b/BioChem/Examples/package.mo
@@ -1,7 +1,7 @@
 within BioChem;
 
 package Examples "Some examples of BioChem models"
-  extends Icons.Library;
+  extends Modelica.Icons.ExamplesPackage;
 
   model InsulinSignaling_Sedaghat "Metabolic insulin signaling pathway in rat adipocytes"
     extends BioChem.Compartments.Compartment;

diff --git a/BioChem/Icons/Base.mo b/BioChem/Icons/Base.mo
@@ -0,0 +1,9 @@
+within BioChem.Icons;
+
+partial class Base
+  annotation(Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})), 
+    Documentation(info = "<html><head></head><body><font size=\"5\">A base icon relevant for many components carrying the same annotations. Older annotations had the following attribute:</font><div><br></div><div>
+<pre style=\"margin-top: 0px; margin-bottom: 0px;\"><!--StartFragment--><span style=\" font-family:'Courier New'; font-size:12pt; color:#0000ff;\">Diagram</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">(</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#0000ff;\">coordinateSystem</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">(extent={{-</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">,-</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">},{</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">,</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">}}, preserveAspectRatio=</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b0000;\">true</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">, grid={</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">10</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">,</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">10</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">}))</span><!--EndFragment--></pre><pre style=\"margin-top: 0px; margin-bottom: 0px;\"><span style=\"font-family: 'Courier New'; font-size: 12pt;\"><br></span></pre><p><span style=\"font-size: 12pt;\"><font face=\"Arial\">Since this produces empty diagram, it is not clear why is it there. So it is there for now.&nbsp;</font></span></p><p><span style=\"font-size: 12pt;\"><font face=\"Arial\">This Icon will also replace Icons.IconBase, which does not seem to be used throughout the library.&nbsp;</font></span></p><pre style=\"margin-top: 0px; margin-bottom: 0px;\"><br></pre></div></body></html>"));
+
+
+end Base;
diff --git a/BioChem/Icons/Compartments/Compartment.mo b/BioChem/Icons/Compartments/Compartment.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Compartments;
+
+partial class Compartment "Default compartment (constant volume)"
+  extends BioChem.Icons.Base; 
+  annotation(
+    Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(fillColor = {0, 85, 0}, fillPattern = FillPattern.Solid, extent = {{-100, -170}, {100, -120}}, textString = "%name", fontName = "Arial"), Rectangle(lineColor = {0, 85, 0}, fillColor = {199, 199, 149}, fillPattern = FillPattern.Solid, lineThickness = 10, extent = {{-110, -110}, {110, 110}}, radius = 20)}));
+end Compartment;
diff --git a/BioChem/Icons/Compartments/MainCompartment.mo b/BioChem/Icons/Compartments/MainCompartment.mo
@@ -0,0 +1,14 @@
+within BioChem.Icons.Compartments;
+
+partial class MainCompartment "Main compartment (constant volume)"
+  extends BioChem.Icons.Base;
+  annotation(
+    Documentation(info = "<html>
+<h1>MainCompartment</h1>
+
+<p>
+Main compartment model.
+</p>
+</html>", revisions = ""),
+    Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(fillColor = {0, 85, 0}, fillPattern = FillPattern.Solid, extent = {{-100, -170}, {100, -120}}, textString = "%name", fontName = "Arial"), Rectangle(lineColor = {0, 85, 0}, fillColor = {199, 199, 149}, fillPattern = FillPattern.Solid, lineThickness = 10, extent = {{-110, -110}, {110, 110}}, radius = 20), Text(fillPattern = FillPattern.Solid, extent = {{-82.12, -80}, {80, 80}}, textString = "main", fontName = "Arial", textStyle = {TextStyle.Bold})}));
+end MainCompartment;
diff --git a/BioChem/Icons/Compartments/package.mo b/BioChem/Icons/Compartments/package.mo
@@ -0,0 +1,15 @@
+within BioChem.Icons;
+
+package Compartments "Different types of compartments used in the package"
+  extends BioChem.Icons.Library;
+
+  annotation(
+    Documentation(info = "<html>
+<h1>Compartments</h1>
+
+<a name=\"fig1\"></a>
+<img src=\"modelica://BioChem/Resources/Images/Compartment.png\" alt=\"Fig1: Compartments\">
+ </html>", revisions = ""),
+    Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Rectangle(origin = {5, -7.55952}, lineColor = {0, 85, 0}, fillColor = {199, 199, 149}, fillPattern = FillPattern.Solid, lineThickness = 10, extent = {{-70, -70}, {40, 30}}, radius = 20)}),
+    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
+end Compartments;
diff --git a/BioChem/Icons/Compartments/package.order b/BioChem/Icons/Compartments/package.order
@@ -0,0 +1,2 @@
+Compartment
+MainCompartment
diff --git a/BioChem/Icons/Example.mo b/BioChem/Icons/Example.mo
@@ -3,5 +3,6 @@ within BioChem.Icons;
 partial package Example "Icon for an example model"
   annotation(
     Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Rectangle(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-100, -100}, {80, 50}}), Polygon(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, points = {{-100, 50}, {-80, 70}, {100, 70}, {80, 50}, {-100, 50}}), Polygon(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, points = {{100, 70}, {100, -80}, {80, -100}, {80, 50}, {100, 70}}), Text(fillColor = {0, 0, 255}, fillPattern = FillPattern.Solid, extent = {{-85, -85}, {65, 35}}, textString = "Example", fontName = "Arial"), Text(fillColor = {255, 0, 0}, extent = {{-120, 73}, {120, 132}}, textString = "%name", fontName = "Arial")}),
-    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
+    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})),
+  Documentation(info = "<html><head></head><body><font size=\"5\">The implementation of this Icon looks nicer than the implementation of Modelica.Icoms.Example</font></body></html>"));
 end Example;
diff --git a/BioChem/Icons/IconBase.mo b/BioChem/Icons/IconBase.mo
@@ -1,7 +1,9 @@
 within BioChem.Icons;
 
-model IconBase
+partial class IconBase
+  extends Modelica.Icons.ObsoleteModel;
   annotation(
     Diagram(coordinateSystem(extent = {{-100.0, -100.0}, {100.0, 100.0}}, preserveAspectRatio = true, grid = {10, 10})),
-    Icon(coordinateSystem(extent = {{-100.0, -100.0}, {100.0, 100.0}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(origin = {0.0, -127.1933}, fillPattern = FillPattern.Solid, extent = {{-100.0, -27.1933}, {100.0, 27.1933}}, textString = "%name", fontName = "Arial")}));
+    Icon(coordinateSystem(extent = {{-100.0, -100.0}, {100.0, 100.0}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(origin = {0.0, -127.1933}, fillPattern = FillPattern.Solid, extent = {{-100.0, -27.1933}, {100.0, 27.1933}}, textString = "%name", fontName = "Arial")}),
+  Documentation(info = "<html><head></head><body><font size=\"5\">This Icon does not seem to be used throughout the library and is going to be replace by Icons.Base in future versions. The Diagram annotation does not seem to play any rule as it produces only an empty diagram.</font></body></html>"));
 end IconBase;
diff --git a/BioChem/Icons/Interfaces/Compartments/Compartment.mo b/BioChem/Icons/Interfaces/Compartments/Compartment.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Compartments;
+
+partial class Compartment
+  extends BioChem.Icons.Base;
+  annotation(
+    Icon(graphics = {Text(fillColor = {0, 85, 0}, fillPattern = FillPattern.Solid, extent = {{-100, -170}, {100, -120}}, textString = "%name", fontName = "Arial"), Rectangle(lineColor = {0, 0, 127}, fillColor = {0, 170, 255}, fillPattern = FillPattern.Solid, lineThickness = 10, extent = {{-110, -110}, {110, 110}}, radius = 20)}));
+end Compartment;
diff --git a/BioChem/Icons/Interfaces/Compartments/MainCompartment.mo b/BioChem/Icons/Interfaces/Compartments/MainCompartment.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Compartments;
+
+partial class MainCompartment
+  extends BioChem.Icons.Interfaces.Compartments.Compartment;
+  annotation(
+    Icon(graphics = {Text(fillColor = {0, 85, 0}, fillPattern = FillPattern.Solid, extent = {{-100, -170}, {100, -120}}, textString = "%name", fontName = "Arial"), Text(fillPattern = FillPattern.Solid, extent = {{-82.12, -80}, {80, 80}}, textString = "main", fontName = "Arial", textStyle = {TextStyle.Bold})}));
+end MainCompartment;
diff --git a/BioChem/Icons/Interfaces/Compartments/package.mo b/BioChem/Icons/Interfaces/Compartments/package.mo
@@ -0,0 +1,6 @@
+within BioChem.Icons.Interfaces;
+
+package Compartments "Properties for compartments"
+  extends BioChem.Icons.Library;
+
+end Compartments;
diff --git a/BioChem/Icons/Interfaces/Compartments/package.order b/BioChem/Icons/Interfaces/Compartments/package.order
@@ -0,0 +1,2 @@
+Compartment
+MainCompartment
diff --git a/BioChem/Icons/Interfaces/Nodes/ActivatorConnector.mo b/BioChem/Icons/Interfaces/Nodes/ActivatorConnector.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces.Nodes;
+
+partial class ActivatorConnector "Icon for a connector between activators and reactions"
+  annotation(Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(lineColor={0,85,0}, fillColor={255,255,255}, extent={{-20,-20},{20,20}}),Line(points={{-20,20},{20,-20}}, color={0,85,0}),Line(points={{-20,-20},{20,20}}, color={0,85,0})}), Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=true, grid={10,10}), graphics={Ellipse(fillColor={0,128,0}, fillPattern=FillPattern.Solid, extent={{-100,-100},{100,100}}),Polygon(fillColor={255,255,255}, pattern=LinePattern.None, fillPattern=FillPattern.Solid, points={{-10,80},{-10,10},{-80,10},{-80,-10},{-10,-10},{-10,-80},{10,-80},{10,-10},{80,-10},{80,10},{10,10},{10,80}})}));
+end ActivatorConnector;
diff --git a/BioChem/Icons/Interfaces/Nodes/InhibitorConnector.mo b/BioChem/Icons/Interfaces/Nodes/InhibitorConnector.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces.Nodes;
+
+partial class InhibitorConnector "Icon for a connector between inhibitors and reactions"
+  annotation(Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(lineColor={0,85,0}, fillColor={255,255,255}, extent={{-20,-20},{20,20}}),Line(points={{-20,20},{20,-20}}, color={0,85,0}),Line(points={{-20,-20},{20,20}}, color={0,85,0})}), Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=true, grid={10,10}), graphics={Ellipse(fillColor={170,0,0}, fillPattern=FillPattern.Solid, extent={{-100,-100},{100,100}}),Polygon(fillColor={255,255,255}, pattern=LinePattern.None, fillPattern=FillPattern.Solid, points={{-80,10},{-80,-10},{80,-10},{80,10}})}));
+end InhibitorConnector;
diff --git a/BioChem/Icons/Interfaces/Nodes/ModifierConnector.mo b/BioChem/Icons/Interfaces/Nodes/ModifierConnector.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces.Nodes;
+
+partial class ModifierConnector "Icon for a connector between general modifieres and reactions"
+  annotation(Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(lineColor={0,85,0}, fillColor={255,255,255}, extent={{-20,-20},{20,20}}),Line(points={{-20,20},{20,-20}}, color={0,85,0}),Line(points={{-20,-20},{20,20}}, color={0,85,0})}), Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=true, grid={10,10}), graphics={Ellipse(fillColor={255,255,0}, fillPattern=FillPattern.Solid, extent={{-100,-100},{100,100}})}));
+end ModifierConnector;
diff --git a/BioChem/Icons/Interfaces/Nodes/ProductConnector.mo b/BioChem/Icons/Interfaces/Nodes/ProductConnector.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces.Nodes;
+
+partial class ProductConnector "Icon for a connector between substances and reactions (product side of reaction)"
+  annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Ellipse(lineColor={0,85,127}, fillColor={255,255,255}, fillPattern=FillPattern.Solid, extent={{-100,-100},{100,100}})}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(lineColor={0,85,0}, fillColor={255,255,255}, extent={{-20,-20},{20,20}}),Line(points={{-20,20},{20,-20}}, color={0,85,0}),Line(points={{-20,-20},{20,20}}, color={0,85,0})}));
+end ProductConnector;
diff --git a/BioChem/Icons/Interfaces/Nodes/SubstanceConnector.mo b/BioChem/Icons/Interfaces/Nodes/SubstanceConnector.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces.Nodes;
+
+partial class SubstanceConnector "Icon for a connector between substances and reactions"
+  annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Ellipse(lineColor={0,85,0}, fillColor={0,85,127}, extent={{-100,-100},{100,100}})}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(lineColor={0,85,0}, fillColor={255,255,255}, extent={{-20,-20},{20,20}}),Line(points={{-20,20},{20,-20}}, color={0,85,0}),Line(points={{-20,-20},{20,20}}, color={0,85,0})}));
+end SubstanceConnector;
diff --git a/BioChem/Icons/Interfaces/Nodes/SubstrateConnector.mo b/BioChem/Icons/Interfaces/Nodes/SubstrateConnector.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces.Nodes;
+
+partial class SubstrateConnector "Icon for a connector between substances and reactions (substrate side of reaction)"
+  annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Ellipse(lineColor={0,85,127}, fillColor={0,85,127}, fillPattern=FillPattern.Solid, extent={{-100,-100},{100,100}})}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(lineColor={0,85,0}, fillColor={255,255,255}, extent={{-20,-20},{20,20}}),Line(points={{-20,20},{20,-20}}, color={0,85,0}),Line(points={{-20,-20},{20,20}}, color={0,85,0})}));
+end SubstrateConnector;
diff --git a/BioChem/Icons/Interfaces/Nodes/package.mo b/BioChem/Icons/Interfaces/Nodes/package.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Interfaces;
+package Nodes "Connector interfaces used in the package"
+  extends BioChem.Icons.Library;
+
+end Nodes;
diff --git a/BioChem/Icons/Interfaces/Nodes/package.order b/BioChem/Icons/Interfaces/Nodes/package.order
@@ -0,0 +1,6 @@
+ActivatorConnector
+InhibitorConnector
+ModifierConnector
+ProductConnector
+SubstanceConnector
+SubstrateConnector
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/FastEquilibrium.mo b/BioChem/Icons/Interfaces/Reactions/Basics/FastEquilibrium.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class FastEquilibrium "Basics for a reaction edge"
+  extends BioChem.Icons.Base;
+  annotation(
+    Icon(graphics = {Line(points = {{-50.0, 0.0}, {50.0, 0.0}}, color = {0, 0, 255}, pattern = LinePattern.DashDotDot, thickness = 2), Text(origin = {-0.0, 0.0}, fillColor = {77, 77, 77}, fillPattern = FillPattern.Solid, extent = {{-100.0, -150.0}, {97.9, -100.0}}, textString = "%name", fontName = "Arial")}));
+end FastEquilibrium;
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/FourProducts.mo b/BioChem/Icons/Interfaces/Reactions/Basics/FourProducts.mo
@@ -0,0 +1,6 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class FourProducts
+  annotation(
+    Icon(graphics = {Line(points = {{50, 0}, {62.5, 87.5}, {100, 87.5}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 35, smooth = Smooth.Bezier), Line(points = {{50, 0}, {62.5, -87.5}, {100, -87.5}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 35, smooth = Smooth.Bezier), Line(points = {{50, 0}, {62.5, 37.5}, {100, 37.5}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 35, smooth = Smooth.Bezier), Line(points = {{50, 0}, {62.5, -37.5}, {100, -37.5}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 35, smooth = Smooth.Bezier)}));
+end FourProducts;
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/FourSubstrates.mo b/BioChem/Icons/Interfaces/Reactions/Basics/FourSubstrates.mo
@@ -0,0 +1,6 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class FourSubstrates
+  extends BioChem.Icons.Base;
+  annotation(Icon(graphics={Line(points={{-100,87.5},{-62.5,87.5},{-50,0}}, color={170,0,0}, smooth=Smooth.Bezier),Line(points={{-100,-87.5},{-62.5,-87.5},{-50,0}}, color={170,0,0}, smooth=Smooth.Bezier),Line(points={{-100,-37.5},{-62.5,-37.5},{-50,0}}, color={170,0,0}, smooth=Smooth.Bezier),Line(points={{-100,37.5},{-62.5,37.5},{-50,0}}, color={170,0,0}, smooth=Smooth.Bezier)}));
+end FourSubstrates;
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/FourSubstratesReversible.mo b/BioChem/Icons/Interfaces/Reactions/Basics/FourSubstratesReversible.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class FourSubstratesReversible
+   extends BioChem.Icons.Base;
+   annotation(
+    Icon(graphics = {Line(points = {{-100, 87.5}, {-62.5, 87.5}, {-50, 0}}, color = {170, 0, 0}, arrow = {Arrow.Open, Arrow.None}, arrowSize = 35, smooth = Smooth.Bezier), Line(points = {{-100, -87.5}, {-62.5, -87.5}, {-50, 0}}, color = {170, 0, 0}, arrow = {Arrow.Open, Arrow.None}, arrowSize = 35, smooth = Smooth.Bezier), Line(points = {{-100, -37.5}, {-62.5, -37.5}, {-50, 0}}, color = {170, 0, 0}, arrow = {Arrow.Open, Arrow.None}, arrowSize = 35, smooth = Smooth.Bezier), Line(points = {{-100, 37.5}, {-62.5, 37.5}, {-50, 0}}, color = {170, 0, 0}, arrow = {Arrow.Open, Arrow.None}, arrowSize = 35, smooth = Smooth.Bezier)}));
+end FourSubstratesReversible;
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/MultipleProducts.mo b/BioChem/Icons/Interfaces/Reactions/Basics/MultipleProducts.mo
@@ -0,0 +1,8 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class MultipleProducts "SubstanceConnector for arbitrary number of products"
+  extends BioChem.Icons.Base;
+  annotation(
+   Icon(graphics = {Line(points = {{48.33, 0.0}, {98.33, 0.0}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 50), Ellipse(origin = {112.5, -0.0}, lineColor = {170, 0, 0}, fillColor = {170, 0, 0}, extent = {{-20.0, -20.0}, {20.0, 20.0}})}));
+end MultipleProducts;
+
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/MultipleSubstrates.mo b/BioChem/Icons/Interfaces/Reactions/Basics/MultipleSubstrates.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class MultipleSubstrates "SubstanceConnector for arbitrary number of substrates"
+  extends BioChem.Icons.Base;
+  annotation(
+    Icon(graphics = {Line(points = {{-100, 0}, {-50, 0}}, color = {170, 0, 0}), Ellipse(lineColor = {170, 0, 0}, fillColor = {170, 0, 0}, extent = {{-131.2, -18.75}, {-93.75, 18.75}})}));
+end MultipleSubstrates;
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/MultipleSubstratesReversible.mo b/BioChem/Icons/Interfaces/Reactions/Basics/MultipleSubstratesReversible.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class MultipleSubstratesReversible "SubstanceConnector for arbitrary number of substrates"
+   extends BioChem.Icons.Base;
+   annotation(
+    Icon(graphics = {Line(points = {{-50.0, 0.0}, {-100.0, 0.0}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 50), Ellipse(origin = {-112.5, 0.0}, fillColor = {255, 255, 255}, extent = {{-20.0, -20.0}, {20.0, 20.0}})}));
+end MultipleSubstratesReversible;
diff --git a/BioChem/Icons/Interfaces/Reactions/Basics/OneProduct.mo b/BioChem/Icons/Interfaces/Reactions/Basics/OneProduct.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Interfaces.Reactions.Basics;
+
+partial class OneProduct "SubstanceConnector for one product"
+  extends BioChem.Icons.Base;
+  annotation(
+    Icon(graphics = {Line(points = {{50, 0}, {100, 0}}, color = {170, 0, 0}, arrow = {Arrow.None, Arrow.Open}, arrowSize = 50)}));
+end OneProduct;