WORKING - refactoring in progress

.idea/workspace.xml

@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1591b6fa-ad4f-4d7a-b643-0b1859455660" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/PMConnection.py" afterPath="$PROJECT_DIR$/pimonitor/PMConnection.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py" afterPath="$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/cu/PMCUContext.py" afterPath="$PROJECT_DIR$/pimonitor/cu/PMCUContext.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py" afterPath="$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/PMMain.py" afterPath="$PROJECT_DIR$/pimonitor/PMMain.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/ui/PMSingleWindow.py" afterPath="$PROJECT_DIR$/pimonitor/ui/PMSingleWindow.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pimonitor/PMXmlParser.py" afterPath="$PROJECT_DIR$/pimonitor/PMXmlParser.py" />
     </list>
     <ignored path="PiMonitor.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -25,11 +30,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
+      <file leaf-file-name="PMCUCalculatedParameter.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="682" max-vertical-offset="1500">
+              <caret line="70" column="65" selection-start-line="70" selection-start-column="56" selection-end-line="70" selection-end-column="65" />
+              <folding>
+                <element signature="e#0#9#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PMCUStandardParameter.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="757" max-vertical-offset="1575">
+              <caret line="67" column="65" selection-start-line="67" selection-start-column="65" selection-end-line="67" selection-end-column="65" />
+              <folding>
+                <element signature="e#0#48#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="PMMain.py" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pimonitor/PMMain.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1785">
-              <caret line="27" column="36" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="36" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1102" max-vertical-offset="1950">
+              <caret line="110" column="50" selection-start-line="110" selection-start-column="50" selection-end-line="110" selection-end-column="50" />
               <folding>
                 <element signature="e#72#81#0" expanded="true" />
               </folding>
@@ -37,11 +66,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="run.sh" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/run.sh">
+      <file leaf-file-name="PMConnection.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pimonitor/PMConnection.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.6" vertical-offset="0" max-vertical-offset="120">
-              <caret line="1" column="72" selection-start-line="1" selection-start-column="72" selection-end-line="1" selection-end-column="72" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1162" max-vertical-offset="2130">
+              <caret line="107" column="44" selection-start-line="107" selection-start-column="44" selection-end-line="107" selection-end-column="44" />
               <folding />
             </state>
           </provider>
@@ -50,8 +79,8 @@
       <file leaf-file-name="PMScreen.py" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMScreen.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="4" max-vertical-offset="3735">
-              <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="2115" max-vertical-offset="3735">
+              <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" />
               <folding>
                 <element signature="e#47#56#0" expanded="true" />
               </folding>
@@ -59,12 +88,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PMConnection.py" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pimonitor/PMConnection.py">
+      <file leaf-file-name="PMXmlParser.py" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pimonitor/PMXmlParser.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.23106061" vertical-offset="1338" max-vertical-offset="2130">
-              <caret line="80" column="49" selection-start-line="80" selection-start-column="49" selection-end-line="80" selection-end-column="49" />
-              <folding />
+            <state vertical-scroll-proportion="0.53178483" vertical-offset="600" max-vertical-offset="3225">
+              <caret line="69" column="41" selection-start-line="69" selection-start-column="41" selection-end-line="69" selection-end-column="41" />
+              <folding>
+                <element signature="e#47#61#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -94,20 +125,20 @@
         <option value="$PROJECT_DIR$/pimonitor/test/PMCUContextTest.py" />
         <option value="$PROJECT_DIR$/pimonitor/cu/PMCUAddress.py" />
         <option value="$PROJECT_DIR$/pimonitor/cu/PMCUConversion.py" />
-        <option value="$PROJECT_DIR$/pimonitor/PMXmlParser.py" />
         <option value="$PROJECT_DIR$/pimonitor/PMDemoConnection.py" />
         <option value="$PROJECT_DIR$/pimonitor/cu/PMCUSwitchParameter.py" />
         <option value="$PROJECT_DIR$/pimonitor/cu/PMCUParameter.py" />
