diff --git a/c++/jackmeter/jackmeter.cpp b/c++/jackmeter/jackmeter.cpp
index 41182c2..56809f4 100644
--- a/c++/jackmeter/jackmeter.cpp
+++ b/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);
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 85a2f83..0fbadbb 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -85,7 +85,8 @@
bitmaps/canvas/frame_node_header.png
bitmaps/canvas/frame_port_bg.png
- screens/cadence-jackmeter.png
+ screens/cadence-jackmeter-in.png
+ screens/cadence-jackmeter-out.png
screens/cadence-logs.png
screens/cadence-render.png
screens/cadence-xycontroller.png
diff --git a/resources/screens/cadence-jackmeter.png b/resources/screens/cadence-jackmeter.png
deleted file mode 100644
index 1f2c7dc..0000000
Binary files a/resources/screens/cadence-jackmeter.png and /dev/null differ
diff --git a/resources/ui/cadence.ui b/resources/ui/cadence.ui
index 7fa44c6..3946892 100644
--- a/resources/ui/cadence.ui
+++ b/resources/ui/cadence.ui
@@ -572,7 +572,7 @@
0
0
- 360
+ 359
100
@@ -720,8 +720,8 @@
0
0
- 290
- 77
+ 359
+ 97
@@ -861,8 +861,8 @@
0
0
- 204
- 77
+ 359
+ 97
@@ -1149,33 +1149,50 @@
-
- Meter
+ Meter In / Out
-
-
-
-
- 0
- 117
-
+
+
+ 0
-
-
- 16777215
- 117
-
-
-
-
-
-
- :/screens/cadence-jackmeter.png
-
-
- Qt::AlignCenter
-
-
+
-
+
+
+
+
+
+ :/screens/cadence-jackmeter-in.png
+
+
+
+ -
+
+
+
+ 0
+ 117
+
+
+
+
+ 16777215
+ 117
+
+
+
+
+
+
+ :/screens/cadence-jackmeter-out.png
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -1671,8 +1688,8 @@
0
0
- 94
- 66
+ 416
+ 334
@@ -1701,7 +1718,7 @@
0
0
- 94
+ 89
66
@@ -1731,7 +1748,7 @@
0
0
- 94
+ 89
66
@@ -1761,7 +1778,7 @@
0
0
- 94
+ 89
66
diff --git a/src/cadence.py b/src/cadence.py
index 7626644..4602c31 100755
--- a/src/cadence.py
+++ b/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"):
- python = ""
- localPath = os.path.join(sys.path[0], "..", "c++", tool.replace("cadence-", ""))
+ stool = tool.split(" ", 1)[0]
- if os.path.exists(os.path.join(localPath, tool)):
+ if stool in ("cadence-jackmeter", "cadence-xycontroller"):
+ python = ""
+ localPath = os.path.join(sys.path[0], "..", "c++", stool.replace("cadence-", ""))
+
+ if os.path.exists(os.path.join(localPath, stool)):
base = localPath + os.sep
else:
base = ""