Cadence: Show both in+out versions of JackMeter

c++/jackmeter/jackmeter.cpp

@@ -145,7 +145,7 @@ public:
     MeterW() : DigitalPeakMeter(nullptr)
     {
         setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
-        setWindowTitle("M");
+        setWindowTitle(gIsOutput ? "M" : "Mi");
 
         if (gIsOutput)
             setColor(Color::GREEN);

resources/resources.qrc

@@ -85,7 +85,8 @@
         <file>bitmaps/canvas/frame_node_header.png</file>
         <file>bitmaps/canvas/frame_port_bg.png</file>
 
-        <file>screens/cadence-jackmeter.png</file>
+        <file>screens/cadence-jackmeter-in.png</file>
+        <file>screens/cadence-jackmeter-out.png</file>
         <file>screens/cadence-logs.png</file>
         <file>screens/cadence-render.png</file>
         <file>screens/cadence-xycontroller.png</file>

resources/ui/cadence.ui

@@ -572,7 +572,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>360</width>
+                  <width>359</width>
                   <height>100</height>
                  </rect>
                 </property>
@@ -720,8 +720,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>290</width>
-                  <height>77</height>
+                  <width>359</width>
+                  <height>97</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -861,8 +861,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>204</width>
-                  <height>77</height>
+                  <width>359</width>
+                  <height>97</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1149,33 +1149,50 @@
           <item>
            <widget class="QGroupBox" name="groupBox_meter">
             <property name="title">
-             <string>Meter</string>
+             <string>Meter In / Out</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_4">
              <item>
-              <widget class="ClickableLabel" name="pic_meter">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>117</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>117</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="../resources.qrc">:/screens/cadence-jackmeter.png</pixmap>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
+              <layout class="QHBoxLayout" name="horizontalLayout_5">
+               <property name="spacing">
+                <number>0</number>
                </property>
-              </widget>
+               <item>
+                <widget class="ClickableLabel" name="pic_meter_in">
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="pixmap">
+                  <pixmap resource="../resources.qrc">:/screens/cadence-jackmeter-in.png</pixmap>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="ClickableLabel" name="pic_meter_out">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>117</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>117</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="pixmap">
+                  <pixmap resource="../resources.qrc">:/screens/cadence-jackmeter-out.png</pixmap>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </item>
              <item>
               <widget class="QLabel" name="label_tools_meter">
@@ -1671,8 +1688,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>94</width>
-                  <height>66</height>
+                  <width>416</width>
+                  <height>334</height>
                  </rect>
                 </property>
                 <attribute name="label">
@@ -1701,7 +1718,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>94</width>
+                  <width>89</width>
                   <height>66</height>
                  </rect>
                 </property>
@@ -1731,7 +1748,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>94</width>
+                  <width>89</width>
                   <height>66</height>
                  </rect>
                 </property>
@@ -1761,7 +1778,7 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>94</width>
+                  <width>89</width>
                   <height>66</height>
                  </rect>
                 </property>

src/cadence.py

@@ -1083,7 +1083,8 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
         self.systray.addMenuAction("tools", "app_claudia", "Claudia")
         self.systray.addMenuSeparator("tools", "tools_sep")
         self.systray.addMenuAction("tools", "app_logs", "Logs")
-        self.systray.addMenuAction("tools", "app_meter", "Meter")
+        self.systray.addMenuAction("tools", "app_meter_in", "Meter (Inputs)")
+        self.systray.addMenuAction("tools", "app_meter_out", "Meter (Output)")
         self.systray.addMenuAction("tools", "app_render", "Render")
         self.systray.addMenuAction("tools", "app_xy-controller", "XY-Controller")
         self.systray.addSeparator("sep2")
@@ -1092,7 +1093,8 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
         self.systray.connect("app_catia", lambda tool="catia": self.func_start_tool(tool))
         self.systray.connect("app_claudia", lambda tool="claudia": self.func_start_tool(tool))
         self.systray.connect("app_logs", lambda tool="cadence-logs": self.func_start_tool(tool))
-        self.systray.connect("app_meter", lambda tool="cadence-jackmeter": self.func_start_tool(tool))
+        self.systray.connect("app_meter_in", lambda tool="cadence-jackmeter -in": self.func_start_tool(tool))
+        self.systray.connect("app_meter_out", lambda tool="cadence-jackmeter": self.func_start_tool(tool))
         self.systray.connect("app_render", lambda tool="cadence-render": self.func_start_tool(tool))
         self.systray.connect("app_xy-controller", lambda tool="cadence-xycontroller": self.func_start_tool(tool))
 
@@ -1125,7 +1127,8 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
 
         self.connect(self.pic_catia, SIGNAL("clicked()"), lambda tool="catia": self.func_start_tool(tool))
         self.connect(self.pic_claudia, SIGNAL("clicked()"), lambda tool="claudia": self.func_start_tool(tool))
-        self.connect(self.pic_meter, SIGNAL("clicked()"), lambda tool="cadence-jackmeter": self.func_start_tool(tool))
+        self.connect(self.pic_meter_in, SIGNAL("clicked()"), lambda tool="cadence-jackmeter -in": self.func_start_tool(tool))
+        self.connect(self.pic_meter_out, SIGNAL("clicked()"), lambda tool="cadence-jackmeter": self.func_start_tool(tool))
         self.connect(self.pic_logs, SIGNAL("clicked()"), lambda tool="cadence-logs": self.func_start_tool(tool))
         self.connect(self.pic_render, SIGNAL("clicked()"), lambda tool="cadence-render": self.func_start_tool(tool))
         self.connect(self.pic_xycontroller, SIGNAL("clicked()"), lambda tool="cadence-xycontroller": self.func_start_tool(tool))
@@ -1511,11 +1514,13 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
             elif tool == "cadence-render":
                 tool = "render"
 
-            if tool in ("cadence-jackmeter", "cadence-xycontroller"):
+            stool = tool.split(" ", 1)[0]
+
+            if stool in ("cadence-jackmeter", "cadence-xycontroller"):
                 python    = ""
-                localPath = os.path.join(sys.path[0], "..", "c++", tool.replace("cadence-", ""))
+                localPath = os.path.join(sys.path[0], "..", "c++", stool.replace("cadence-", ""))
 
-                if os.path.exists(os.path.join(localPath, tool)):
+                if os.path.exists(os.path.join(localPath, stool)):
                     base = localPath + os.sep
                 else:
                     base = ""