-        <option value="$PROJECT_DIR$/pimonitor/ui/PMSingleWindow.py" />
-        <option value="$PROJECT_DIR$/pimonitor/cu/PMCUContext.py" />
         <option value="$PROJECT_DIR$/pimonitor/test/PMCUTest.py" />
-        <option value="$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py" />
-        <option value="$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py" />
         <option value="$PROJECT_DIR$/pimonitor/cu/PMCUFixedAddressParameter.py" />
-        <option value="$PROJECT_DIR$/pimonitor/PMMain.py" />
         <option value="$PROJECT_DIR$/run.sh" />
         <option value="$PROJECT_DIR$/pimonitor/ui/PMScreen.py" />
         <option value="$PROJECT_DIR$/pimonitor/PMConnection.py" />
+        <option value="$PROJECT_DIR$/pimonitor/cu/PMCUContext.py" />
+        <option value="$PROJECT_DIR$/pimonitor/ui/PMSingleWindow.py" />
+        <option value="$PROJECT_DIR$/pimonitor/PMMain.py" />
+        <option value="$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py" />
+        <option value="$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py" />
+        <option value="$PROJECT_DIR$/pimonitor/PMXmlParser.py" />
       </list>
     </option>
   </component>
@@ -270,6 +301,7 @@
     <property name="recentsLimit" value="5" />
     <property name="restartRequiresConfirmation" value="true" />
     <property name="LayoutCode.rearrangeEntriesPython" value="false" />
+    <property name="FullScreen" value="false" />
   </component>
   <component name="PyConsoleOptionsProvider">
     <option name="myPythonConsoleState">
@@ -299,7 +331,9 @@
       <module name="PiMonitor" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/pimonitor/PMMain.py" />
       <option name="PARAMETERS" value="" />
+      <RunnerSettings RunnerId="PyDebugRunner" />
       <RunnerSettings RunnerId="PythonRunner" />
+      <ConfigurationWrapper RunnerId="PyDebugRunner" />
       <ConfigurationWrapper RunnerId="PythonRunner" />
       <method />
     </configuration>
@@ -493,22 +527,42 @@
     </task>
     <servers />
   </component>
