Changeset 784

Timestamp:

Jul 3, 2009, 6:29:17 PM (14 years ago)

Author:

gerson bicca

Message:

updates

Location:

branches/gui/eml

Files:

• controllers/icon/PID.png (modified) (previous)
• controllers/icon/PID.svg (modified) (7 diffs)
• controllers/icon/PIDincr.png (modified) (previous)
• controllers/icon/PIDincr.svg (modified) (6 diffs)
• stage_separators/condenser.mso (modified) (8 diffs)
• stage_separators/reboiler.mso (modified) (2 diffs)

branches/gui/eml/controllers/icon/PID.svg

@@ -7 +7 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -13 +12 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
-   width="126.15476"
-   height="135.43953"
+   width="103.3155"
+   height="99.861305"
    sodipodi:docbase="C:\Documents and Settings\Administrador\Meus documentos\Bolsa Simulação\Controle"
    sodipodi:docname="PID.svg"
@@ -34 +33 @@
   </metadata>
   <defs
-     id="defs2043">
-    <marker
-       inkscape:stockid="EmptyTriangleInL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInL"
-       style="overflow:visible">
-      <path
-         id="path3355"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleOutM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleOutM"
-       style="overflow:visible">
-      <path
-         id="path3367"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,-1.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="DotM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DotM"
-       style="overflow:visible">
-      <path
-         id="path3268"
-         d="M -2.5,-1 C -2.5,1.76 -4.74,4 -7.5,4 C -10.26,4 -12.5,1.76 -12.5,-1 C -12.5,-3.76 -10.26,-6 -7.5,-6 C -4.74,-6 -2.5,-3.76 -2.5,-1 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
-         transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleInM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInM"
-       style="overflow:visible">
-      <path
-         id="path3358"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,1.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyDiamondM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyDiamondM"
-       style="overflow:visible">
-      <path
-         id="path3313"
-         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="scale(0.4,0.4)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleOutL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path3364"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,-4.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible">
-      <path
-         id="path3183"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.2,0,0,0.2,1.2,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mstart"
-       style="overflow:visible">
-      <path
-         id="path3195"
-         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
-         transform="scale(0.6,0.6)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend"
-       style="overflow:visible">
-      <path
-         id="path3180"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3174"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective23" />
-    <linearGradient
-       id="linearGradient6760">
-      <stop
-         id="stop12971"
-         offset="0"
-         style="stop-color:#3447ff;stop-opacity:1;" />
-      <stop
-         style="stop-color:white;stop-opacity:0.94117647;"
-         offset="0.51282054"
-         id="stop22168" />
-      <stop
-         id="stop6764"
-         offset="1"
-         style="stop-color:#341dff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient39204"
-       gradientUnits="userSpaceOnUse"
-       x1="372.57718"
-       y1="509.53915"
-       x2="370.8418"
-       y2="591.71429"
-       gradientTransform="translate(-52.61819,-80.81515)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient8318"
-       x1="225.50159"
-       y1="485.76477"
-       x2="352.06509"
-       y2="485.76477"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8111714,0,0,1.0021919,-177.38476,-402.83757)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient3198"
-       x1="-48.116642"
-       y1="61.621449"
-       x2="56.998859"
-       y2="61.621449"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient2433"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8111714,0,0,1.0021919,-164.71933,-418.54774)"
-       x1="225.50159"
-       y1="485.76477"
-       x2="352.06509"
-       y2="485.76477" />
-  </defs>
+     id="defs2043" />
   <sodipodi:namedview
      inkscape:window-height="900"
@@ -242 +49 @@
      inkscape:zoom="2.0265209"
      inkscape:cx="128.22867"
-     inkscape:cy="114.33841"
+     inkscape:cy="35.385363"
      inkscape:window-x="0"
      inkscape:window-y="25"
@@ -249 +56 @@
      inkscape:snap-intersection-grid-guide="true"
      showguides="true"
-     showborder="false"
+     showborder="true"
      width="183.71px">
     <inkscape:grid
@@ -257 +64 @@
        enabled="true" />
   </sodipodi:namedview>
