Merge branch 'development' into 'master'

Development

See merge request LidarView/lidarview!115

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

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>

LVCore @ bb0ae08a

-Subproject commit 245b4eabb9f7727c607298076e4a92080885eaee
+Subproject commit bb0ae08ae0323db17e2deb1a3f380b5795b7e3d2

VelodynePlugin @ 31dd3fe3

-Subproject commit a7516e904b3ea527c509854928426bc673cb84e9
+Subproject commit 31dd3fe3721a7191ece1682fff9f8dfc63b9ba18

lidarview-superbuild @ 05945d91

-Subproject commit 79290e40f44fc9a7d02b8d083a2a46a89554841e
+Subproject commit 05945d91d7991ef5b15afa57648748062c6fa1eb