From c943aba102473a6d1b6026b9c9344660e575e6e7 Mon Sep 17 00:00:00 2001
From: Arnaud Billon <arnaud.billon@kitware.com>
Date: Thu, 3 Mar 2022 16:34:34 +0100
Subject: [PATCH] [fix] Rename RPM
---
Application/Ui/python/lidarview/applogic.py | 17 ++++++++++-------
Application/vvMainWindow.ui | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Application/Ui/python/lidarview/applogic.py b/Application/Ui/python/lidarview/applogic.py
index 2c408932e..5c99ace2f 100644
--- a/Application/Ui/python/lidarview/applogic.py
+++ b/Application/Ui/python/lidarview/applogic.py
@@ -1070,7 +1070,7 @@ def setupActions():
def createRPMBehaviour():
# create and customize a label to display the rpm
- rpm = smp.Text(guiName="RPM", Text="No RPM/Hz")
+ rpm = smp.Text(guiName="RPM", Text="No RPM/FPS")
representation = smp.GetRepresentation(rpm)
representation.FontSize = 16
representation.Color = [1,1,0]
@@ -1084,13 +1084,16 @@ def start_cue(self):
def tick(self):
rpm = smp.FindSource("RPM")
- lidar = lv.getLidar() #smp.FindSource("Data")
+ lidar = lv.getLidar()
if (lidar):
- valfreq = int(lidar.Interpreter.GetClientSideObject().GetFrequency())
- valrpm = int(lidar.Interpreter.GetClientSideObject().GetRpm())
- rpm.Text = f"{str(valfreq)} Hz {str(valrpm)} RPM"
- else:
- rpm.Text = "No Hz/RPM Info"
+ valrpm = int(lidar.Interpreter.GetClientSideObject().GetRpm())
+ valfps = int(lidar.Interpreter.GetClientSideObject().GetFrequency())
+ if (valrpm):
+ rpm.Text = f"{str(valrpm)} RPM"
+ elif(valfps):
+ rpm.Text = f"{str(valfps)} FPS"
+ else:
+ rpm.Text = "No RPM/FPS Info"
def end_cue(self):
pass
diff --git a/Application/vvMainWindow.ui b/Application/vvMainWindow.ui
index b8535bc55..35bb4df58 100644
--- a/Application/vvMainWindow.ui
+++ b/Application/vvMainWindow.ui
@@ -715,7 +715,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Show RPM</string>
+ <string>Show FrameRate</string>
</property>
<property name="toolTip">
<string>Display the rotations per minute</string>
--
GitLab