-  <rect
-     style="fill:url(#linearGradient2433);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.646;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2047"
-     width="111.34344"
-     height="107.03931"
-     x="13.738375"
-     y="14.762129"
-     inkscape:export-filename="E:\Documentos Pessoais\Gerson\repositorio\branches\gui\eml\controllers\icon\path2396.png"
-     inkscape:export-xdpi="89"
-     inkscape:export-ydpi="89" />
   <path
      sodipodi:type="arc"
-     style="opacity:0.97000001999999996;fill:url(#linearGradient3198);fill-opacity:1;stroke:#000000;stroke-width:1.17;stroke-linecap:round;stroke-linejoin:round;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:0.2925,0.2925;stroke-dashoffset:0;stroke-opacity:1"
+     style="opacity:0.97000001999999996;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.17;stroke-linecap:round;stroke-linejoin:round;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="path2396"
      sodipodi:cx="4.4411087"
@@ -276 +73 @@
      sodipodi:ry="49.345654"
      d="M 55.513859,61.621449 A 51.07275,49.345654 0 1 1 -46.631641,61.621449 A 51.07275,49.345654 0 1 1 55.513859,61.621449 z"
-     transform="translate(64.971817,6.7807902)" />
+     transform="translate(47.216641,-11.690795)" />
   <text
      xml:space="preserve"
      style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans"
-     x="48.893921"
-     y="75.671799"
+     x="29.658375"
+     y="57.200214"
      id="text11790"
      sodipodi:linespacing="125%"><tspan
        sodipodi:role="line"
        id="tspan11792"
-       x="48.893921"
-       y="75.671799"
+       x="29.658375"
+       y="57.200214"
        style="font-size:24px">PID</tspan></text>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39352047;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 70.093247,0.69676024 C 70.181237,19.336618 70.093247,19.336618 70.093247,19.336618 L 70.005247,19.000767"
-     id="path21455" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39400005;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 0.69700003,69.583217 C 19.336858,69.495227 19.336858,69.583217 19.336858,69.583217 L 19.001007,69.671217"
-     id="path2420" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39352047;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 70.681227,116.10291 C 70.769217,134.74277 70.681227,134.74277 70.681227,134.74277 L 70.593227,134.40692"
-     id="path4392" />
 </svg>

branches/gui/eml/controllers/icon/PIDincr.svg

@@ -7 +7 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -13 +12 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
-   width="126.15476"
-   height="135.43953"
+   width="103.3155"
+   height="99.861305"
    sodipodi:docbase="C:\Documents and Settings\Administrador\Meus documentos\Bolsa Simulação\Controle"
-   sodipodi:docname="PIDIncr.svg"
+   sodipodi:docname="PIDincr.svg"
    inkscape:export-filename="/home/bicca/apps/biblioteca/branches/gui/eml/controllers/icon/PIDincr.png"
-   inkscape:export-xdpi="161.7"
-   inkscape:export-ydpi="161.7"
+   inkscape:export-xdpi="92.743233"
+   inkscape:export-ydpi="92.743233"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0">
@@ -34 +33 @@
   </metadata>
   <defs