+  <component name="TodoView" selected-index="0">
+    <todo-panel id="selected-file">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+  </component>
   <component name="ToolWindowManager">
     <frame x="0" y="22" width="2560" height="1353" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943925" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291039" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13666798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39888978" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995327" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39888978" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3291039" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291039" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -536,17 +590,17 @@
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="python-line">
-          <url>file://$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py</url>
-          <line>39</line>
-          <option name="timeStamp" value="22" />
+          <url>file://$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py</url>
+          <line>54</line>
+          <option name="timeStamp" value="28" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="python-line">
-          <url>file://$PROJECT_DIR$/pimonitor/PMDemoConnection.py</url>
-          <line>44</line>
-          <option name="timeStamp" value="23" />
+          <url>file://$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py</url>
+          <line>46</line>
+          <option name="timeStamp" value="29" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="24" />
+      <option name="time" value="30" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
@@ -630,40 +684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/PMXmlParser.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1752" max-vertical-offset="3225">
-          <caret line="141" column="36" selection-start-line="141" selection-start-column="36" selection-end-line="141" selection-end-column="36" />
-          <folding>
-            <element signature="e#47#61#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/platform.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41849148" vertical-offset="17259" max-vertical-offset="24915">
-          <caret line="1185" column="14" selection-start-line="1185" selection-start-column="14" selection-end-line="1185" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMWindow.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.71515894" vertical-offset="0" max-vertical-offset="1305">
-          <caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMSingleWindow.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35819072" vertical-offset="277" max-vertical-offset="1095">
-          <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUFixedAddressParameter.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.53178483" vertical-offset="0" max-vertical-offset="818">
@@ -682,16 +702,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8716381" vertical-offset="472" max-vertical-offset="1290">
-          <caret line="79" column="46" selection-start-line="79" selection-start-column="46" selection-end-line="79" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#9#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUSwitchParameter.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.29339853" vertical-offset="0" max-vertical-offset="818">
@@ -702,107 +712,153 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUParameter.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUConversion.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.34841076" vertical-offset="0" max-vertical-offset="818">
-          <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
+          <caret line="19" column="48" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUConversion.py">
+    <entry file="file://$PROJECT_DIR$/data/logger_METRIC_EN_v263.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34841076" vertical-offset="0" max-vertical-offset="818">
-          <caret line="19" column="48" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        <state vertical-scroll-proportion="0.5827985" vertical-offset="10916" max-vertical-offset="468150">
+          <caret line="758" column="40" selection-start-line="758" selection-start-column="40" selection-end-line="758" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUContext.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/PMParameter.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5709047" vertical-offset="523" max-vertical-offset="1365">
-          <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.33251834" vertical-offset="373" max-vertical-offset="2925">
+          <caret line="43" column="8" selection-start-line="43" selection-start-column="8" selection-end-line="43" selection-end-column="8" />
+          <folding>
+            <element signature="e#47#56#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUAddress.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.27506113" vertical-offset="0" max-vertical-offset="818">
+          <caret line="15" column="63" selection-start-line="15" selection-start-column="63" selection-end-line="15" selection-end-column="63" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/logger_METRIC_EN_v263.xml">
+    <entry file="file://$PROJECT_DIR$/run.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5827985" vertical-offset="10916" max-vertical-offset="468150">
-          <caret line="758" column="40" selection-start-line="758" selection-start-column="40" selection-end-line="758" selection-end-column="40" />
+        <state vertical-scroll-proportion="0.01891551" vertical-offset="0" max-vertical-offset="793">
+          <caret line="1" column="72" selection-start-line="1" selection-start-column="72" selection-end-line="1" selection-end-column="72" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/platform.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="291" max-vertical-offset="24915">
+          <caret line="37" column="24" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pimonitor/PMMain.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1785">
-          <caret line="27" column="36" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1102" max-vertical-offset="1950">
+          <caret line="110" column="50" selection-start-line="110" selection-start-column="50" selection-end-line="110" selection-end-column="50" />
           <folding>
             <element signature="e#72#81#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/run.sh">
+    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUParameter.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.6" vertical-offset="0" max-vertical-offset="120">
-          <caret line="1" column="72" selection-start-line="1" selection-start-column="72" selection-end-line="1" selection-end-column="72" />
+        <state vertical-scroll-proportion="0.2567237" vertical-offset="0" max-vertical-offset="818">
+          <caret line="14" column="19" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/PMDemoConnection.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.35279503" vertical-offset="376" max-vertical-offset="1185">
+          <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMWindow.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6601467" vertical-offset="60" max-vertical-offset="1305">
+          <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMSingleWindow.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31173593" vertical-offset="0" max-vertical-offset="1575">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.5782396" vertical-offset="292" max-vertical-offset="1110">
+          <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
           <folding>
-            <element signature="e#0#48#0" expanded="true" />
+            <element signature="e#47#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/PMDemoConnection.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/PMConnection.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33291924" vertical-offset="347" max-vertical-offset="1185">
-          <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1162" max-vertical-offset="2130">
+          <caret line="107" column="44" selection-start-line="107" selection-start-column="44" selection-end-line="107" selection-end-column="44" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMScreen.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUContext.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="4" max-vertical-offset="3735">
-          <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.37286064" vertical-offset="100" max-vertical-offset="1380">
+          <caret line="27" column="62" selection-start-line="27" selection-start-column="62" selection-end-line="27" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUCalculatedParameter.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="682" max-vertical-offset="1500">
+          <caret line="70" column="65" selection-start-line="70" selection-start-column="56" selection-end-line="70" selection-end-column="65" />
           <folding>
