Merge branch 'wip/induction-motor' of https://github.com/Thales1330/PSP into wip/induction-motor

1 files changed, 27 insertions, 14 deletions

diff --git a/docs/doxygen/html/class_machines-members.html b/docs/doxygen/html/class_machines-members.html
index 3aa8a47..888c8f4 100644
--- a/docs/doxygen/html/class_machines-members.html
+++ b/docs/doxygen/html/class_machines-members.html
@@ -7,7 +7,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.13"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>Member List</title>
+<title>Power System Platform: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -29,6 +29,11 @@
  <tbody>
  <tr style="height: 56px;">
   <td id="projectlogo"><img alt="Logo" src="logoHeader.png"/></td>
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">Power System Platform
+   &#160;<span id="projectnumber">2018w15a</span>
+   </div>
+  </td>
  </tr>
  </tbody>
 </table>
@@ -158,19 +163,27 @@ $(function() {
   <tr><td class="entry"><a class="el" href="class_machines.html#aeab8436c33f74a10e252b418028ec491">MoveNode</a>(Element *element, wxPoint2DDouble position)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_element.html#a6f071b6dfd64721ca673bfbe1ca2d525">MovePickbox</a>(wxPoint2DDouble position)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_machines.html#a63597b82a1db17a9e4aac9f1058d7dff">NodeContains</a>(wxPoint2DDouble position)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_element.html#af4815de7e7698ea116e8e2af51414050">PickboxContains</a>(wxPoint2DDouble position)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="class_element.html#a158e271d7f309cd49002ca3c98365e9b">PointToLineDistance</a>(wxPoint2DDouble point, int *segmentNumber=NULL) const</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_power_element.html#a382cdc0897802eb0a89692483fa7043e">PowerElement</a>()</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="class_element.html#a6be881ba60674b289a91e498d3d8fc09">RemoveChild</a>(Element *child)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_machines.html#a002d852ddd0d73502a6bd819b5545026">RemoveParent</a>(Element *parent)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="class_element.html#ad5f4bee2e241c430a643f46dadf3d3f5">ReplaceChild</a>(Element *oldChild, Element *newChild)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a74ec9a279ac0127550e00941206dddb1">ReplaceParent</a>(Element *oldParent, Element *newParent)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="class_element.html#a8c16c17a6f22ffcdeb80ffa0ed27a72a">ResetNodes</a>()</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a3be3ed2876d3bb547c43caab95353f33">ResetPickboxes</a>()</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="class_machines.html#acff264f0c80d97a966ff97401f2f142a">Rotate</a>(bool clockwise=true)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a99b213010776b34a27eb814aff288a34">RotateAtPosition</a>(wxPoint2DDouble pointToRotate, double angle, bool degrees=true) const</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="class_element.html#a01563b5b2fed2860132f4dd1593f9eea">RotatedRectanglesIntersects</a>(wxRect2DDouble rect1, wxRect2DDouble rect2, double angle1, double angle2) const</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_machines.html#a914faa054440402cad74c3b70f62ad92">RotateNode</a>(Element *parent, bool clockwise=true)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>OpenCADProperties</b>(rapidxml::xml_node&lt;&gt; *elementNode, std::vector&lt; Element *&gt; parentList) (defined in <a class="el" href="class_power_element.html">PowerElement</a>)</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OpenCADProperties</b>(rapidxml::xml_node&lt;&gt; *elementNode) (defined in <a class="el" href="class_element.html">Element</a>)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>OpenElement</b>(rapidxml::xml_node&lt;&gt; *elementNode, std::vector&lt; Element *&gt; parentList) (defined in <a class="el" href="class_power_element.html">PowerElement</a>)</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OpenElement</b>(rapidxml::xml_node&lt;&gt; *elementNode) (defined in <a class="el" href="class_element.html">Element</a>)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>OpenSwitchingData</b>(rapidxml::xml_node&lt;&gt; *electricalNode) (defined in <a class="el" href="class_power_element.html">PowerElement</a>)</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_element.html#af4815de7e7698ea116e8e2af51414050">PickboxContains</a>(wxPoint2DDouble position)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a158e271d7f309cd49002ca3c98365e9b">PointToLineDistance</a>(wxPoint2DDouble point, int *segmentNumber=NULL) const</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_power_element.html#a382cdc0897802eb0a89692483fa7043e">PowerElement</a>()</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a6be881ba60674b289a91e498d3d8fc09">RemoveChild</a>(Element *child)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_machines.html#a002d852ddd0d73502a6bd819b5545026">RemoveParent</a>(Element *parent)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_element.html#ad5f4bee2e241c430a643f46dadf3d3f5">ReplaceChild</a>(Element *oldChild, Element *newChild)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_element.html#a74ec9a279ac0127550e00941206dddb1">ReplaceParent</a>(Element *oldParent, Element *newParent)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a8c16c17a6f22ffcdeb80ffa0ed27a72a">ResetNodes</a>()</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_element.html#a3be3ed2876d3bb547c43caab95353f33">ResetPickboxes</a>()</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_machines.html#acff264f0c80d97a966ff97401f2f142a">Rotate</a>(bool clockwise=true)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_element.html#a99b213010776b34a27eb814aff288a34">RotateAtPosition</a>(wxPoint2DDouble pointToRotate, double angle, bool degrees=true) const</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_element.html#a01563b5b2fed2860132f4dd1593f9eea">RotatedRectanglesIntersects</a>(wxRect2DDouble rect1, wxRect2DDouble rect2, double angle1, double angle2) const</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_machines.html#a914faa054440402cad74c3b70f62ad92">RotateNode</a>(Element *parent, bool clockwise=true)</td><td class="entry"><a class="el" href="class_machines.html">Machines</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SaveCADProperties</b>(rapidxml::xml_document&lt;&gt; &amp;doc, rapidxml::xml_node&lt;&gt; *elementNode) (defined in <a class="el" href="class_power_element.html">PowerElement</a>)</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>SaveElement</b>(rapidxml::xml_document&lt;&gt; &amp;doc, rapidxml::xml_node&lt;&gt; *elementListNode) (defined in <a class="el" href="class_element.html">Element</a>)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SaveSwitchingData</b>(rapidxml::xml_document&lt;&gt; &amp;doc, rapidxml::xml_node&lt;&gt; *electricalNode) (defined in <a class="el" href="class_power_element.html">PowerElement</a>)</td><td class="entry"><a class="el" href="class_power_element.html">PowerElement</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_element.html#aa5d8558082ce38832af3b8c8ac1cf36f">SetAngle</a>(double angle)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_element.html#afed922f1c0803ebdc96e785a7f696504">SetBorderSize</a>(double borderSize)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_element.html#add5da19e56211c76bea78638eca87150">SetDragging</a>(bool dragging=true)</td><td class="entry"><a class="el" href="class_element.html">Element</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>