-     id="defs2043">
-    <marker
-       inkscape:stockid="EmptyTriangleInL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInL"
-       style="overflow:visible">
-      <path
-         id="path3355"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleOutM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleOutM"
-       style="overflow:visible">
-      <path
-         id="path3367"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,-1.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="DotM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DotM"
-       style="overflow:visible">
-      <path
-         id="path3268"
-         d="M -2.5,-1 C -2.5,1.76 -4.74,4 -7.5,4 C -10.26,4 -12.5,1.76 -12.5,-1 C -12.5,-3.76 -10.26,-6 -7.5,-6 C -4.74,-6 -2.5,-3.76 -2.5,-1 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
-         transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleInM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInM"
-       style="overflow:visible">
-      <path
-         id="path3358"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,1.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyDiamondM"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyDiamondM"
-       style="overflow:visible">
-      <path
-         id="path3313"
-         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="scale(0.4,0.4)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleOutL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path3364"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,-4.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible">
-      <path
-         id="path3183"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.2,0,0,0.2,1.2,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mstart"
-       style="overflow:visible">
-      <path
-         id="path3195"
-         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
-         transform="scale(0.6,0.6)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend"
-       style="overflow:visible">
-      <path
-         id="path3180"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3174"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective23" />
-    <linearGradient
-       id="linearGradient6760">
-      <stop
-         id="stop12971"
-         offset="0"
-         style="stop-color:#3447ff;stop-opacity:1;" />
-      <stop
-         style="stop-color:white;stop-opacity:0.94117647;"
-         offset="0.51282054"
-         id="stop22168" />
-      <stop
-         id="stop6764"
-         offset="1"
-         style="stop-color:#341dff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient39204"
-       gradientUnits="userSpaceOnUse"
-       x1="372.57718"
-       y1="509.53915"
-       x2="370.8418"
-       y2="591.71429"
-       gradientTransform="translate(-52.61819,-80.81515)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient8318"
-       x1="225.50159"
-       y1="485.76477"
-       x2="352.06509"
-       y2="485.76477"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8111714,0,0,1.0021919,-177.38476,-402.83757)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient3198"
-       x1="-48.116642"
-       y1="61.621449"
-       x2="56.998859"
-       y2="61.621449"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6760"
-       id="linearGradient2433"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8111714,0,0,1.0021919,-164.71933,-418.54774)"
-       x1="225.50159"
-       y1="485.76477"
-       x2="352.06509"
-       y2="485.76477" />
-  </defs>
+     id="defs2043" />
   <sodipodi:namedview
      inkscape:window-height="900"
@@ -242 +49 @@
      inkscape:zoom="2.0265209"
      inkscape:cx="128.22867"
-     inkscape:cy="114.33841"
+     inkscape:cy="35.385363"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="25"
      inkscape:current-layer="svg2040"
      borderlayer="false"
      inkscape:snap-intersection-grid-guide="true"
      showguides="true"
-     showborder="false"
+     showborder="true"
      width="183.71px">
     <inkscape:grid
@@ -257 +64 @@
        enabled="true" />
   </sodipodi:namedview>
-  <rect
-     style="fill:url(#linearGradient2433);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.1458962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2047"
-     width="111.34344"
-     height="107.03931"
-     x="13.738375"
-     y="14.762129"
-     inkscape:export-filename="E:\Documentos Pessoais\Gerson\repositorio\branches\gui\eml\controllers\icon\path2396.png"
-     inkscape:export-xdpi="89"
-     inkscape:export-ydpi="89" />
   <path
      sodipodi:type="arc"
-     style="opacity:0.97000002;fill:url(#linearGradient3198);fill-opacity:1;stroke:#000000;stroke-width:2.97000003;stroke-linecap:round;stroke-linejoin:round;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:0.74250001, 0.74250001;stroke-dashoffset:0;stroke-opacity:1"
+     style="opacity:0.97000001999999996;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.17;stroke-linecap:round;stroke-linejoin:round;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="path2396"
      sodipodi:cx="4.4411087"
@@ -276 +73 @@
      sodipodi:ry="49.345654"
      d="M 55.513859,61.621449 A 51.07275,49.345654 0 1 1 -46.631641,61.621449 A 51.07275,49.345654 0 1 1 55.513859,61.621449 z"
-     transform="translate(64.971817,6.7807902)" />
+     transform="translate(47.216641,-11.690795)" />
   <text
      xml:space="preserve"
      style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans"
-     x="46.42664"
-     y="75.178345"
+     x="29.658375"
+     y="57.200214"
      id="text11790"
      sodipodi:linespacing="125%"><tspan
        sodipodi:role="line"
        id="tspan11792"
-       x="46.42664"
-       y="75.178345"
+       x="29.658375"
+       y="57.200214"
        style="font-size:24px">PID</tspan></text>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39352047;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 70.093247,0.69676024 C 70.181237,19.336618 70.093247,19.336618 70.093247,19.336618 L 70.005247,19.000767"
-     id="path21455" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39400005;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 0.69700003,69.583217 C 19.336858,69.495227 19.336858,69.583217 19.336858,69.583217 L 19.001007,69.671217"
-     id="path2420" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39352047;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 70.681227,116.10291 C 70.769217,134.74277 70.681227,134.74277 70.681227,134.74277 L 70.593227,134.40692"
-     id="path4392" />
   <text
      xml:space="preserve"
      style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans"