-            <element signature="e#47#56#0" expanded="true" />
+            <element signature="e#0#9#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/PMParameter.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUStandardParameter.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33251834" vertical-offset="373" max-vertical-offset="2925">
-          <caret line="43" column="8" selection-start-line="43" selection-start-column="8" selection-end-line="43" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="757" max-vertical-offset="1575">
+          <caret line="67" column="65" selection-start-line="67" selection-start-column="65" selection-end-line="67" selection-end-column="65" />
           <folding>
-            <element signature="e#47#56#0" expanded="true" />
+            <element signature="e#0#48#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/cu/PMCUAddress.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/ui/PMScreen.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27506113" vertical-offset="0" max-vertical-offset="818">
-          <caret line="15" column="63" selection-start-line="15" selection-start-column="63" selection-end-line="15" selection-end-column="63" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1572" max-vertical-offset="3735">
+          <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" />
+          <folding>
+            <element signature="e#47#56#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pimonitor/PMConnection.py">
+    <entry file="file://$PROJECT_DIR$/pimonitor/PMXmlParser.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.23106061" vertical-offset="1338" max-vertical-offset="2130">
-          <caret line="80" column="49" selection-start-line="80" selection-start-column="49" selection-end-line="80" selection-end-column="49" />
-          <folding />
+        <state vertical-scroll-proportion="0.53178483" vertical-offset="600" max-vertical-offset="3225">
+          <caret line="69" column="41" selection-start-line="69" selection-start-column="41" selection-end-line="69" selection-end-column="41" />
+          <folding>
+            <element signature="e#47#61#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

pimonitor/PMMain.py

@@ -16,6 +16,7 @@ from pimonitor.PM import PM
 from pimonitor.PMConnection import PMConnection
 from pimonitor.PMDemoConnection import PMDemoConnection
 from pimonitor.PMXmlParser import PMXmlParser
+from pimonitor.cu.PMCUParameter import PMCUParameter
 from pimonitor.cu.PMCUContext import PMCUContext
 from pimonitor.ui.PMScreen import PMScreen
 from pimonitor.ui.PMSingleWindow import PMSingleWindow
@@ -98,8 +99,18 @@ if __name__ == '__main__':
                 #    packets = connection.read_parameters(parameters)
                 #    window.set_packets(packets)
                 #else:
-                packet = connection.read_parameter(param)
-                window.set_packets([packet])
+                if param.get_cu_type() == PMCUParameter.CU_TYPE_STD_PARAMETER():
+                    packet = connection.read_parameter(param)
+                    window.set_packets([packet])
+                elif param.get_cu_type() == PMCUParameter.CU_TYPE_FIXED_ADDRESS_PARAMETER():
+                    packet = connection.read_parameter(param)
+                    window.set_packets([packet])
+                elif param.get_cu_type() == PMCUParameter.CU_TYPE_SWITCH_PARAMETER():
+                    packet = connection.read_parameter(param)
+                    window.set_packets([packet])
+                elif param.get_cu_type() == PMCUParameter.CU_TYPE_CALCULATED_PARAMETER():
+                    packets = connection.read_parameters(param.get_dependencies())
+                    window.set_packets(packets)
 
                 screen.render()
 

pimonitor/PMXmlParser.py

@@ -67,7 +67,7 @@ class PMXmlParser(xml.sax.ContentHandler):
         source = open(file_path)
         xml.sax.parse(source, self)
         self.log_progress()
-        PM.log(self._message + " [DONE]", self._log_id)
+        PM.log(self._message + " [DONE]")
 
         return self._parameters
 

pimonitor/cu/PMCUCalculatedParameter.py

@@ -16,18 +16,33 @@ class PMCUCalculatedParameter(PMCUStandardParameter):
     def add_dependency(self, parameter):
         self._dependencies.append(parameter)
 
