From 84ab342793dc4a967617f715d848fa89a7159d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com>
Date: Thu, 14 Mar 2024 16:13:32 +0100
Subject: [PATCH] [refact] Use lidarview_add_interpreter_plugin

---
 CMakeLists.txt                                       |  4 +++-
 LivoxPacketInterpreters/LivoxLidarReader.xml         |  4 ++--
 LivoxPacketInterpreters/LivoxLidarStream.xml         |  4 ++--
 LivoxPacketInterpreters/LivoxPacketInterpreter.xml   |  6 +++---
 .../LivoxPosePacketInterpreter.xml                   |  4 ++--
 LivoxPosePacketInterpreters/LivoxPoseReader.xml      |  6 +++---
 LivoxPosePacketInterpreters/LivoxPoseStream.xml      |  6 +++---
 LivoxProxies.xml                                     | 12 +-----------
 8 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc901fe..9b0fb50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
-paraview_add_plugin(LivoxPlugin
+include(LidarViewInterpreterPlugin)
+
+lidarview_add_interpreter_plugin(Livox
   REQUIRED_ON_CLIENT
   REQUIRED_ON_SERVER
   VERSION "2.0"
diff --git a/LivoxPacketInterpreters/LivoxLidarReader.xml b/LivoxPacketInterpreters/LivoxLidarReader.xml
index 0d920ef..fd812bd 100644
--- a/LivoxPacketInterpreters/LivoxLidarReader.xml
+++ b/LivoxPacketInterpreters/LivoxLidarReader.xml
@@ -3,7 +3,7 @@
     <LidarReaderProxy name="LivoxLidarReader"
                       class="vtkLidarReader"
                       label="Livox LiDAR Reader"
-                      base_proxygroup="internal_interpreter"
+                      base_proxygroup="internal_livox"
                       base_proxyname="CommonLidarReader">
 
       <Documentation short_help="Read Livox LiDAR data files." long_help="Read Livox LiDAR .pcap files.">
@@ -32,7 +32,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="PacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_livox"
                proxyname="LivoxPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
diff --git a/LivoxPacketInterpreters/LivoxLidarStream.xml b/LivoxPacketInterpreters/LivoxLidarStream.xml
index 982e46d..0f02c6b 100644
--- a/LivoxPacketInterpreters/LivoxLidarStream.xml
+++ b/LivoxPacketInterpreters/LivoxLidarStream.xml
@@ -3,7 +3,7 @@
     <SourceProxy name="LivoxLidarStream"
                  class="vtkLidarStream"
                  label="Livox LiDAR Stream"
-                 base_proxygroup="internal_interpreter"
+                 base_proxygroup="internal_livox"
                  base_proxyname="CommonLidarStream">
 
       <Documentation short_help="Livox LiDAR data stream." long_help="Livox LiDAR live source stream.">
@@ -29,7 +29,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="PacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_livox"
                proxyname="LivoxPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
diff --git a/LivoxPacketInterpreters/LivoxPacketInterpreter.xml b/LivoxPacketInterpreters/LivoxPacketInterpreter.xml
index cd863cb..84dd448 100644
--- a/LivoxPacketInterpreters/LivoxPacketInterpreter.xml
+++ b/LivoxPacketInterpreters/LivoxPacketInterpreter.xml
@@ -1,16 +1,16 @@
 <ServerManagerConfiguration>
-  <ProxyGroup name="internal_interpreter">
+  <ProxyGroup name="internal_livox">
     <Proxy name="LivoxPacketInterpreter"
            class="vtkLivoxPacketInterpreter"
            label="Livox Interpreter"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_livox"
            base_proxyname="CommonLidarPacketInterpreter">
 
       <IntVectorProperty name="LidarModel"
                          command="SetLidarModel"
                          number_of_elements="1"
                          override="1"
-                         default_values="0">
+                         default_values="9">
         <EnumerationDomain name="enum">
           <Entry value="9" text="Mid-360" />
           <Entry value="15" text="HAP" />
diff --git a/LivoxPosePacketInterpreters/LivoxPosePacketInterpreter.xml b/LivoxPosePacketInterpreters/LivoxPosePacketInterpreter.xml
index 9ae0cd0..00f72b6 100644
--- a/LivoxPosePacketInterpreters/LivoxPosePacketInterpreter.xml
+++ b/LivoxPosePacketInterpreters/LivoxPosePacketInterpreter.xml
@@ -1,9 +1,9 @@
 <ServerManagerConfiguration>
-  <ProxyGroup name="internal_interpreter">
+  <ProxyGroup name="internal_livox">
     <Proxy name="LivoxPosePacketInterpreter"
            class="vtkLivoxPosePacketInterpreter"
            label="Lidar and IMU Livox Interpreter"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_livox"
            base_proxyname="CommonPosePacketInterpreter">
     </Proxy>
   </ProxyGroup>
diff --git a/LivoxPosePacketInterpreters/LivoxPoseReader.xml b/LivoxPosePacketInterpreters/LivoxPoseReader.xml
index 845f647..ec6ceff 100644
--- a/LivoxPosePacketInterpreters/LivoxPoseReader.xml
+++ b/LivoxPosePacketInterpreters/LivoxPoseReader.xml
@@ -3,7 +3,7 @@
     <LidarReaderProxy name="LivoxLidarPoseReader"
                       class="vtkLidarPoseReader"
                       label="Livox LiDAR + IMU Reader"
-                      base_proxygroup="internal_interpreter"
+                      base_proxygroup="internal_livox"
                       base_proxyname="CommonLidarPoseReader">
 
       <Documentation short_help="Read Livox LiDAR data files." long_help="Read Livox LiDAR .pcap files.">
@@ -48,7 +48,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="PacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_livox"
                proxyname="LivoxPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
@@ -64,7 +64,7 @@
 
       <SubProxy command="SetPoseInterpreter">
         <Proxy name="PosePacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_livox"
                proxyname="LivoxPosePacketInterpreter" />
       </SubProxy>
 
diff --git a/LivoxPosePacketInterpreters/LivoxPoseStream.xml b/LivoxPosePacketInterpreters/LivoxPoseStream.xml
index 33a3669..9887be8 100644
--- a/LivoxPosePacketInterpreters/LivoxPoseStream.xml
+++ b/LivoxPosePacketInterpreters/LivoxPoseStream.xml
@@ -3,7 +3,7 @@
     <SourceProxy name="LivoxLidarPoseStream"
                  class="vtkLidarPoseStream"
                  label="Livox LiDAR + IMU Stream"
-                 base_proxygroup="internal_interpreter"
+                 base_proxygroup="internal_livox"
                  base_proxyname="CommonLidarPoseStream">
 
       <Documentation short_help="Livox LiDAR + IMU stream." long_help="Livox LiDAR IMU Pose live source stream.">
@@ -47,7 +47,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="PacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_livox"
                proxyname="LivoxPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
@@ -63,7 +63,7 @@
 
       <SubProxy command="SetPoseInterpreter">
         <Proxy name="PosePacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_livox"
                proxyname="LivoxPosePacketInterpreter" />
       </SubProxy>
 
diff --git a/LivoxProxies.xml b/LivoxProxies.xml
index 687961c..3376d14 100644
--- a/LivoxProxies.xml
+++ b/LivoxProxies.xml
@@ -2,20 +2,10 @@
   <ProxyGroup name="lidar_interpreters">
     <!-- The name here is what the configuration dialog will show -->
     <Proxy name="Livox"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_livox"
            base_proxyname="BaseInterpreter">
 
       <!-- Change the default values to the interpreter proxy names -->
-      <StringVectorProperty name="LidarReader"
-                            number_of_elements="1"
-                            override="1"
-                            default_values="LivoxLidarReader"
-                            information_only="1" />
-      <StringVectorProperty name="LidarStream"
-                            number_of_elements="1"
-                            override="1"
-                            default_values="LivoxLidarStream"
-                            information_only="1" />
       <StringVectorProperty name="LidarPoseReader"
                             number_of_elements="1"
                             override="1"
-- 
GitLab