-     x="36.007072"
-     y="85.466248"
+     x="19.808067"
+     y="69.249046"
      id="text2455"
      sodipodi:linespacing="125%"><tspan
        sodipodi:role="line"
        id="tspan2457"
-       x="36.007072"
-       y="85.466248"
+       x="19.808067"
+       y="69.249046"
        style="font-size:10px">Incremental</tspan></text>
 </svg>

branches/gui/eml/stage_separators/condenser.mso

@@ -24 +24 @@
         Pallete         = true;
         Icon            = "icon/Condenser"; 
-        Brief           = "Model of a dynamic condenser.";
+        Brief   = "Model of a dynamic condenser.";
         Info            =
 "== Assumptions ==
@@ -33 +33 @@
 * the inlet stream;
 * the outlet flows: OutletVapour.F and OutletLiquid.F;
-* the heat supply.
+* the InletQ (the model requires an energy stream).
         
 == Initial Conditions ==
-* the condenser temperature (OutletLiquid.T);
-* the condenser liquid level (Level);
-* (NoComps - 1) OutletLiquid (OR OutletVapour) compositions.
+* Initial_Temperature :  the condenser temperature (OutletLiquid.T);
+* Initial_Level : the condenser liquid level (Level);
+* Initial_Composition : (NoComps) OutletLiquid compositions.
 ";      
         
 PARAMETERS
         outer PP                        as Plugin       (Brief = "External Physical Properties", Type="PP");
-        outer NComp     as Integer;
+        outer NComp     as Integer(Brief = "Number of Components");
 
         V                       as volume       (Brief="Condenser total volume");
-        Across  as area                         (Brief="Cross Section Area of reboiler");
+        Across  as area                         (Brief="Cross Section Area of condenser");
         
         Initial_Level                           as length                       (Brief="Initial Level of liquid phase");
@@ -56 +56 @@
 out     OutletLiquid    as liquid_stream                (Brief="Liquid outlet stream", PosX=0.4513, PosY=1, Symbol="_{outL}");
 out     OutletVapour    as vapour_stream        (Brief="Vapour outlet stream", PosX=0.4723, PosY=0, Symbol="_{outV}");
-in              InletQ          as power                                (Brief="Cold supplied", PosX=1, PosY=0, Symbol="_{in}");
-
-        M(NComp)        as mol                          (Brief="Molar Holdup in the tray");
-        ML                              as mol                          (Brief="Molar liquid holdup");
-        MV                              as mol                          (Brief="Molar vapour holdup");
-        E                                       as energy                       (Brief="Total Energy Holdup on tray");
-        vL                              as volume_mol   (Brief="Liquid Molar Volume");
-        vV                              as volume_mol   (Brief="Vapour Molar volume");
-        Level                   as length                       (Brief="Level of liquid phase");
+in              InletQ          as power                                (Brief="Cold supplied", PosX=1, PosY=0, Symbol="_{in}",Protected=true);
+
+        M(NComp)        as mol                          (Brief="Condenser Total Molar Holdup",Protected=true);
+        ML                              as mol                          (Brief="Molar liquid holdup",Protected=true);
+        MV                              as mol                          (Brief="Molar vapour holdup",Protected=true);
+        E                                       as energy                       (Brief="Total Energy Holdup",Protected=true);
+        vL                              as volume_mol   (Brief="Liquid Molar Volume",Protected=true);
+        vV                              as volume_mol   (Brief="Vapour Molar volume",Protected=true);
+        Level                   as length                       (Brief="Level of liquid phase",Protected=true);
 
 INITIAL
@@ -85 +85 @@
         E = ML*OutletLiquid.h + MV*OutletVapour.h - OutletVapour.P*V;
         
-"Mol fraction normalisation"
+"Liquid Mol fraction normalisation"
         sum(OutletLiquid.z)=1.0;
+
+"Mol fraction constraint"
         sum(OutletLiquid.z)=sum(OutletVapour.z);
 
@@ -113 +115 @@
 end
 