+    def fill_dependencies(self, supported_parameters):
+        parameters = []
+        for dependency in self._dependencies:
+            for parameter in supported_parameters:
+                if parameter.get_id() == dependency:
+                    parameters.append(parameter)
+                    break
+
+        self._dependencies = parameters
+
+    def get_dependencies(self):
+        return self._dependencies
+
     def get_calculated_value(self, packets, unit=None):
         value = ""
         local_vars = locals()
 
         if len(self._conversions) > 0 and unit is None:
-            unit = self._conversions[0][0]
+            unit = self._conversions[0].get_unit()
 
         for conversion in self._conversions:
             curr_unit = conversion.get_unit()
             expr = conversion.get_expr()
             value_format = conversion.get_format()
+
             conversion_map = {}
+
             if unit == curr_unit:
                 param_pairs = re.findall(r'\[([^]]*)\]', expr)
                 for pair in param_pairs:
@@ -38,24 +53,23 @@ class PMCUCalculatedParameter(PMCUStandardParameter):
                     conversion_map.update({key: unit})
 
                 param_no = 0
-                for packet in packets:
-                    param = self._parameters[param_no]
+                for param in self._dependencies:
                     if param.get_id() in conversion_map:
                         conversion_unit = conversion_map[param.get_id()]
                     else:
                         conversion_unit = None
 
-                    if param.get_dependencies():
-                        return "DEPS :("
+                    if param.get_cu_type() == PMCUParameter.CU_TYPE_CALCULATED_PARAMETER():
+                        return "ERROR DEPS" #param.get_calculated_value(packets, conversion_unit)
                     else:
-                        value = param.get_value(packet, conversion_unit)
+                        value = param.get_value(packets[param_no], conversion_unit)
                         local_vars[param.get_id()] = float(value)
                     param_no += 1
 
                 try:
                     value = eval(expr)
-                except (SyntaxError, ZeroDivisionError):
-                    value = 0.0
+                except (SyntaxError, ZeroDivisionError, NameError):
+                    return "ERROR EVAL"
 
                 format_tokens = value_format.split(".")
                 output_format = "%.0f"

pimonitor/cu/PMCUContext.py

@@ -81,6 +81,7 @@ class PMCUContext(object):
             cu_type = parameter.get_cu_type()
             if cu_type == PMCUParameter.CU_TYPE_CALCULATED_PARAMETER():
                 if parameter.is_supported(supported_parameters):
+                    parameter.fill_dependencies(supported_parameters)
                     matched.append(parameter)
 
         return matched

pimonitor/cu/PMCUStandardParameter.py

@@ -65,8 +65,8 @@ class PMCUStandardParameter(PMCUParameter):
 
                 try:
                     value = eval(expr)
-                except (SyntaxError, ZeroDivisionError):
-                    return "exception"
+                except (SyntaxError, ZeroDivisionError, NameError):
+                    return "ERROR EVAL"
 
                 format_tokens = value_format.split(".")
                 output_format = "%.0f"

pimonitor/ui/PMSingleWindow.py

@@ -5,6 +5,7 @@ Created on 22-04-2013
 """
 
 import pygame
+from pimonitor.cu.PMCUParameter import PMCUParameter
 
 
 class PMSingleWindow(object):
@@ -47,10 +48,10 @@ class PMSingleWindow(object):
     def render(self):
         value = "??"
         if self._packets is not None:
-            if self._param.get_address().get_length() > 0:
-                value = self._param.get_value(self._packets[0])
-            elif self._param.get_dependencies():
+            if self._param.get_cu_type() == PMCUParameter.CU_TYPE_CALCULATED_PARAMETER():
                 value = self._param.get_calculated_value(self._packets)
+            else:
+                value = self._param.get_value(self._packets[0])
 
         value_lbl_width = self._value_font.render(value, self._font_aa, self._fg_color).get_width()
         self._x_offset = (self._width - value_lbl_width) / 2