-
-#*----------------------------------------------------------------------
-* Model of a  Steady State condenser with no thermodynamics equilibrium
-*---------------------------------------------------------------------*# 
 Model condenserSteady
         ATTRIBUTES
@@ -130 +128 @@
 * the inlet stream;
 * the pressure drop in the condenser;
-* the heat supply.
+* the InletQ (the model requires an energy stream).
 ";
 
 PARAMETERS
         outer PP                as Plugin       (Brief = "External Physical Properties", Type="PP");
-        outer NComp as Integer;
+        outer NComp as Integer (Brief = "Number of Components");
 
 VARIABLES
 in      InletVapour             as stream                               (Brief="Vapour inlet stream", PosX=0.3431, PosY=0, Symbol="_{inV}");
 out     OutletLiquid as liquid_stream           (Brief="Liquid outlet stream", PosX=0.34375, PosY=1, Symbol="_{outL}");
-in      InletQ          as power                                (Brief="Cold supplied", PosX=1, PosY=0.5974, Symbol="_{in}");
-        DP                      as press_delta          (Brief="Pressure Drop in the condenser",Default=0);
+in      InletQ          as power                                (Brief="Cold supplied", PosX=1, PosY=0.5974, Symbol="_{in}",Protected=true);
+        Pdrop                   as press_delta          (Brief="Pressure Drop in the condenser",Default=0);
 
 EQUATIONS
 
-"Molar Balance"
+"Molar Flow Balance"
         InletVapour.F = OutletLiquid.F;
+
+"Molar Composition Balance"
         InletVapour.z = OutletLiquid.z;
 
@@ -152 +152 @@
         InletVapour.F*InletVapour.h = OutletLiquid.F*OutletLiquid.h + InletQ;
 
-"Pressure"
-        DP = InletVapour.P - OutletLiquid.P;
+"Pressure Drop"
+        OutletLiquid.P = InletVapour.P - Pdrop;
 
 end
 
-#*-------------------------------------------------------------------
-* Condenser with reaction in liquid phase
-*--------------------------------------------------------------------*#
 Model condenserReact
         ATTRIBUTES
@@ -283 +280 @@
 * the inlet stream;
 * the outlet flows: OutletVapour.F and OutletLiquid.F;
-* the model requires an energy stream.
+* the InletQ (the model requires an energy stream).
         
 == Initial Conditions ==

branches/gui/eml/stage_separators/reboiler.mso

@@ -143 +143 @@
         outer PP                        as Plugin                       (Brief = "External Physical Properties", Type="PP");
         outer NComp     as Integer;
-        DP                                      as press_delta  (Brief="Pressure Drop in the reboiler");
+        Pdrop                                   as press_delta  (Brief="Pressure Drop in the reboiler");
 
 VARIABLES
 in      InletLiquid                     as stream                                       (Brief="Liquid inlet stream", PosX=0.3345, PosY=1, Symbol="_{inL}");
 out     OutletVapour    as vapour_stream                (Brief="Vapour outlet stream", PosX=0.3369, PosY=0, Symbol="_{outV}");
-in      InletQ                  as power                                        (Brief="Heat supplied", PosX=1, PosY=0.6111, Symbol="_{in}");
-        vV                              as volume_mol                   (Brief="Vapour Molar volume");
-        rhoV                    as dens_mass                    (Brief="Vapour Density");
+in      InletQ                  as power                                                        (Brief="Heat supplied", PosX=1, PosY=0.6111, Symbol="_{in}");
+        vV                              as volume_mol                           (Brief="Vapour Molar volume");
+        rhoV                    as dens_mass                                    (Brief="Vapour Density");
 
 EQUATIONS
 
-"Molar Balance"
+"Molar Flow Balance"
         InletLiquid.F = OutletVapour.F;
+
+"Molar Composition Balance"
         InletLiquid.z = OutletVapour.z;
         
@@ -167 +169 @@
         InletLiquid.F*InletLiquid.h + InletQ = OutletVapour.F*OutletVapour.h;
         
-"Pressure"
-        DP = InletLiquid.P - OutletVapour.P;
+"Pressure Drop"
+        OutletVapour.P = InletLiquid.P - Pdrop;
 
 end