From 0f95df04d746dcd4cc15368fd2daf29cd02d69bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Mon, 12 Jun 2023 17:20:08 +0200 Subject: [PATCH 1/9] [refact] Create Client folder for LidarViewMainWindow --- Application/{ => Client}/CMakeLists.txt | 33 ++++------- .../LidarViewMainWindow.cxx} | 36 +++++------ .../LidarViewMainWindow.h} | 13 ++-- .../LidarViewMainWindow.ui} | 56 +++++++++--------- .../Resources}/Icons/Measurements.png | Bin .../Resources}/Icons/ViewOrtho.png | Bin .../Resources}/Icons/ViewPerspective.png | Bin .../{ => Client/Resources}/Icons/absolute.png | Bin .../Resources}/Icons/camera_logo.png | Bin .../Resources}/Icons/errorConsole.png | Bin .../Resources}/Icons/icon_motion.png | Bin .../{ => Client/Resources}/Icons/location.png | Bin .../{ => Client/Resources}/Icons/logo.png | Bin .../{ => Client/Resources}/Icons/map.png | Bin .../{ => Client/Resources}/Icons/open.png | Bin .../{ => Client/Resources}/Icons/planefit.png | Bin .../Icons/pqFrustumSelectionPoint24.png | Bin .../Resources}/Icons/pqResetCamera32.png | Bin .../Resources}/Icons/pqSpreadsheet16.png | Bin .../Icons/pqSurfaceSelectionPoint24.png | Bin .../Resources}/Icons/python_logo_124.png | Bin .../Resources/Images}/About.png | Bin .../Resources/Images}/LidarView-splash.svg | 2 +- .../Resources/Images}/LidarViewExample.png | Bin .../Resources/Images}/LidarViewLayout.svg | 0 .../Resources/Images}/LidarViewLogo.svg | 0 .../Resources/Images}/LidarViewMark.svg | 0 .../Resources/Images}/ParaviewLidar.svg | 0 .../Resources/Images}/Splash.jpg | Bin .../Resources/Images}/bottom_logo.png | Bin .../{ => Client/Resources/Images}/logo.icns | Bin .../Resources/Images}/logo.ico | Bin .../Resources/lvAboutDialog.ui} | 8 +-- .../Resources/lvResources.qrc} | 8 +-- .../{lqFilters.xml => Client/lvFilters.xml} | 0 .../{lqSources.xml => Client/lvSources.xml} | 0 CMake/SetBranding.cmake | 4 -- Wrapping/Python/lidarview/aboutDialog.py | 2 +- Wrapping/Python/lidarview/applogic.py | 2 +- 39 files changed, 76 insertions(+), 88 deletions(-) rename Application/{ => Client}/CMakeLists.txt (67%) rename Application/{vvMainWindow.cxx => Client/LidarViewMainWindow.cxx} (95%) rename Application/{vvMainWindow.h => Client/LidarViewMainWindow.h} (89%) rename Application/{vvMainWindow.ui => Client/LidarViewMainWindow.ui} (92%) rename Application/{ => Client/Resources}/Icons/Measurements.png (100%) rename Application/{ => Client/Resources}/Icons/ViewOrtho.png (100%) rename Application/{ => Client/Resources}/Icons/ViewPerspective.png (100%) rename Application/{ => Client/Resources}/Icons/absolute.png (100%) rename Application/{ => Client/Resources}/Icons/camera_logo.png (100%) rename Application/{ => Client/Resources}/Icons/errorConsole.png (100%) rename Application/{ => Client/Resources}/Icons/icon_motion.png (100%) rename Application/{ => Client/Resources}/Icons/location.png (100%) rename Application/{ => Client/Resources}/Icons/logo.png (100%) rename Application/{ => Client/Resources}/Icons/map.png (100%) rename Application/{ => Client/Resources}/Icons/open.png (100%) rename Application/{ => Client/Resources}/Icons/planefit.png (100%) rename Application/{ => Client/Resources}/Icons/pqFrustumSelectionPoint24.png (100%) rename Application/{ => Client/Resources}/Icons/pqResetCamera32.png (100%) rename Application/{ => Client/Resources}/Icons/pqSpreadsheet16.png (100%) rename Application/{ => Client/Resources}/Icons/pqSurfaceSelectionPoint24.png (100%) rename Application/{ => Client/Resources}/Icons/python_logo_124.png (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/About.png (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/LidarView-splash.svg (99%) rename Application/{SoftwareInformation => Client/Resources/Images}/LidarViewExample.png (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/LidarViewLayout.svg (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/LidarViewLogo.svg (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/LidarViewMark.svg (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/ParaviewLidar.svg (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/Splash.jpg (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/bottom_logo.png (100%) rename Application/{ => Client/Resources/Images}/logo.icns (100%) rename Application/{SoftwareInformation => Client/Resources/Images}/logo.ico (100%) rename Application/{vvAboutDialog.ui => Client/Resources/lvAboutDialog.ui} (93%) rename Application/{vvResources.qrc => Client/Resources/lvResources.qrc} (79%) rename Application/{lqFilters.xml => Client/lvFilters.xml} (100%) rename Application/{lqSources.xml => Client/lvSources.xml} (100%) diff --git a/Application/CMakeLists.txt b/Application/Client/CMakeLists.txt similarity index 67% rename from Application/CMakeLists.txt rename to Application/Client/CMakeLists.txt index 9d7d75101..c221f2d71 100644 --- a/Application/CMakeLists.txt +++ b/Application/Client/CMakeLists.txt @@ -6,25 +6,16 @@ if(NOT LV_VERSION_FULL) message(FATAL_ERROR "LV_VERSION_ variables not set") endif() -add_subdirectory(Ui/) - set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(source_files - vvMainWindow.h - vvMainWindow.ui - vvResources.qrc - vvMainWindow.cxx - vvMainWindow.h +set(sources + LidarViewMainWindow.h + LidarViewMainWindow.cxx + LidarViewMainWindow.ui ) -# Please make sure to adapt the AboutDialog text in the followin file -# Lidar\python\lidarview\aboutDialog.py -# You also need to change: -# - bottom_logo.png (bottom logo) - set(plugins_targets ParaView::paraview_plugins LidarView::lidarview_plugins @@ -42,19 +33,19 @@ paraview_client_add( APPLICATION_NAME "LidarView" ORGANIZATION "${SOFTWARE_VENDOR}" TITLE "${SOFTWARE_NAME} ${LV_VERSION_FULL} ${LV_BUILD_PLATFORM}" - SPLASH_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/SoftwareInformation/Splash.jpg" - BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/logo.icns" - APPLICATION_ICON "${CMAKE_CURRENT_SOURCE_DIR}/SoftwareInformation/logo.ico" + SPLASH_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Images/Splash.jpg" + BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Images/logo.icns" + APPLICATION_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Images/logo.ico" PLUGINS_TARGETS ${plugins_targets} REQUIRED_PLUGINS PythonQtPlugin LidarCorePlugin - MAIN_WINDOW_CLASS vvMainWindow - MAIN_WINDOW_INCLUDE vvMainWindow.h - SOURCES ${source_files} + MAIN_WINDOW_CLASS LidarViewMainWindow + MAIN_WINDOW_INCLUDE LidarViewMainWindow.h + SOURCES ${sources} APPLICATION_XMLS - ${CMAKE_CURRENT_SOURCE_DIR}/lqSources.xml - ${CMAKE_CURRENT_SOURCE_DIR}/lqFilters.xml + ${CMAKE_CURRENT_SOURCE_DIR}/LidarViewSources.xml + ${CMAKE_CURRENT_SOURCE_DIR}/LidarViewFilters.xml RUNTIME_DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY_DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/Application/vvMainWindow.cxx b/Application/Client/LidarViewMainWindow.cxx similarity index 95% rename from Application/vvMainWindow.cxx rename to Application/Client/LidarViewMainWindow.cxx index 178b84b13..2e743e941 100644 --- a/Application/vvMainWindow.cxx +++ b/Application/Client/LidarViewMainWindow.cxx @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "vvMainWindow.h" -#include "ui_vvMainWindow.h" +#include "LidarViewMainWindow.h" +#include "ui_LidarViewMainWindow.h" #include "lqDockableSpreadSheetReaction.h" #include "lqEnableAdvancedArraysReaction.h" @@ -77,17 +77,17 @@ typedef pqPythonDebugLeaksView DebugLeaksViewType; #include "lqViewFrameActions.h" //----------------------------------------------------------------------------- -class vvMainWindow::pqInternals : public Ui::vvMainWindow +class LidarViewMainWindow::pqInternals : public Ui::LidarViewMainWindow { public: pqInternals() - : Ui::vvMainWindow() + : Ui::LidarViewMainWindow() { } }; //----------------------------------------------------------------------------- -vvMainWindow::vvMainWindow() +LidarViewMainWindow::LidarViewMainWindow() { // ParaView Init Start // DebugLeaksView MUST be instantiated first @@ -156,14 +156,14 @@ vvMainWindow::vvMainWindow() } //----------------------------------------------------------------------------- -vvMainWindow::~vvMainWindow() +LidarViewMainWindow::~LidarViewMainWindow() { delete this->Internals; this->Internals = NULL; } //----------------------------------------------------------------------------- -void vvMainWindow::setupPVGUI() +void LidarViewMainWindow::setupPVGUI() { // Common Parts of the ParaViewMainWindow.cxx // Easily updatable and referenceable @@ -289,7 +289,7 @@ void vvMainWindow::setupPVGUI() } //----------------------------------------------------------------------------- -void vvMainWindow::pqbuildToolbars() +void LidarViewMainWindow::pqbuildToolbars() { // Rework of pqParaViewMenuBuilders::buildToolbars // Removed pqMainControlsToolbar, pqVCRToolbar, pqAnimationTimeToolbar, @@ -314,7 +314,7 @@ void vvMainWindow::pqbuildToolbars() } //----------------------------------------------------------------------------- -void vvMainWindow::setupLVGUI() +void LidarViewMainWindow::setupLVGUI() { // Add generally common elements to all LidarView-based apps // Not necessarilly verbatim Paraview @@ -348,7 +348,7 @@ void vvMainWindow::setupLVGUI() } //----------------------------------------------------------------------------- -void vvMainWindow::setupGUICustom() +void LidarViewMainWindow::setupGUICustom() { // LidarView Specific UI elements @@ -462,7 +462,7 @@ void vvMainWindow::setupGUICustom() } //----------------------------------------------------------------------------- -void vvMainWindow::setBranding() +void LidarViewMainWindow::setBranding() { // For good measure #ifndef SOFTWARE_NAME @@ -491,13 +491,13 @@ void vvMainWindow::setBranding() } //----------------------------------------------------------------------------- -void vvMainWindow::dragEnterEvent(QDragEnterEvent* evt) +void LidarViewMainWindow::dragEnterEvent(QDragEnterEvent* evt) { pqApplicationCore::instance()->getMainWindowEventManager()->dragEnterEvent(evt); } //----------------------------------------------------------------------------- -void vvMainWindow::showEvent(QShowEvent* evt) +void LidarViewMainWindow::showEvent(QShowEvent* evt) { // TODO PV uses it to show Welcome Message once // could also be used for the "first startup" stuff @@ -505,13 +505,13 @@ void vvMainWindow::showEvent(QShowEvent* evt) } //----------------------------------------------------------------------------- -void vvMainWindow::closeEvent(QCloseEvent* evt) +void LidarViewMainWindow::closeEvent(QCloseEvent* evt) { pqApplicationCore::instance()->getMainWindowEventManager()->closeEvent(evt); } //----------------------------------------------------------------------------- -void vvMainWindow::dropEvent(QDropEvent* evt) +void LidarViewMainWindow::dropEvent(QDropEvent* evt) { QList urls = evt->mimeData()->urls(); if (urls.isEmpty()) @@ -551,13 +551,13 @@ void vvMainWindow::dropEvent(QDropEvent* evt) } //----------------------------------------------------------------------------- -void vvMainWindow::showHelpForProxy(const QString& groupname, const QString& proxyname) +void LidarViewMainWindow::showHelpForProxy(const QString& groupname, const QString& proxyname) { pqHelpReaction::showProxyHelp(groupname, proxyname); } //----------------------------------------------------------------------------- -void vvMainWindow::handleMessage(const QString&, int type) +void LidarViewMainWindow::handleMessage(const QString&, int type) { QDockWidget* dock = this->Internals->outputWidgetDock; if (!dock) @@ -587,7 +587,7 @@ void vvMainWindow::handleMessage(const QString&, int type) } //----------------------------------------------------------------------------- -void vvMainWindow::toggleMVDecoration() +void LidarViewMainWindow::toggleMVDecoration() { // pqTabbedMultiViewWidget::setDecorationsVisibility() pqTabbedMultiViewWidget* mv = qobject_cast(this->centralWidget()); diff --git a/Application/vvMainWindow.h b/Application/Client/LidarViewMainWindow.h similarity index 89% rename from Application/vvMainWindow.h rename to Application/Client/LidarViewMainWindow.h index 1c3bdda40..a51934ce4 100644 --- a/Application/vvMainWindow.h +++ b/Application/Client/LidarViewMainWindow.h @@ -11,21 +11,22 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef __vvMainWindow_h -#define __vvMainWindow_h + +#ifndef LidarViewMainWindow_h +#define LidarViewMainWindow_h #include class pqDataRepresentation; -class vvMainWindow : public QMainWindow +class LidarViewMainWindow : public QMainWindow { Q_OBJECT typedef QMainWindow Superclass; public: - vvMainWindow(); - virtual ~vvMainWindow() override; + LidarViewMainWindow(); + virtual ~LidarViewMainWindow() override; protected: void dragEnterEvent(QDragEnterEvent* evt) override; @@ -42,7 +43,7 @@ protected Q_SLOTS: void toggleMVDecoration(); // Toggle Multiview decorations private: - Q_DISABLE_COPY(vvMainWindow) + Q_DISABLE_COPY(LidarViewMainWindow) class pqInternals; pqInternals* Internals; diff --git a/Application/vvMainWindow.ui b/Application/Client/LidarViewMainWindow.ui similarity index 92% rename from Application/vvMainWindow.ui rename to Application/Client/LidarViewMainWindow.ui index 35bb4df58..87741b308 100644 --- a/Application/vvMainWindow.ui +++ b/Application/Client/LidarViewMainWindow.ui @@ -1,7 +1,7 @@ - vvMainWindow - + LidarViewMainWindow + 0 @@ -17,8 +17,8 @@ MainWindow - - :/vvResources/Icons/logo.png:/vvResources/Icons/logo.png + + :/lvResources/Icons/logo.png:/lvResources/Icons/logo.png @@ -379,8 +379,8 @@ true - - :/vvResources/Icons/pqFrustumSelectionPoint24.png:/vvResources/Icons/pqFrustumSelectionPoint24.png + + :/lvResources/Icons/pqFrustumSelectionPoint24.png:/lvResources/Icons/pqFrustumSelectionPoint24.png Select Points @@ -394,8 +394,8 @@ true - - :/vvResources/Icons/pqSpreadsheet16.png:/vvResources/Icons/pqSpreadsheet16.png + + :/lvResources/Icons/pqSpreadsheet16.png:/lvResources/Icons/pqSpreadsheet16.png Spreadsheet @@ -457,8 +457,8 @@ - - :/vvResources/Icons/python_logo_124.png:/vvResources/Icons/python_logo_124.png + + :/lvResources/Icons/python_logo_124.png:/lvResources/Icons/python_logo_124.png Python Console @@ -610,8 +610,8 @@ - :/vvResources/Icons/ViewOrtho.png - :/vvResources/Icons/ViewPerspective.png:/vvResources/Icons/ViewOrtho.png + :/lvResources/Icons/ViewOrtho.png + :/lvResources/Icons/ViewPerspective.png:/lvResources/Icons/ViewOrtho.png toggleProjection @@ -625,8 +625,8 @@ false - - :/vvResources/Icons/Measurements.png:/vvResources/Icons/Measurements.png + + :/lvResources/Icons/Measurements.png:/lvResources/Icons/Measurements.png Advanced Selection and Measurement options @@ -637,8 +637,8 @@ - - :/vvResources/Icons/planefit.png:/vvResources/Icons/planefit.png + + :/lvResources/Icons/planefit.png:/lvResources/Icons/planefit.png Plane Fit @@ -649,8 +649,8 @@ - - :/vvResources/Icons/pqSpreadsheet16.png:/vvResources/Icons/pqSpreadsheet16.png + + :/lvResources/Icons/pqSpreadsheet16.png:/lvResources/Icons/pqSpreadsheet16.png Save Position CSV... @@ -661,8 +661,8 @@ true - - :/vvResources/Icons/location.png:/vvResources/Icons/location.png + + :/lvResources/Icons/location.png:/lvResources/Icons/location.png GPSApply @@ -676,8 +676,8 @@ true - - :/vvResources/Icons/absolute.png:/vvResources/Icons/absolute.png + + :/lvResources/Icons/absolute.png:/lvResources/Icons/absolute.png absolute @@ -734,8 +734,8 @@ - - :/vvResources/Icons/errorConsole.png:/vvResources/Icons/errorConsole.png + + :/lvResources/Icons/errorConsole.png:/lvResources/Icons/errorConsole.png Error Console @@ -772,8 +772,8 @@ true - - :/vvResources/Icons/map.png:/vvResources/Icons/map.png + + :/lvResources/Icons/map.png:/lvResources/Icons/map.png actionShowPosition @@ -837,14 +837,14 @@ - + actionE_xit triggered() - vvMainWindow + LidarViewMainWindow close() diff --git a/Application/Icons/Measurements.png b/Application/Client/Resources/Icons/Measurements.png similarity index 100% rename from Application/Icons/Measurements.png rename to Application/Client/Resources/Icons/Measurements.png diff --git a/Application/Icons/ViewOrtho.png b/Application/Client/Resources/Icons/ViewOrtho.png similarity index 100% rename from Application/Icons/ViewOrtho.png rename to Application/Client/Resources/Icons/ViewOrtho.png diff --git a/Application/Icons/ViewPerspective.png b/Application/Client/Resources/Icons/ViewPerspective.png similarity index 100% rename from Application/Icons/ViewPerspective.png rename to Application/Client/Resources/Icons/ViewPerspective.png diff --git a/Application/Icons/absolute.png b/Application/Client/Resources/Icons/absolute.png similarity index 100% rename from Application/Icons/absolute.png rename to Application/Client/Resources/Icons/absolute.png diff --git a/Application/Icons/camera_logo.png b/Application/Client/Resources/Icons/camera_logo.png similarity index 100% rename from Application/Icons/camera_logo.png rename to Application/Client/Resources/Icons/camera_logo.png diff --git a/Application/Icons/errorConsole.png b/Application/Client/Resources/Icons/errorConsole.png similarity index 100% rename from Application/Icons/errorConsole.png rename to Application/Client/Resources/Icons/errorConsole.png diff --git a/Application/Icons/icon_motion.png b/Application/Client/Resources/Icons/icon_motion.png similarity index 100% rename from Application/Icons/icon_motion.png rename to Application/Client/Resources/Icons/icon_motion.png diff --git a/Application/Icons/location.png b/Application/Client/Resources/Icons/location.png similarity index 100% rename from Application/Icons/location.png rename to Application/Client/Resources/Icons/location.png diff --git a/Application/Icons/logo.png b/Application/Client/Resources/Icons/logo.png similarity index 100% rename from Application/Icons/logo.png rename to Application/Client/Resources/Icons/logo.png diff --git a/Application/Icons/map.png b/Application/Client/Resources/Icons/map.png similarity index 100% rename from Application/Icons/map.png rename to Application/Client/Resources/Icons/map.png diff --git a/Application/Icons/open.png b/Application/Client/Resources/Icons/open.png similarity index 100% rename from Application/Icons/open.png rename to Application/Client/Resources/Icons/open.png diff --git a/Application/Icons/planefit.png b/Application/Client/Resources/Icons/planefit.png similarity index 100% rename from Application/Icons/planefit.png rename to Application/Client/Resources/Icons/planefit.png diff --git a/Application/Icons/pqFrustumSelectionPoint24.png b/Application/Client/Resources/Icons/pqFrustumSelectionPoint24.png similarity index 100% rename from Application/Icons/pqFrustumSelectionPoint24.png rename to Application/Client/Resources/Icons/pqFrustumSelectionPoint24.png diff --git a/Application/Icons/pqResetCamera32.png b/Application/Client/Resources/Icons/pqResetCamera32.png similarity index 100% rename from Application/Icons/pqResetCamera32.png rename to Application/Client/Resources/Icons/pqResetCamera32.png diff --git a/Application/Icons/pqSpreadsheet16.png b/Application/Client/Resources/Icons/pqSpreadsheet16.png similarity index 100% rename from Application/Icons/pqSpreadsheet16.png rename to Application/Client/Resources/Icons/pqSpreadsheet16.png diff --git a/Application/Icons/pqSurfaceSelectionPoint24.png b/Application/Client/Resources/Icons/pqSurfaceSelectionPoint24.png similarity index 100% rename from Application/Icons/pqSurfaceSelectionPoint24.png rename to Application/Client/Resources/Icons/pqSurfaceSelectionPoint24.png diff --git a/Application/Icons/python_logo_124.png b/Application/Client/Resources/Icons/python_logo_124.png similarity index 100% rename from Application/Icons/python_logo_124.png rename to Application/Client/Resources/Icons/python_logo_124.png diff --git a/Application/SoftwareInformation/About.png b/Application/Client/Resources/Images/About.png similarity index 100% rename from Application/SoftwareInformation/About.png rename to Application/Client/Resources/Images/About.png diff --git a/Application/SoftwareInformation/LidarView-splash.svg b/Application/Client/Resources/Images/LidarView-splash.svg similarity index 99% rename from Application/SoftwareInformation/LidarView-splash.svg rename to Application/Client/Resources/Images/LidarView-splash.svg index c4b65a86a..460c2d9b7 100644 --- a/Application/SoftwareInformation/LidarView-splash.svg +++ b/Application/Client/Resources/Images/LidarView-splash.svg @@ -9,7 +9,7 @@ version="1.1" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" sodipodi:docname="LidarView-splash.svg" - inkscape:export-filename="/home/tcouble/Documents/Projects/Lidarview/lidarview/Application/SoftwareInformation/About.png" + inkscape:export-filename="/home/tcouble/Documents/Projects/Lidarview/lidarview/Application/Client/Resources/Images/About.png" inkscape:export-xdpi="59.882999" inkscape:export-ydpi="59.882999" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" diff --git a/Application/SoftwareInformation/LidarViewExample.png b/Application/Client/Resources/Images/LidarViewExample.png similarity index 100% rename from Application/SoftwareInformation/LidarViewExample.png rename to Application/Client/Resources/Images/LidarViewExample.png diff --git a/Application/SoftwareInformation/LidarViewLayout.svg b/Application/Client/Resources/Images/LidarViewLayout.svg similarity index 100% rename from Application/SoftwareInformation/LidarViewLayout.svg rename to Application/Client/Resources/Images/LidarViewLayout.svg diff --git a/Application/SoftwareInformation/LidarViewLogo.svg b/Application/Client/Resources/Images/LidarViewLogo.svg similarity index 100% rename from Application/SoftwareInformation/LidarViewLogo.svg rename to Application/Client/Resources/Images/LidarViewLogo.svg diff --git a/Application/SoftwareInformation/LidarViewMark.svg b/Application/Client/Resources/Images/LidarViewMark.svg similarity index 100% rename from Application/SoftwareInformation/LidarViewMark.svg rename to Application/Client/Resources/Images/LidarViewMark.svg diff --git a/Application/SoftwareInformation/ParaviewLidar.svg b/Application/Client/Resources/Images/ParaviewLidar.svg similarity index 100% rename from Application/SoftwareInformation/ParaviewLidar.svg rename to Application/Client/Resources/Images/ParaviewLidar.svg diff --git a/Application/SoftwareInformation/Splash.jpg b/Application/Client/Resources/Images/Splash.jpg similarity index 100% rename from Application/SoftwareInformation/Splash.jpg rename to Application/Client/Resources/Images/Splash.jpg diff --git a/Application/SoftwareInformation/bottom_logo.png b/Application/Client/Resources/Images/bottom_logo.png similarity index 100% rename from Application/SoftwareInformation/bottom_logo.png rename to Application/Client/Resources/Images/bottom_logo.png diff --git a/Application/logo.icns b/Application/Client/Resources/Images/logo.icns similarity index 100% rename from Application/logo.icns rename to Application/Client/Resources/Images/logo.icns diff --git a/Application/SoftwareInformation/logo.ico b/Application/Client/Resources/Images/logo.ico similarity index 100% rename from Application/SoftwareInformation/logo.ico rename to Application/Client/Resources/Images/logo.ico diff --git a/Application/vvAboutDialog.ui b/Application/Client/Resources/lvAboutDialog.ui similarity index 93% rename from Application/vvAboutDialog.ui rename to Application/Client/Resources/lvAboutDialog.ui index e82c46fee..ab6ac35d0 100644 --- a/Application/vvAboutDialog.ui +++ b/Application/Client/Resources/lvAboutDialog.ui @@ -1,7 +1,7 @@ - vvAboutDialog - + lvAboutDialog + 0 @@ -51,7 +51,7 @@ - :/vvResources/SoftwareInformation/About.png + :/lvResources/Client/Resources/Images/About.png true @@ -119,7 +119,7 @@ - + diff --git a/Application/vvResources.qrc b/Application/Client/Resources/lvResources.qrc similarity index 79% rename from Application/vvResources.qrc rename to Application/Client/Resources/lvResources.qrc index a4929eae8..0c63c03d0 100644 --- a/Application/vvResources.qrc +++ b/Application/Client/Resources/lvResources.qrc @@ -1,5 +1,5 @@ - + Icons/logo.png Icons/open.png Icons/map.png @@ -13,9 +13,9 @@ Icons/python_logo_124.png Icons/ViewPerspective.png Icons/Measurements.png - SoftwareInformation/About.png - SoftwareInformation/bottom_logo.png - vvAboutDialog.ui + Images/About.png + Images/bottom_logo.png + lvAboutDialog.ui Icons/errorConsole.png Icons/camera_logo.png Icons/icon_motion.png diff --git a/Application/lqFilters.xml b/Application/Client/lvFilters.xml similarity index 100% rename from Application/lqFilters.xml rename to Application/Client/lvFilters.xml diff --git a/Application/lqSources.xml b/Application/Client/lvSources.xml similarity index 100% rename from Application/lqSources.xml rename to Application/Client/lvSources.xml diff --git a/CMake/SetBranding.cmake b/CMake/SetBranding.cmake index c481c4d89..7d8d579eb 100644 --- a/CMake/SetBranding.cmake +++ b/CMake/SetBranding.cmake @@ -4,7 +4,3 @@ set(SOFTWARE_NAME "LidarView") set(SOFTWARE_VENDOR "Kitware") set(SOFTWARE_TARGET "LidarView::LidarView") - -# Software LOGO / ICON # Must be absolute to be used by packaging -set(SOFTWARE_ICON_PATH "${CMAKE_CURRENT_LIST_DIR}/SoftwareInformation/logo.ico") -#set(SOFTWARE_LOGO_PATH "${CMAKE_CURRENT_LIST_DIR}/logo.icns") #WIP no wish to use those in paraview_client_add() yet diff --git a/Wrapping/Python/lidarview/aboutDialog.py b/Wrapping/Python/lidarview/aboutDialog.py index e6b2ead56..453cb9f21 100644 --- a/Wrapping/Python/lidarview/aboutDialog.py +++ b/Wrapping/Python/lidarview/aboutDialog.py @@ -17,7 +17,7 @@ from PythonQt import QtCore, QtGui, QtUiTools def showDialog(mainWindow): loader = QtUiTools.QUiLoader() - uifile = QtCore.QFile(':/vvResources/vvAboutDialog.ui') + uifile = QtCore.QFile(':/lvResources/lvAboutDialog.ui') if not uifile.open(uifile.ReadOnly): print("Canno't open the ui for the about dialog.") return diff --git a/Wrapping/Python/lidarview/applogic.py b/Wrapping/Python/lidarview/applogic.py index a43e0c0a8..39e0f7639 100644 --- a/Wrapping/Python/lidarview/applogic.py +++ b/Wrapping/Python/lidarview/applogic.py @@ -869,7 +869,7 @@ def findQObjectByName(widgets, name): def getMainWindow(): - return findQObjectByName(QtGui.QApplication.topLevelWidgets(), 'vvMainWindow') + return findQObjectByName(QtGui.QApplication.topLevelWidgets(), 'LidarViewMainWindow') def getPVApplicationCore(): -- GitLab From 43175978f123c7c63a159a76ae89595aba6e2e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 10:45:29 +0200 Subject: [PATCH 2/9] [refact] Move all icons to the same directory --- Application/Client/CMakeLists.txt | 12 ++++--- Application/Client/LidarViewMainWindow.cxx | 2 +- Application/Client/LidarViewMainWindow.ui | 32 +++++++++--------- .../Resources/Icons}/WiresharkDoc-128.png | Bin .../Resources/Icons}/calibrate.png | Bin .../Resources/Icons}/calibrate.svg | 0 .../Resources/Icons}/connect.png | Bin .../Resources/Icons}/connect.svg | 0 .../Resources/Icons}/connect_icon.png | Bin .../Resources/Icons}/crop.png | Bin .../Resources/Icons}/crop.svg | 0 .../images => Client/Resources/Icons}/csv.png | Bin .../images => Client/Resources/Icons}/gps.png | Bin .../images => Client/Resources/Icons}/gps.svg | 0 .../Resources/Icons}/kiwi_200.png | Bin .../images => Client/Resources/Icons}/las.png | Bin .../images => Client/Resources/Icons}/las.svg | 0 .../Resources/Icons}/lidar.png | Bin .../Resources/Icons}/media-eject.png | Bin .../Icons}/preferences-system-64.png | Bin .../Resources/Icons}/trailingframes.png | Bin .../{lvAboutDialog.ui => lqAboutDialog.ui} | 6 ++-- .../Resources/lqGridAdjustmentDialog.ui} | 0 Application/Client/Resources/lvResources.qrc | 32 ++++++++++++------ Application/Ui/Widgets/images/resources.qrc | 16 --------- 25 files changed, 50 insertions(+), 50 deletions(-) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/WiresharkDoc-128.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/calibrate.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/calibrate.svg (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/connect.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/connect.svg (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/connect_icon.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/crop.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/crop.svg (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/csv.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/gps.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/gps.svg (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/kiwi_200.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/las.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/las.svg (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/lidar.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/media-eject.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/preferences-system-64.png (100%) rename Application/{Ui/Widgets/images => Client/Resources/Icons}/trailingframes.png (100%) rename Application/Client/Resources/{lvAboutDialog.ui => lqAboutDialog.ui} (94%) rename Application/{Ui/Widgets/images/vvGridAdjustmentDialog.ui => Client/Resources/lqGridAdjustmentDialog.ui} (100%) delete mode 100644 Application/Ui/Widgets/images/resources.qrc diff --git a/Application/Client/CMakeLists.txt b/Application/Client/CMakeLists.txt index c221f2d71..52d664aee 100644 --- a/Application/Client/CMakeLists.txt +++ b/Application/Client/CMakeLists.txt @@ -16,6 +16,10 @@ set(sources LidarViewMainWindow.ui ) +set(resource_files + Resources/lvResources.qrc +) + set(plugins_targets ParaView::paraview_plugins LidarView::lidarview_plugins @@ -42,10 +46,10 @@ paraview_client_add( MAIN_WINDOW_CLASS LidarViewMainWindow MAIN_WINDOW_INCLUDE LidarViewMainWindow.h - SOURCES ${sources} + SOURCES ${sources} ${resource_files} APPLICATION_XMLS - ${CMAKE_CURRENT_SOURCE_DIR}/LidarViewSources.xml - ${CMAKE_CURRENT_SOURCE_DIR}/LidarViewFilters.xml + ${CMAKE_CURRENT_SOURCE_DIR}/lvSources.xml + ${CMAKE_CURRENT_SOURCE_DIR}/lvFilters.xml RUNTIME_DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY_DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -60,7 +64,7 @@ target_include_directories(${SOFTWARE_NAME} target_link_libraries(${SOFTWARE_NAME} PRIVATE LidarView::lqApplicationComponents # Common LVCore code base - ApplicationUi + LidarViewApp::lvApplicationComponents # Specific LidarView code base ) # Bundle Icon on Apple diff --git a/Application/Client/LidarViewMainWindow.cxx b/Application/Client/LidarViewMainWindow.cxx index 2e743e941..3c180abc5 100644 --- a/Application/Client/LidarViewMainWindow.cxx +++ b/Application/Client/LidarViewMainWindow.cxx @@ -521,7 +521,7 @@ void LidarViewMainWindow::dropEvent(QDropEvent* evt) QList files; - foreach (QUrl url, urls) + Q_FOREACH (QUrl url, urls) { if (!url.toLocalFile().isEmpty()) { diff --git a/Application/Client/LidarViewMainWindow.ui b/Application/Client/LidarViewMainWindow.ui index 87741b308..9b9068f5e 100644 --- a/Application/Client/LidarViewMainWindow.ui +++ b/Application/Client/LidarViewMainWindow.ui @@ -358,8 +358,8 @@ - - :/LidarViewPlugin/WiresharkDoc-128.png:/LidarViewPlugin/WiresharkDoc-128.png + + :/lvResources/Icons/WiresharkDoc-128.png:/lvResources/Icons/WiresharkDoc-128.png &Capture File... @@ -409,8 +409,8 @@ - - :/LidarViewPlugin/lidar.png:/LidarViewPlugin/lidar.png + + :/lvResources/Icons/lidar.png:/lvResources/Icons/lidar.png Sensor &Stream... @@ -418,7 +418,7 @@ - + :/lqResources/Icons/pqSaveState.png:/lqResources/Icons/pqSaveState.png @@ -427,7 +427,7 @@ - + :/lqResources/Icons/pqLoadState.png:/lqResources/Icons/pqLoadState.png @@ -436,8 +436,8 @@ - - :/LidarViewPlugin/calibrate.png:/LidarViewPlugin/calibrate.png + + :/lvResources/Icons/calibrate.png:/lvResources/Icons/calibrate.png Choose &Calibration File... @@ -445,8 +445,8 @@ - - :/LidarViewPlugin/media-playback-pause.png:/LidarViewPlugin/media-playback-pause.png + + :/lvResources/Icons/media-playback-pause.png:/lvResources/Icons/media-playback-pause.png Pause @@ -500,7 +500,7 @@ - :/LidarViewPlugin/csv.png:/LidarViewPlugin/csv.png + :/lvResources/Icons/csv.png:/lvResources/Icons/csv.png Save &CSV... @@ -514,7 +514,7 @@ - :/LidarViewPlugin/WiresharkDoc-128.png:/LidarViewPlugin/WiresharkDoc-128.png + :/lvResources/Icons/WiresharkDoc-128.png:/lvResources/Icons/WiresharkDoc-128.png Save PCAP... @@ -689,7 +689,7 @@ - :/LidarViewPlugin/las.png:/LidarViewPlugin/las.png + :/lvResources/Icons/las.png:/lvResources/Icons/las.png Save &LAS @@ -701,7 +701,7 @@ - :/LidarViewPlugin/crop.png:/LidarViewPlugin/crop.png + :/lvResources/Icons/crop.png:/lvResources/Icons/crop.png Crop Returns... @@ -746,7 +746,7 @@ - + :/lqResources/Icons/EnableAdvancedArrays.png:/lqResources/Icons/EnableAdvancedArrays.png @@ -838,7 +838,7 @@ - + diff --git a/Application/Ui/Widgets/images/WiresharkDoc-128.png b/Application/Client/Resources/Icons/WiresharkDoc-128.png similarity index 100% rename from Application/Ui/Widgets/images/WiresharkDoc-128.png rename to Application/Client/Resources/Icons/WiresharkDoc-128.png diff --git a/Application/Ui/Widgets/images/calibrate.png b/Application/Client/Resources/Icons/calibrate.png similarity index 100% rename from Application/Ui/Widgets/images/calibrate.png rename to Application/Client/Resources/Icons/calibrate.png diff --git a/Application/Ui/Widgets/images/calibrate.svg b/Application/Client/Resources/Icons/calibrate.svg similarity index 100% rename from Application/Ui/Widgets/images/calibrate.svg rename to Application/Client/Resources/Icons/calibrate.svg diff --git a/Application/Ui/Widgets/images/connect.png b/Application/Client/Resources/Icons/connect.png similarity index 100% rename from Application/Ui/Widgets/images/connect.png rename to Application/Client/Resources/Icons/connect.png diff --git a/Application/Ui/Widgets/images/connect.svg b/Application/Client/Resources/Icons/connect.svg similarity index 100% rename from Application/Ui/Widgets/images/connect.svg rename to Application/Client/Resources/Icons/connect.svg diff --git a/Application/Ui/Widgets/images/connect_icon.png b/Application/Client/Resources/Icons/connect_icon.png similarity index 100% rename from Application/Ui/Widgets/images/connect_icon.png rename to Application/Client/Resources/Icons/connect_icon.png diff --git a/Application/Ui/Widgets/images/crop.png b/Application/Client/Resources/Icons/crop.png similarity index 100% rename from Application/Ui/Widgets/images/crop.png rename to Application/Client/Resources/Icons/crop.png diff --git a/Application/Ui/Widgets/images/crop.svg b/Application/Client/Resources/Icons/crop.svg similarity index 100% rename from Application/Ui/Widgets/images/crop.svg rename to Application/Client/Resources/Icons/crop.svg diff --git a/Application/Ui/Widgets/images/csv.png b/Application/Client/Resources/Icons/csv.png similarity index 100% rename from Application/Ui/Widgets/images/csv.png rename to Application/Client/Resources/Icons/csv.png diff --git a/Application/Ui/Widgets/images/gps.png b/Application/Client/Resources/Icons/gps.png similarity index 100% rename from Application/Ui/Widgets/images/gps.png rename to Application/Client/Resources/Icons/gps.png diff --git a/Application/Ui/Widgets/images/gps.svg b/Application/Client/Resources/Icons/gps.svg similarity index 100% rename from Application/Ui/Widgets/images/gps.svg rename to Application/Client/Resources/Icons/gps.svg diff --git a/Application/Ui/Widgets/images/kiwi_200.png b/Application/Client/Resources/Icons/kiwi_200.png similarity index 100% rename from Application/Ui/Widgets/images/kiwi_200.png rename to Application/Client/Resources/Icons/kiwi_200.png diff --git a/Application/Ui/Widgets/images/las.png b/Application/Client/Resources/Icons/las.png similarity index 100% rename from Application/Ui/Widgets/images/las.png rename to Application/Client/Resources/Icons/las.png diff --git a/Application/Ui/Widgets/images/las.svg b/Application/Client/Resources/Icons/las.svg similarity index 100% rename from Application/Ui/Widgets/images/las.svg rename to Application/Client/Resources/Icons/las.svg diff --git a/Application/Ui/Widgets/images/lidar.png b/Application/Client/Resources/Icons/lidar.png similarity index 100% rename from Application/Ui/Widgets/images/lidar.png rename to Application/Client/Resources/Icons/lidar.png diff --git a/Application/Ui/Widgets/images/media-eject.png b/Application/Client/Resources/Icons/media-eject.png similarity index 100% rename from Application/Ui/Widgets/images/media-eject.png rename to Application/Client/Resources/Icons/media-eject.png diff --git a/Application/Ui/Widgets/images/preferences-system-64.png b/Application/Client/Resources/Icons/preferences-system-64.png similarity index 100% rename from Application/Ui/Widgets/images/preferences-system-64.png rename to Application/Client/Resources/Icons/preferences-system-64.png diff --git a/Application/Ui/Widgets/images/trailingframes.png b/Application/Client/Resources/Icons/trailingframes.png similarity index 100% rename from Application/Ui/Widgets/images/trailingframes.png rename to Application/Client/Resources/Icons/trailingframes.png diff --git a/Application/Client/Resources/lvAboutDialog.ui b/Application/Client/Resources/lqAboutDialog.ui similarity index 94% rename from Application/Client/Resources/lvAboutDialog.ui rename to Application/Client/Resources/lqAboutDialog.ui index ab6ac35d0..66901704a 100644 --- a/Application/Client/Resources/lvAboutDialog.ui +++ b/Application/Client/Resources/lqAboutDialog.ui @@ -1,7 +1,7 @@ - lvAboutDialog - + lqAboutDialog + 0 @@ -51,7 +51,7 @@ - :/lvResources/Client/Resources/Images/About.png + :/lvResources/Images/About.png true diff --git a/Application/Ui/Widgets/images/vvGridAdjustmentDialog.ui b/Application/Client/Resources/lqGridAdjustmentDialog.ui similarity index 100% rename from Application/Ui/Widgets/images/vvGridAdjustmentDialog.ui rename to Application/Client/Resources/lqGridAdjustmentDialog.ui diff --git a/Application/Client/Resources/lvResources.qrc b/Application/Client/Resources/lvResources.qrc index 0c63c03d0..1c960cdbb 100644 --- a/Application/Client/Resources/lvResources.qrc +++ b/Application/Client/Resources/lvResources.qrc @@ -1,23 +1,35 @@ + Icons/absolute.png + Icons/calibrate.png + Icons/camera_logo.png + Icons/crop.png + Icons/csv.png + Icons/errorConsole.png + Icons/gps.png + Icons/icon_motion.png + Icons/kiwi_200.png + Icons/las.png + Icons/lidar.png + Icons/location.png Icons/logo.png - Icons/open.png Icons/map.png - Icons/location.png + Icons/Measurements.png + Icons/media-eject.png + Icons/open.png Icons/planefit.png - Icons/absolute.png Icons/pqFrustumSelectionPoint24.png - Icons/pqSurfaceSelectionPoint24.png - Icons/pqSpreadsheet16.png Icons/pqResetCamera32.png + Icons/pqSpreadsheet16.png + Icons/pqSurfaceSelectionPoint24.png + Icons/preferences-system-64.png Icons/python_logo_124.png + Icons/trailingframes.png Icons/ViewPerspective.png - Icons/Measurements.png + Icons/WiresharkDoc-128.png Images/About.png Images/bottom_logo.png - lvAboutDialog.ui - Icons/errorConsole.png - Icons/camera_logo.png - Icons/icon_motion.png + lqAboutDialog.ui + lqGridAdjustmentDialog.ui diff --git a/Application/Ui/Widgets/images/resources.qrc b/Application/Ui/Widgets/images/resources.qrc deleted file mode 100644 index c63c48fa3..000000000 --- a/Application/Ui/Widgets/images/resources.qrc +++ /dev/null @@ -1,16 +0,0 @@ - - - crop.png - gps.png - las.png - trailingframes.png - media-eject.png - WiresharkDoc-128.png - lidar.png - kiwi_200.png - preferences-system-64.png - calibrate.png - csv.png - vvGridAdjustmentDialog.ui - - -- GitLab From 454859e1bcab3dc31fb6946112ebfb5eb594a7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 10:47:34 +0200 Subject: [PATCH 3/9] [refact] Create vtk module for LidarView QtComponents --- Application/Qt/Components/CMakeLists.txt | 38 +++++ .../Resources/UI/lqCalibrationDialog.ui} | 8 +- .../Resources/UI/lqCropReturnsDialog.ui} | 8 +- .../Resources/UI/lqSelectFramesDialog.ui} | 8 +- .../Components/lqCalibrationDialog.cxx} | 140 +++++++++--------- .../Components/lqCalibrationDialog.h} | 22 +-- .../Components/lqCalibrationStructs.h} | 6 +- .../Components/lqCropReturnsDialog.cxx} | 58 ++++---- .../Components/lqCropReturnsDialog.h} | 16 +- .../Components/lqSelectFramesDialog.cxx} | 62 ++++---- .../Components/lqSelectFramesDialog.h} | 16 +- Application/Qt/Components/vtk.module | 11 ++ 12 files changed, 224 insertions(+), 169 deletions(-) create mode 100644 Application/Qt/Components/CMakeLists.txt rename Application/{Ui/Widgets/vvCalibrationDialog.ui => Qt/Components/Resources/UI/lqCalibrationDialog.ui} (99%) rename Application/{Ui/Widgets/vvCropReturnsDialog.ui => Qt/Components/Resources/UI/lqCropReturnsDialog.ui} (97%) rename Application/{Ui/Widgets/vvSelectFramesDialog.ui => Qt/Components/Resources/UI/lqSelectFramesDialog.ui} (97%) rename Application/{Ui/Widgets/vvCalibrationDialog.cxx => Qt/Components/lqCalibrationDialog.cxx} (91%) rename Application/{Ui/Widgets/vvCalibrationDialog.h => Qt/Components/lqCalibrationDialog.h} (84%) rename Application/{Ui/Widgets/vvCalibrationStructs.h => Qt/Components/lqCalibrationStructs.h} (91%) rename Application/{Ui/Widgets/vvCropReturnsDialog.cxx => Qt/Components/lqCropReturnsDialog.cxx} (90%) rename Application/{Ui/Widgets/vvCropReturnsDialog.h => Qt/Components/lqCropReturnsDialog.h} (84%) rename Application/{Ui/Widgets/vvSelectFramesDialog.cxx => Qt/Components/lqSelectFramesDialog.cxx} (83%) rename Application/{Ui/Widgets/vvSelectFramesDialog.h => Qt/Components/lqSelectFramesDialog.h} (90%) create mode 100644 Application/Qt/Components/vtk.module diff --git a/Application/Qt/Components/CMakeLists.txt b/Application/Qt/Components/CMakeLists.txt new file mode 100644 index 000000000..433e76e1b --- /dev/null +++ b/Application/Qt/Components/CMakeLists.txt @@ -0,0 +1,38 @@ +set(classes + lqCalibrationDialog + lqCropReturnsDialog + lqSelectFramesDialog +) + +set(headers + lqCalibrationStructs.h +) + +set(ui_files + Resources/UI/lqCalibrationDialog.ui + Resources/UI/lqCropReturnsDialog.ui + Resources/UI/lqSelectFramesDialog.ui) + +source_group("Resources" FILES + ${ui_files}) + +set(CMAKE_AUTOMOC 1) +set(CMAKE_AUTORCC 1) +set(CMAKE_AUTOUIC 1) +set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/UI") + +vtk_module_add_module(LidarViewApp::lvComponents + CLASSES ${classes} + HEADERS ${headers} + SOURCES ${ui_files} + ${resource_files}) +vtk_module_link(LidarViewApp::lvComponents + PRIVATE + Qt5::Core + Qt5::Widgets) +vtk_module_definitions(LidarViewApp::lvComponents + PRIVATE + QT_NO_KEYWORDS + "LIDARVIEW_BUILD_VELODYNE=$" + "LIDARVIEW_BUILD_HESAI=$" +) diff --git a/Application/Ui/Widgets/vvCalibrationDialog.ui b/Application/Qt/Components/Resources/UI/lqCalibrationDialog.ui similarity index 99% rename from Application/Ui/Widgets/vvCalibrationDialog.ui rename to Application/Qt/Components/Resources/UI/lqCalibrationDialog.ui index d9a7785c6..e840cda9c 100644 --- a/Application/Ui/Widgets/vvCalibrationDialog.ui +++ b/Application/Qt/Components/Resources/UI/lqCalibrationDialog.ui @@ -1,7 +1,7 @@ - vvCalibrationDialog - + lqCalibrationDialog + 0 @@ -716,7 +716,7 @@ ButtonBox accepted() - vvCalibrationDialog + lqCalibrationDialog accept() @@ -732,7 +732,7 @@ ButtonBox rejected() - vvCalibrationDialog + lqCalibrationDialog reject() diff --git a/Application/Ui/Widgets/vvCropReturnsDialog.ui b/Application/Qt/Components/Resources/UI/lqCropReturnsDialog.ui similarity index 97% rename from Application/Ui/Widgets/vvCropReturnsDialog.ui rename to Application/Qt/Components/Resources/UI/lqCropReturnsDialog.ui index 571005b05..d25cd1bb9 100644 --- a/Application/Ui/Widgets/vvCropReturnsDialog.ui +++ b/Application/Qt/Components/Resources/UI/lqCropReturnsDialog.ui @@ -1,7 +1,7 @@ - vvCropReturnsDialog - + lqCropReturnsDialog + 0 @@ -206,7 +206,7 @@ buttonBox accepted() - vvCropReturnsDialog + lqCropReturnsDialog accept() @@ -222,7 +222,7 @@ buttonBox rejected() - vvCropReturnsDialog + lqCropReturnsDialog reject() diff --git a/Application/Ui/Widgets/vvSelectFramesDialog.ui b/Application/Qt/Components/Resources/UI/lqSelectFramesDialog.ui similarity index 97% rename from Application/Ui/Widgets/vvSelectFramesDialog.ui rename to Application/Qt/Components/Resources/UI/lqSelectFramesDialog.ui index 7053896b8..1f0399bbc 100644 --- a/Application/Ui/Widgets/vvSelectFramesDialog.ui +++ b/Application/Qt/Components/Resources/UI/lqSelectFramesDialog.ui @@ -1,7 +1,7 @@ - vvSelectFramesDialog - + lqSelectFramesDialog + 0 @@ -228,7 +228,7 @@ buttonBox accepted() - vvSelectFramesDialog + lqSelectFramesDialog accept() @@ -244,7 +244,7 @@ buttonBox rejected() - vvSelectFramesDialog + lqSelectFramesDialog reject() diff --git a/Application/Ui/Widgets/vvCalibrationDialog.cxx b/Application/Qt/Components/lqCalibrationDialog.cxx similarity index 91% rename from Application/Ui/Widgets/vvCalibrationDialog.cxx rename to Application/Qt/Components/lqCalibrationDialog.cxx index fb31f3e7c..f6631121f 100644 --- a/Application/Ui/Widgets/vvCalibrationDialog.cxx +++ b/Application/Qt/Components/lqCalibrationDialog.cxx @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "vvCalibrationDialog.h" +#include "lqCalibrationDialog.h" -#include "ui_vvCalibrationDialog.h" +#include "ui_lqCalibrationDialog.h" #include #include @@ -33,7 +33,7 @@ #include //----------------------------------------------------------------------------- -class vvCalibrationDialog::pqInternal : public Ui::vvCalibrationDialog +class lqCalibrationDialog::pqInternal : public Ui::lqCalibrationDialog { public: pqInternal() @@ -119,14 +119,14 @@ public: }; //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveInterpreter() +void lqCalibrationDialog::pqInternal::saveInterpreter() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/Interpreter", this->InterpreterSelectionBox->currentText()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveFileList(const vvCalibration::Plugin& interpreter) +void lqCalibrationDialog::pqInternal::saveFileList(const vvCalibration::Plugin& interpreter) { int buildInFileCount = this->BuiltInCalibrationFiles[interpreter].size(); @@ -147,14 +147,14 @@ void vvCalibrationDialog::pqInternal::saveFileList(const vvCalibration::Plugin& } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveSelectedRow(const vvCalibration::Plugin& interpreter) +void lqCalibrationDialog::pqInternal::saveSelectedRow(const vvCalibration::Plugin& interpreter) { QString path = "LidarPlugin/CalibrationFileDialog/CurrentRow" + QString::number((int)interpreter); this->Settings->setValue(path, this->CalibrationFileListWidget->currentRow()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreInterpreter() +void lqCalibrationDialog::pqInternal::restoreInterpreter() { QString interpreter = this->Settings->value("LidarPlugin/CalibrationFileDialog/Interpreter").toString(); @@ -172,7 +172,7 @@ void vvCalibrationDialog::pqInternal::restoreInterpreter() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreSelectedRow(const vvCalibration::Plugin& interpreter) +void lqCalibrationDialog::pqInternal::restoreSelectedRow(const vvCalibration::Plugin& interpreter) { QString path = "LidarPlugin/CalibrationFileDialog/CurrentRow" + QString::number((int)interpreter); int row = this->Settings->value(path).toInt(); @@ -180,7 +180,7 @@ void vvCalibrationDialog::pqInternal::restoreSelectedRow(const vvCalibration::Pl } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveSensorTransform() +void lqCalibrationDialog::pqInternal::saveSensorTransform() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/LidarOriginX", this->LidarXSpinBox->value()); @@ -199,7 +199,7 @@ void vvCalibrationDialog::pqInternal::saveSensorTransform() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveGpsTransform() +void lqCalibrationDialog::pqInternal::saveGpsTransform() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/GpsOriginX", this->GpsXSpinBox->value()); @@ -221,56 +221,56 @@ void vvCalibrationDialog::pqInternal::saveGpsTransform() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveLidarPort() +void lqCalibrationDialog::pqInternal::saveLidarPort() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/LidarPort", this->LidarPortSpinBox->value()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveGpsPort() +void lqCalibrationDialog::pqInternal::saveGpsPort() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/GpsPort", this->GPSPortSpinBox->value()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveGPSForwardingPort() +void lqCalibrationDialog::pqInternal::saveGPSForwardingPort() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/GpsForwardingPort", this->GPSForwardingPortSpinBox->value()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveLidarForwardingPort() +void lqCalibrationDialog::pqInternal::saveLidarForwardingPort() { this->Settings->setValue("LidarPlugin/CalibrationFileDialog/LidarForwardingPort", this->LidarForwardingPortSpinBox->value()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveEnableForwarding() +void lqCalibrationDialog::pqInternal::saveEnableForwarding() { this->Settings->setValue("LidarPlugin/CalibrationFileDialog/EnableForwarding", this->EnableForwardingCheckBox->isChecked()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveAdvancedConfiguration() +void lqCalibrationDialog::pqInternal::saveAdvancedConfiguration() { this->Settings->setValue("LidarPlugin/CalibrationFileDialog/AdvancedConfiguration", this->AdvancedConfiguration->isChecked()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveForwardIpAddress() +void lqCalibrationDialog::pqInternal::saveForwardIpAddress() { this->Settings->setValue( "LidarPlugin/CalibrationFileDialog/ForwardIpAddress", this->ipAddresslineEdit->text()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveIsCrashAnalysing() +void lqCalibrationDialog::pqInternal::saveIsCrashAnalysing() { // Only save the state if the crash analysing is enabled if (this->CrashAnalysisCheckBox->isEnabled()) @@ -281,7 +281,7 @@ void vvCalibrationDialog::pqInternal::saveIsCrashAnalysing() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreCrashAnalysing() +void lqCalibrationDialog::pqInternal::restoreCrashAnalysing() { // Only restore the state if the crash analysing is enabled if (this->CrashAnalysisCheckBox->isEnabled()) @@ -295,7 +295,7 @@ void vvCalibrationDialog::pqInternal::restoreCrashAnalysing() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveEnableMultiSensors() +void lqCalibrationDialog::pqInternal::saveEnableMultiSensors() { // Only save the state if the crash analysing is enabled if (this->EnableMultiSensors->isEnabled()) @@ -306,7 +306,7 @@ void vvCalibrationDialog::pqInternal::saveEnableMultiSensors() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreEnableMultiSensors() +void lqCalibrationDialog::pqInternal::restoreEnableMultiSensors() { this->EnableMultiSensors->setChecked( this->Settings @@ -316,7 +316,7 @@ void vvCalibrationDialog::pqInternal::restoreEnableMultiSensors() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveEnableInterpretGPSPackets() +void lqCalibrationDialog::pqInternal::saveEnableInterpretGPSPackets() { // Only save the state if the Interpreter GPS Packet is enabled if (this->EnableInterpretGPSPackets->isEnabled()) @@ -327,7 +327,7 @@ void vvCalibrationDialog::pqInternal::saveEnableInterpretGPSPackets() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveShowFirstAndLastFrame() +void lqCalibrationDialog::pqInternal::saveShowFirstAndLastFrame() { // Only save the state if the show first and last frame option is enabled if (this->ShowFirstAndLastFrame->isEnabled()) @@ -338,7 +338,7 @@ void vvCalibrationDialog::pqInternal::saveShowFirstAndLastFrame() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::saveUseRelativeStartTime() +void lqCalibrationDialog::pqInternal::saveUseRelativeStartTime() { // Only save the state if the use relative start time option is enabled if (this->UseRelativeStartTime->isEnabled()) @@ -349,7 +349,7 @@ void vvCalibrationDialog::pqInternal::saveUseRelativeStartTime() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreEnableInterpretGPSPackets() +void lqCalibrationDialog::pqInternal::restoreEnableInterpretGPSPackets() { // Only restore the state if the Interpreter GPS Packet is enabled if (this->EnableInterpretGPSPackets->isEnabled()) @@ -363,7 +363,7 @@ void vvCalibrationDialog::pqInternal::restoreEnableInterpretGPSPackets() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreSensorTransform() +void lqCalibrationDialog::pqInternal::restoreSensorTransform() { this->LidarXSpinBox->setValue( this->Settings @@ -398,7 +398,7 @@ void vvCalibrationDialog::pqInternal::restoreSensorTransform() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreGpsTransform() +void lqCalibrationDialog::pqInternal::restoreGpsTransform() { this->GpsXSpinBox->setValue( this->Settings->value( @@ -432,7 +432,7 @@ void vvCalibrationDialog::pqInternal::restoreGpsTransform() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreLidarPort() +void lqCalibrationDialog::pqInternal::restoreLidarPort() { this->LidarPortSpinBox->setValue( this->Settings @@ -441,7 +441,7 @@ void vvCalibrationDialog::pqInternal::restoreLidarPort() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreGpsPort() +void lqCalibrationDialog::pqInternal::restoreGpsPort() { this->GPSPortSpinBox->setValue( this->Settings->value( @@ -450,7 +450,7 @@ void vvCalibrationDialog::pqInternal::restoreGpsPort() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreGPSForwardingPort() +void lqCalibrationDialog::pqInternal::restoreGPSForwardingPort() { this->GPSForwardingPortSpinBox->setValue( this->Settings @@ -460,7 +460,7 @@ void vvCalibrationDialog::pqInternal::restoreGPSForwardingPort() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreLidarForwardingPort() +void lqCalibrationDialog::pqInternal::restoreLidarForwardingPort() { this->LidarForwardingPortSpinBox->setValue( this->Settings @@ -470,7 +470,7 @@ void vvCalibrationDialog::pqInternal::restoreLidarForwardingPort() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreEnableForwarding() +void lqCalibrationDialog::pqInternal::restoreEnableForwarding() { bool tempIsChecked = this->Settings->value("LidarPlugin/CalibrationFileDialog/EnableForwarding").toBool(); @@ -478,7 +478,7 @@ void vvCalibrationDialog::pqInternal::restoreEnableForwarding() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreAdvancedConfiguration() +void lqCalibrationDialog::pqInternal::restoreAdvancedConfiguration() { bool tempIsChecked = this->Settings->value("LidarPlugin/CalibrationFileDialog/AdvancedConfiguration").toBool(); @@ -486,14 +486,14 @@ void vvCalibrationDialog::pqInternal::restoreAdvancedConfiguration() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreForwardIpAddress() +void lqCalibrationDialog::pqInternal::restoreForwardIpAddress() { this->ipAddresslineEdit->setText( this->Settings->value("LidarPlugin/CalibrationFileDialog/ForwardIpAddress").toString()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreShowFirstAndLastFrame() +void lqCalibrationDialog::pqInternal::restoreShowFirstAndLastFrame() { // Only restore the state if the show first and last frame option is enabled if (this->ShowFirstAndLastFrame->isEnabled()) @@ -507,7 +507,7 @@ void vvCalibrationDialog::pqInternal::restoreShowFirstAndLastFrame() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::pqInternal::restoreUseRelativeStartTime() +void lqCalibrationDialog::pqInternal::restoreUseRelativeStartTime() { // Only restore the state if the use relative start time option is enabled if (this->UseRelativeStartTime->isEnabled()) @@ -521,7 +521,7 @@ void vvCalibrationDialog::pqInternal::restoreUseRelativeStartTime() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::clearAdvancedSettings() +void lqCalibrationDialog::clearAdvancedSettings() { this->setDefaultConfiguration(); } @@ -547,7 +547,7 @@ QListWidgetItem* createEntry(QString path, bool useBaseName) } //----------------------------------------------------------------------------- -vvCalibrationDialog::vvCalibrationDialog(QWidget* p, bool isStreamSensor) +lqCalibrationDialog::lqCalibrationDialog(QWidget* p, bool isStreamSensor) : QDialog(p) , Internal(new pqInternal) { @@ -568,7 +568,7 @@ vvCalibrationDialog::vvCalibrationDialog(QWidget* p, bool isStreamSensor) this->Internal->ShowFirstAndLastFrame->setEnabled(!isStreamSensor); this->Internal->UseRelativeStartTime->setEnabled(!isStreamSensor); - foreach (QString interpreterName, this->Internal->AvailableInterpreters.keys()) + Q_FOREACH (QString interpreterName, this->Internal->AvailableInterpreters.keys()) { this->Internal->InterpreterSelectionBox->addItem(interpreterName); } @@ -684,8 +684,8 @@ vvCalibrationDialog::vvCalibrationDialog(QWidget* p, bool isStreamSensor) } //----------------------------------------------------------------------------- -vvCalibrationDialog::vvCalibrationDialog(vtkSMProxy* lidarProxy, vtkSMProxy* GPSProxy, QWidget* p) - : vvCalibrationDialog(p) +lqCalibrationDialog::lqCalibrationDialog(vtkSMProxy* lidarProxy, vtkSMProxy* GPSProxy, QWidget* p) + : lqCalibrationDialog(p) { if (!IsLidarProxy(lidarProxy)) { @@ -788,14 +788,14 @@ vvCalibrationDialog::vvCalibrationDialog(vtkSMProxy* lidarProxy, vtkSMProxy* GPS } //----------------------------------------------------------------------------- -vvCalibrationDialog::~vvCalibrationDialog() +lqCalibrationDialog::~lqCalibrationDialog() { this->Internal->Settings->setValue( "LidarPlugin/CalibrationFileDialog/Geometry", this->saveGeometry()); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setDefaultConfiguration() +void lqCalibrationDialog::setDefaultConfiguration() { const double defaultSensorValue = 0.00; const int minAllowedPort = 1024; // The port between 0 and 1023 are reserved @@ -846,7 +846,7 @@ void vvCalibrationDialog::setDefaultConfiguration() } //----------------------------------------------------------------------------- -vvCalibration::Plugin vvCalibrationDialog::selectedInterpreter() const +vvCalibration::Plugin lqCalibrationDialog::selectedInterpreter() const { QString currentInterpreter = this->Internal->InterpreterSelectionBox->currentText(); QMap::const_iterator it = @@ -860,7 +860,7 @@ vvCalibration::Plugin vvCalibrationDialog::selectedInterpreter() const } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setInterpreter(QString& interpreter) +void lqCalibrationDialog::setInterpreter(QString& interpreter) { QMap::const_iterator it = this->Internal->AvailableInterpreters.find(interpreter); @@ -872,14 +872,14 @@ void vvCalibrationDialog::setInterpreter(QString& interpreter) } //----------------------------------------------------------------------------- -QString vvCalibrationDialog::selectedCalibrationFile() const +QString lqCalibrationDialog::selectedCalibrationFile() const { const int row = this->Internal->CalibrationFileListWidget->currentRow(); return this->Internal->CalibrationFileListWidget->item(row)->data(Qt::UserRole).toString(); } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setCalibrationFile(QString& filename) const +void lqCalibrationDialog::setCalibrationFile(QString& filename) const { QStringList existingFiles = this->getAllCalibrationFiles(); unsigned int idx = 0; @@ -899,7 +899,7 @@ void vvCalibrationDialog::setCalibrationFile(QString& filename) const } //----------------------------------------------------------------------------- -QStringList vvCalibrationDialog::getAllCalibrationFiles() const +QStringList lqCalibrationDialog::getAllCalibrationFiles() const { QStringList calibrationFiles; for (int i = 0; i < this->Internal->CalibrationFileListWidget->count(); ++i) @@ -912,7 +912,7 @@ QStringList vvCalibrationDialog::getAllCalibrationFiles() const } //----------------------------------------------------------------------------- -QStringList vvCalibrationDialog::getCustomCalibrationFiles() const +QStringList lqCalibrationDialog::getCustomCalibrationFiles() const { QString interpreter = QString::number((int)this->selectedInterpreter()); QString path = "LidarPlugin/CalibrationFileDialog/Files" + interpreter; @@ -920,31 +920,31 @@ QStringList vvCalibrationDialog::getCustomCalibrationFiles() const } //----------------------------------------------------------------------------- -bool vvCalibrationDialog::isEnableMultiSensors() const +bool lqCalibrationDialog::isEnableMultiSensors() const { return this->Internal->EnableMultiSensors->isChecked(); } //----------------------------------------------------------------------------- -bool vvCalibrationDialog::isShowFirstAndLastFrame() const +bool lqCalibrationDialog::isShowFirstAndLastFrame() const { return this->Internal->ShowFirstAndLastFrame->isChecked(); } //----------------------------------------------------------------------------- -bool vvCalibrationDialog::isUseRelativeStartTime() const +bool lqCalibrationDialog::isUseRelativeStartTime() const { return this->Internal->UseRelativeStartTime->isChecked(); } //----------------------------------------------------------------------------- -bool vvCalibrationDialog::isEnableInterpretGPSPackets() const +bool lqCalibrationDialog::isEnableInterpretGPSPackets() const { return this->Internal->EnableInterpretGPSPackets->isChecked(); } //----------------------------------------------------------------------------- -QMatrix4x4 vvCalibrationDialog::sensorTransform() const +QMatrix4x4 lqCalibrationDialog::sensorTransform() const { // QMatrix4x4 class uses openGL / renderer conventions which // is counterintuitive from a linear algebra point of view regarding @@ -980,7 +980,7 @@ QMatrix4x4 vvCalibrationDialog::sensorTransform() const } //----------------------------------------------------------------------------- -QMatrix4x4 vvCalibrationDialog::gpsTransform() const +QMatrix4x4 lqCalibrationDialog::gpsTransform() const { // QMatrix4x4 class uses openGL / renderer conventions which // is counterintuitive from a linear algebra point of view regarding @@ -1016,7 +1016,7 @@ QMatrix4x4 vvCalibrationDialog::gpsTransform() const } //----------------------------------------------------------------------------- -vvCalibration::TransformConfig vvCalibrationDialog::getLidarConfig() const +vvCalibration::TransformConfig lqCalibrationDialog::getLidarConfig() const { vvCalibration::TransformConfig config = { this->Internal->LidarYawSpinBox->value(), this->Internal->LidarRollSpinBox->value(), @@ -1029,7 +1029,7 @@ vvCalibration::TransformConfig vvCalibrationDialog::getLidarConfig() const } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setLidarConfig(vvCalibration::TransformConfig& conf) +void lqCalibrationDialog::setLidarConfig(vvCalibration::TransformConfig& conf) { this->Internal->LidarYawSpinBox->setValue(conf.yaw); this->Internal->LidarRollSpinBox->setValue(conf.roll); @@ -1041,7 +1041,7 @@ void vvCalibrationDialog::setLidarConfig(vvCalibration::TransformConfig& conf) } //----------------------------------------------------------------------------- -vvCalibration::NetworkConfig vvCalibrationDialog::getLidarNetworkConfig() const +vvCalibration::NetworkConfig lqCalibrationDialog::getLidarNetworkConfig() const { vvCalibration::NetworkConfig config = { this->Internal->LidarPortSpinBox->value(), this->Internal->LidarForwardingPortSpinBox->value(), @@ -1052,7 +1052,7 @@ vvCalibration::NetworkConfig vvCalibrationDialog::getLidarNetworkConfig() const } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setLidarNetworkConfig(vvCalibration::NetworkConfig& conf) +void lqCalibrationDialog::setLidarNetworkConfig(vvCalibration::NetworkConfig& conf) { this->Internal->LidarPortSpinBox->setValue(conf.listenningPort); this->Internal->LidarForwardingPortSpinBox->setValue(conf.forwardingPort); @@ -1062,7 +1062,7 @@ void vvCalibrationDialog::setLidarNetworkConfig(vvCalibration::NetworkConfig& co } //----------------------------------------------------------------------------- -vvCalibration::TransformConfig vvCalibrationDialog::getGPSConfig() const +vvCalibration::TransformConfig lqCalibrationDialog::getGPSConfig() const { vvCalibration::TransformConfig config = { this->Internal->GpsYawSpinBox->value(), this->Internal->GpsRollSpinBox->value(), @@ -1075,7 +1075,7 @@ vvCalibration::TransformConfig vvCalibrationDialog::getGPSConfig() const } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setGPSConfig(vvCalibration::TransformConfig& conf) +void lqCalibrationDialog::setGPSConfig(vvCalibration::TransformConfig& conf) { this->Internal->GpsYawSpinBox->setValue(conf.yaw); this->Internal->GpsRollSpinBox->setValue(conf.roll); @@ -1087,7 +1087,7 @@ void vvCalibrationDialog::setGPSConfig(vvCalibration::TransformConfig& conf) } //----------------------------------------------------------------------------- -vvCalibration::NetworkConfig vvCalibrationDialog::getGPSNetworkConfig() const +vvCalibration::NetworkConfig lqCalibrationDialog::getGPSNetworkConfig() const { vvCalibration::NetworkConfig config = { this->Internal->GPSPortSpinBox->value(), this->Internal->GPSForwardingPortSpinBox->value(), @@ -1098,7 +1098,7 @@ vvCalibration::NetworkConfig vvCalibrationDialog::getGPSNetworkConfig() const } //----------------------------------------------------------------------------- -void vvCalibrationDialog::setGPSNetworkConfig(vvCalibration::NetworkConfig& conf) +void lqCalibrationDialog::setGPSNetworkConfig(vvCalibration::NetworkConfig& conf) { this->Internal->GPSPortSpinBox->setValue(conf.listenningPort); this->Internal->GPSForwardingPortSpinBox->setValue(conf.forwardingPort); @@ -1108,7 +1108,7 @@ void vvCalibrationDialog::setGPSNetworkConfig(vvCalibration::NetworkConfig& conf } //----------------------------------------------------------------------------- -void vvCalibrationDialog::accept() +void lqCalibrationDialog::accept() { this->Internal->saveInterpreter(); this->Internal->saveSensorTransform(); @@ -1130,7 +1130,7 @@ void vvCalibrationDialog::accept() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::onCurrentRowChanged(int row) +void lqCalibrationDialog::onCurrentRowChanged(int row) { const vvCalibration::Plugin interpreter = this->selectedInterpreter(); const int builtInCalibFileSize = this->Internal->BuiltInCalibrationFiles[interpreter].size(); @@ -1141,7 +1141,7 @@ void vvCalibrationDialog::onCurrentRowChanged(int row) } //----------------------------------------------------------------------------- -void vvCalibrationDialog::onCurrentTextChanged(const QString& text) +void lqCalibrationDialog::onCurrentTextChanged(const QString& text) { const vvCalibration::Plugin interpreter = this->Internal->AvailableInterpreters[text]; this->Internal->CalibrationFileListWidget->clear(); @@ -1156,11 +1156,11 @@ void vvCalibrationDialog::onCurrentTextChanged(const QString& text) this->Internal->CalibrationFileListWidget->addItem(liveCalibrationItem); } - foreach (QString fullname, this->Internal->BuiltInCalibrationFiles[interpreter]) + Q_FOREACH (QString fullname, this->Internal->BuiltInCalibrationFiles[interpreter]) { this->Internal->CalibrationFileListWidget->addItem(createEntry(fullname, true)); } - foreach (QString fullname, this->getCustomCalibrationFiles()) + Q_FOREACH (QString fullname, this->getCustomCalibrationFiles()) { this->Internal->CalibrationFileListWidget->addItem(createEntry(fullname, false)); } @@ -1168,7 +1168,7 @@ void vvCalibrationDialog::onCurrentTextChanged(const QString& text) } //----------------------------------------------------------------------------- -void vvCalibrationDialog::addFile() +void lqCalibrationDialog::addFile() { QString defaultDir = this->Internal->Settings->value("LidarPlugin/OpenData/DefaultDir", QDir::homePath()).toString(); @@ -1195,7 +1195,7 @@ void vvCalibrationDialog::addFile() } //----------------------------------------------------------------------------- -void vvCalibrationDialog::removeSelectedFile() +void lqCalibrationDialog::removeSelectedFile() { const int row = this->Internal->CalibrationFileListWidget->currentRow(); if (row >= this->Internal->BuiltInCalibrationFiles.size()) diff --git a/Application/Ui/Widgets/vvCalibrationDialog.h b/Application/Qt/Components/lqCalibrationDialog.h similarity index 84% rename from Application/Ui/Widgets/vvCalibrationDialog.h rename to Application/Qt/Components/lqCalibrationDialog.h index b5cd9d76c..9b167d860 100644 --- a/Application/Ui/Widgets/vvCalibrationDialog.h +++ b/Application/Qt/Components/lqCalibrationDialog.h @@ -11,24 +11,26 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef __vvCalibrationDialog_h -#define __vvCalibrationDialog_h +#ifndef lqCalibrationDialog_h +#define lqCalibrationDialog_h + +#include "lvComponentsModule.h" #include #include -#include "vvCalibrationStructs.h" +#include "lqCalibrationStructs.h" class vtkSMProxy; -class vvCalibrationDialog : public QDialog +class LVCOMPONENTS_EXPORT lqCalibrationDialog : public QDialog { Q_OBJECT public: - vvCalibrationDialog(QWidget* p = 0, bool isStreamSensor = false); - vvCalibrationDialog(vtkSMProxy* lidarProxy, vtkSMProxy* GPSProxy, QWidget* p = 0); + lqCalibrationDialog(QWidget* p = 0, bool isStreamSensor = false); + lqCalibrationDialog(vtkSMProxy* lidarProxy, vtkSMProxy* GPSProxy, QWidget* p = 0); - virtual ~vvCalibrationDialog(); + virtual ~lqCalibrationDialog(); Q_INVOKABLE vvCalibration::Plugin selectedInterpreter() const; Q_INVOKABLE void setInterpreter(QString& interpreter); @@ -61,10 +63,10 @@ public: protected: void setDefaultConfiguration(); -public slots: +public Q_SLOTS: virtual void accept() override; -protected slots: +protected Q_SLOTS: void addFile(); void removeSelectedFile(); void onCurrentRowChanged(int row); @@ -75,7 +77,7 @@ private: class pqInternal; QScopedPointer Internal; - Q_DISABLE_COPY(vvCalibrationDialog) + Q_DISABLE_COPY(lqCalibrationDialog) }; #endif diff --git a/Application/Ui/Widgets/vvCalibrationStructs.h b/Application/Qt/Components/lqCalibrationStructs.h similarity index 91% rename from Application/Ui/Widgets/vvCalibrationStructs.h rename to Application/Qt/Components/lqCalibrationStructs.h index 213652fca..198203d90 100644 --- a/Application/Ui/Widgets/vvCalibrationStructs.h +++ b/Application/Qt/Components/lqCalibrationStructs.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef __vvCalibrationStructs_h -#define __vvCalibrationStructs_h +#ifndef lqCalibrationStructs_h +#define lqCalibrationStructs_h #include #include @@ -48,4 +48,4 @@ struct NetworkConfig }; }; -#endif /* !__vvCalibrationStructs_h */ +#endif /* !__lqCalibrationStructs_h */ diff --git a/Application/Ui/Widgets/vvCropReturnsDialog.cxx b/Application/Qt/Components/lqCropReturnsDialog.cxx similarity index 90% rename from Application/Ui/Widgets/vvCropReturnsDialog.cxx rename to Application/Qt/Components/lqCropReturnsDialog.cxx index 918420feb..fe7ec1729 100644 --- a/Application/Ui/Widgets/vvCropReturnsDialog.cxx +++ b/Application/Qt/Components/lqCropReturnsDialog.cxx @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "vvCropReturnsDialog.h" +#include "lqCropReturnsDialog.h" -#include "ui_vvCropReturnsDialog.h" +#include "ui_lqCropReturnsDialog.h" #include //vtkNotUsed @@ -27,7 +27,7 @@ #include //----------------------------------------------------------------------------- -class vvCropReturnsDialog::pqInternal : public Ui::vvCropReturnsDialog +class lqCropReturnsDialog::pqInternal : public Ui::lqCropReturnsDialog { public: pqInternal(QDialog* external) @@ -75,7 +75,7 @@ public: }; //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::saveSettings() +void lqCropReturnsDialog::pqInternal::saveSettings() { this->Settings->setValue( "LidarPlugin/CropReturnsDialog/EnableCropping", this->CropGroupBox->isChecked()); @@ -97,7 +97,7 @@ void vvCropReturnsDialog::pqInternal::saveSettings() } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::restoreSettings() +void lqCropReturnsDialog::pqInternal::restoreSettings() { this->sphericalRadioButton->setChecked( this->Settings->value("LidarPlugin/CropReturnsDialog/sphericalRadioButton", true).toBool()); @@ -155,7 +155,7 @@ void vvCropReturnsDialog::pqInternal::restoreSettings() } //----------------------------------------------------------------------------- -vvCropReturnsDialog::vvCropReturnsDialog(QWidget* p) +lqCropReturnsDialog::lqCropReturnsDialog(QWidget* p) : QDialog(p) , Internal(new pqInternal(this)) { @@ -185,34 +185,34 @@ vvCropReturnsDialog::vvCropReturnsDialog(QWidget* p) } //----------------------------------------------------------------------------- -vvCropReturnsDialog::~vvCropReturnsDialog() {} +lqCropReturnsDialog::~lqCropReturnsDialog() {} //----------------------------------------------------------------------------- -bool vvCropReturnsDialog::croppingEnabled() const +bool lqCropReturnsDialog::croppingEnabled() const { return this->Internal->CropGroupBox->isChecked(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::setCroppingEnabled(bool checked) +void lqCropReturnsDialog::setCroppingEnabled(bool checked) { this->Internal->CropGroupBox->setChecked(checked); } //----------------------------------------------------------------------------- -bool vvCropReturnsDialog::cropOutside() const +bool lqCropReturnsDialog::cropOutside() const { return this->Internal->CropOutsideCheckBox->isChecked(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::setCropOutside(bool checked) +void lqCropReturnsDialog::setCropOutside(bool checked) { this->Internal->CropOutsideCheckBox->setChecked(checked); } //----------------------------------------------------------------------------- -QVector3D vvCropReturnsDialog::firstCorner() const +QVector3D lqCropReturnsDialog::firstCorner() const { double cropRegion[6]; this->Internal->GetCropRegion(cropRegion); @@ -230,7 +230,7 @@ QVector3D vvCropReturnsDialog::firstCorner() const } //----------------------------------------------------------------------------- -QVector3D vvCropReturnsDialog::secondCorner() const +QVector3D lqCropReturnsDialog::secondCorner() const { double cropRegion[6]; this->Internal->GetCropRegion(cropRegion); @@ -248,7 +248,7 @@ QVector3D vvCropReturnsDialog::secondCorner() const } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::setFirstCorner(QVector3D corner) +void lqCropReturnsDialog::setFirstCorner(QVector3D corner) { pqInternal* const d = this->Internal.data(); d->X1SpinBox->setValue(corner.x()); @@ -257,7 +257,7 @@ void vvCropReturnsDialog::setFirstCorner(QVector3D corner) } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::setSecondCorner(QVector3D corner) +void lqCropReturnsDialog::setSecondCorner(QVector3D corner) { pqInternal* const d = this->Internal.data(); d->X2SpinBox->setValue(corner.x()); @@ -266,32 +266,32 @@ void vvCropReturnsDialog::setSecondCorner(QVector3D corner) } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::apply() +void lqCropReturnsDialog::apply() { QDialog::accept(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::applyAndSave() +void lqCropReturnsDialog::applyAndSave() { this->Internal->saveSettings(); QDialog::accept(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::onCartesianToggled() +void lqCropReturnsDialog::onCartesianToggled() { this->Internal->SetCartesianSettings(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::onSphericalToggled() +void lqCropReturnsDialog::onSphericalToggled() { this->Internal->SetSphericalSettings(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::SetSphericalSettings() +void lqCropReturnsDialog::pqInternal::SetSphericalSettings() { this->ActivateSpinBox(); // change the labels @@ -329,7 +329,7 @@ void vvCropReturnsDialog::pqInternal::SetSphericalSettings() } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::SetCartesianSettings() +void lqCropReturnsDialog::pqInternal::SetCartesianSettings() { double maxV = 300; double minV = -maxV; @@ -363,7 +363,7 @@ void vvCropReturnsDialog::pqInternal::SetCartesianSettings() } //----------------------------------------------------------------------------- -int vvCropReturnsDialog::GetCropMode() const +int lqCropReturnsDialog::GetCropMode() const { if (!this->Internal->CropGroupBox->isChecked()) { @@ -384,7 +384,7 @@ int vvCropReturnsDialog::GetCropMode() const } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::ActivateSpinBox() +void lqCropReturnsDialog::pqInternal::ActivateSpinBox() { this->XLabel->setDisabled(false); this->YLabel->setDisabled(false); @@ -401,7 +401,7 @@ void vvCropReturnsDialog::pqInternal::ActivateSpinBox() } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::GetCropRegion(double output[6]) +void lqCropReturnsDialog::pqInternal::GetCropRegion(double output[6]) { output[0] = this->X1SpinBox->value(); output[1] = this->X2SpinBox->value(); @@ -414,7 +414,7 @@ void vvCropReturnsDialog::pqInternal::GetCropRegion(double output[6]) } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::pqInternal::DesactivateSpinBox() +void lqCropReturnsDialog::pqInternal::DesactivateSpinBox() { this->XLabel->setDisabled(true); this->YLabel->setDisabled(true); @@ -430,7 +430,7 @@ void vvCropReturnsDialog::pqInternal::DesactivateSpinBox() this->Z2SpinBox->setDisabled(true); } -void vvCropReturnsDialog::pqInternal::updateRangeValues() +void lqCropReturnsDialog::pqInternal::updateRangeValues() { this->xRange[0] = this->X1SpinBox->value(); this->xRange[1] = this->X2SpinBox->value(); @@ -441,13 +441,13 @@ void vvCropReturnsDialog::pqInternal::updateRangeValues() } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::onSpinBoxChanged(double vtkNotUsed(value)) +void lqCropReturnsDialog::onSpinBoxChanged(double vtkNotUsed(value)) { this->Internal->updateRangeValues(); } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::onCropGroupBoxToggled() +void lqCropReturnsDialog::onCropGroupBoxToggled() { this->Internal->X1SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked()); this->Internal->X2SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked()); @@ -461,7 +461,7 @@ void vvCropReturnsDialog::onCropGroupBoxToggled() } //----------------------------------------------------------------------------- -void vvCropReturnsDialog::UpdateDialogWithCurrentSetting() +void lqCropReturnsDialog::UpdateDialogWithCurrentSetting() { this->onCropGroupBoxToggled(); } diff --git a/Application/Ui/Widgets/vvCropReturnsDialog.h b/Application/Qt/Components/lqCropReturnsDialog.h similarity index 84% rename from Application/Ui/Widgets/vvCropReturnsDialog.h rename to Application/Qt/Components/lqCropReturnsDialog.h index e7b2bbf19..ac75dbed0 100644 --- a/Application/Ui/Widgets/vvCropReturnsDialog.h +++ b/Application/Qt/Components/lqCropReturnsDialog.h @@ -11,13 +11,15 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef __vvCropReturnsDialog_h -#define __vvCropReturnsDialog_h +#ifndef lqCropReturnsDialog_h +#define lqCropReturnsDialog_h + +#include "lvComponentsModule.h" #include #include -class vvCropReturnsDialog : public QDialog +class LVCOMPONENTS_EXPORT lqCropReturnsDialog : public QDialog { Q_OBJECT Q_PROPERTY(bool croppingEnabled READ croppingEnabled WRITE setCroppingEnabled) @@ -26,8 +28,8 @@ class vvCropReturnsDialog : public QDialog Q_PROPERTY(QVector3D secondCorner READ secondCorner WRITE setSecondCorner) public: - vvCropReturnsDialog(QWidget* p = 0); - virtual ~vvCropReturnsDialog(); + lqCropReturnsDialog(QWidget* p = 0); + virtual ~lqCropReturnsDialog(); bool croppingEnabled() const; bool cropOutside() const; @@ -45,7 +47,7 @@ public: Q_INVOKABLE int GetCropMode() const; -public slots: +public Q_SLOTS: virtual void apply(); virtual void applyAndSave(); void onCartesianToggled(); @@ -57,7 +59,7 @@ private: class pqInternal; QScopedPointer Internal; - Q_DISABLE_COPY(vvCropReturnsDialog) + Q_DISABLE_COPY(lqCropReturnsDialog) }; #endif diff --git a/Application/Ui/Widgets/vvSelectFramesDialog.cxx b/Application/Qt/Components/lqSelectFramesDialog.cxx similarity index 83% rename from Application/Ui/Widgets/vvSelectFramesDialog.cxx rename to Application/Qt/Components/lqSelectFramesDialog.cxx index cf3b22e1f..2771c933f 100644 --- a/Application/Ui/Widgets/vvSelectFramesDialog.cxx +++ b/Application/Qt/Components/lqSelectFramesDialog.cxx @@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "vvSelectFramesDialog.h" +#include "lqSelectFramesDialog.h" -#include "ui_vvSelectFramesDialog.h" +#include "ui_lqSelectFramesDialog.h" #include #include @@ -21,12 +21,12 @@ #include //----------------------------------------------------------------------------- -class vvSelectFramesDialog::pqInternal : public Ui::vvSelectFramesDialog +class lqSelectFramesDialog::pqInternal : public Ui::lqSelectFramesDialog { }; //----------------------------------------------------------------------------- -vvSelectFramesDialog::vvSelectFramesDialog(QWidget* p) +lqSelectFramesDialog::lqSelectFramesDialog(QWidget* p) : QDialog(p) { this->Internal = new pqInternal; @@ -35,13 +35,13 @@ vvSelectFramesDialog::vvSelectFramesDialog(QWidget* p) } //----------------------------------------------------------------------------- -vvSelectFramesDialog::~vvSelectFramesDialog() +lqSelectFramesDialog::~lqSelectFramesDialog() { delete this->Internal; } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::accept() +void lqSelectFramesDialog::accept() { if (this->Internal->FrameStop->value() < this->Internal->FrameStart->value()) { @@ -57,7 +57,7 @@ void vvSelectFramesDialog::accept() } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameMode() const +int lqSelectFramesDialog::frameMode() const { if (this->Internal->CurrentFrameButton->isChecked()) { @@ -74,7 +74,7 @@ int vvSelectFramesDialog::frameMode() const } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameMode(int frameMode) +void lqSelectFramesDialog::setFrameMode(int frameMode) { if (frameMode == CURRENT_FRAME) { @@ -91,43 +91,43 @@ void vvSelectFramesDialog::setFrameMode(int frameMode) } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameStart() const +int lqSelectFramesDialog::frameStart() const { return this->Internal->FrameStart->value(); } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameStop() const +int lqSelectFramesDialog::frameStop() const { return this->Internal->FrameStop->value(); } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameStride() const +int lqSelectFramesDialog::frameStride() const { return this->Internal->FrameStride->value(); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameStart(int frameStart) +void lqSelectFramesDialog::setFrameStart(int frameStart) { this->Internal->FrameStart->setValue(frameStart); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameStop(int frameStop) +void lqSelectFramesDialog::setFrameStop(int frameStop) { this->Internal->FrameStop->setValue(frameStop); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameStride(int frameStride) +void lqSelectFramesDialog::setFrameStride(int frameStride) { this->Internal->FrameStride->setValue(frameStride); } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::framePack() const +int lqSelectFramesDialog::framePack() const { if (this->Internal->FilePerFrameButton->isChecked()) { @@ -140,7 +140,7 @@ int vvSelectFramesDialog::framePack() const } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFramePack(int framePack) +void lqSelectFramesDialog::setFramePack(int framePack) { if (framePack == SINGLE_FILE) { @@ -153,7 +153,7 @@ void vvSelectFramesDialog::setFramePack(int framePack) } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameTransform() const +int lqSelectFramesDialog::frameTransform() const { if (this->Internal->RelativeButton->isChecked()) { @@ -174,41 +174,41 @@ int vvSelectFramesDialog::frameTransform() const } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameMaximun() const +int lqSelectFramesDialog::frameMaximun() const { return std::max(this->Internal->FrameStart->maximum(), this->Internal->FrameStop->maximum()); } //----------------------------------------------------------------------------- -int vvSelectFramesDialog::frameMinimun() const +int lqSelectFramesDialog::frameMinimun() const { return std::max(this->Internal->FrameStart->minimum(), this->Internal->FrameStop->minimum()); ; } //----------------------------------------------------------------------------- -bool vvSelectFramesDialog::frameStrideVisibility() const +bool lqSelectFramesDialog::frameStrideVisibility() const { return this->Internal->FrameStrideContainer->isVisible(); ; } //----------------------------------------------------------------------------- -bool vvSelectFramesDialog::framePackVisibility() const +bool lqSelectFramesDialog::framePackVisibility() const { return this->Internal->FramePackContainer->isVisible(); ; } //----------------------------------------------------------------------------- -bool vvSelectFramesDialog::frameTransformVisibility() const +bool lqSelectFramesDialog::frameTransformVisibility() const { return this->Internal->FrameTransformContainer->isVisible(); ; } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameTransform(int frameTransform) +void lqSelectFramesDialog::setFrameTransform(int frameTransform) { if (frameTransform == SENSOR) { @@ -229,46 +229,46 @@ void vvSelectFramesDialog::setFrameTransform(int frameTransform) } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameMinimum(int frameMin) +void lqSelectFramesDialog::setFrameMinimum(int frameMin) { this->Internal->FrameStart->setMinimum(frameMin); this->Internal->FrameStop->setMinimum(frameMin); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameMaximum(int frameMax) +void lqSelectFramesDialog::setFrameMaximum(int frameMax) { this->Internal->FrameStart->setMaximum(frameMax); this->Internal->FrameStop->setMaximum(frameMax); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameStrideVisibility(bool visible) +void lqSelectFramesDialog::setFrameStrideVisibility(bool visible) { this->Internal->FrameStrideContainer->setVisible(visible); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFramePackVisibility(bool visible) +void lqSelectFramesDialog::setFramePackVisibility(bool visible) { this->Internal->FramePackContainer->setVisible(visible); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::setFrameTransformVisibility(bool visible) +void lqSelectFramesDialog::setFrameTransformVisibility(bool visible) { this->Internal->FrameTransformContainer->setVisible(visible); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::showEvent(QShowEvent* e) +void lqSelectFramesDialog::showEvent(QShowEvent* e) { QDialog::showEvent(e); this->resize(this->width(), this->minimumSizeHint().height()); } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::saveState() +void lqSelectFramesDialog::saveState() { pqSettings* settings = pqApplicationCore::instance()->settings(); settings->setValue("LidarPlugin/SelectFramesDialog/Mode", this->frameMode()); @@ -281,7 +281,7 @@ void vvSelectFramesDialog::saveState() } //----------------------------------------------------------------------------- -void vvSelectFramesDialog::restoreState() +void lqSelectFramesDialog::restoreState() { pqSettings* settings = pqApplicationCore::instance()->settings(); this->restoreGeometry(settings->value("LidarPlugin/SelectFramesDialog/Geometry").toByteArray()); diff --git a/Application/Ui/Widgets/vvSelectFramesDialog.h b/Application/Qt/Components/lqSelectFramesDialog.h similarity index 90% rename from Application/Ui/Widgets/vvSelectFramesDialog.h rename to Application/Qt/Components/lqSelectFramesDialog.h index 2fe241032..c3aab3fcc 100644 --- a/Application/Ui/Widgets/vvSelectFramesDialog.h +++ b/Application/Qt/Components/lqSelectFramesDialog.h @@ -11,12 +11,14 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef __vvSelectFramesDialog_h -#define __vvSelectFramesDialog_h +#ifndef lqSelectFramesDialog_h +#define lqSelectFramesDialog_h + +#include "lvComponentsModule.h" #include -class vvSelectFramesDialog : public QDialog +class LVCOMPONENTS_EXPORT lqSelectFramesDialog : public QDialog { Q_OBJECT Q_PROPERTY(int frameMode READ frameMode WRITE setFrameMode) @@ -34,8 +36,8 @@ class vvSelectFramesDialog : public QDialog Q_ENUMS(FrameMode FramePack FrameTransform) public: - vvSelectFramesDialog(QWidget* p = 0); - virtual ~vvSelectFramesDialog(); + lqSelectFramesDialog(QWidget* p = 0); + virtual ~lqSelectFramesDialog(); enum FrameMode { @@ -70,7 +72,7 @@ public: bool framePackVisibility() const; bool frameTransformVisibility() const; -public slots: +public Q_SLOTS: virtual void accept() override; void setFrameMode(int frameMode); @@ -97,7 +99,7 @@ private: class pqInternal; pqInternal* Internal; - Q_DISABLE_COPY(vvSelectFramesDialog) + Q_DISABLE_COPY(lqSelectFramesDialog) }; #endif diff --git a/Application/Qt/Components/vtk.module b/Application/Qt/Components/vtk.module new file mode 100644 index 000000000..92efe8058 --- /dev/null +++ b/Application/Qt/Components/vtk.module @@ -0,0 +1,11 @@ +NAME + LidarViewApp::lvComponents +LIBRARY_NAME + lvComponents +DEPENDS + ParaView::pqCore +PRIVATE_DEPENDS + LidarView::lqCore + ParaView::pqComponents + VTK::CommonCore +EXCLUDE_WRAP -- GitLab From 94332d5674ae5109fce67cf82d84aed3c54cb1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 10:49:43 +0200 Subject: [PATCH 4/9] [refact] Create vtk module for LidarView Qt ApplicationComponents --- .../Qt/ApplicationComponents/CMakeLists.txt | 24 ++++++ .../lqLidarViewManager.cxx | 1 - .../lqLidarViewManager.h | 4 +- .../lqOpenPcapReaction.cxx | 6 +- .../lqOpenPcapReaction.h | 8 +- .../lqOpenRecentFilesReaction.cxx | 0 .../lqOpenRecentFilesReaction.h | 6 +- .../lqOpenSensorReaction.cxx | 6 +- .../lqOpenSensorReaction.h | 8 +- .../lqPythonQtLidarView.h | 20 ++--- .../lqUpdateCalibrationReaction.cxx | 8 +- .../lqUpdateCalibrationReaction.h | 12 +-- .../Qt/ApplicationComponents/vtk.module | 28 +++++++ Application/Ui/CMakeLists.txt | 79 ------------------- 14 files changed, 92 insertions(+), 118 deletions(-) create mode 100644 Application/Qt/ApplicationComponents/CMakeLists.txt rename Application/{Ui => Qt/ApplicationComponents}/lqLidarViewManager.cxx (98%) rename Application/{Ui => Qt/ApplicationComponents}/lqLidarViewManager.h (93%) rename Application/{Ui => Qt/ApplicationComponents}/lqOpenPcapReaction.cxx (98%) rename Application/{Ui => Qt/ApplicationComponents}/lqOpenPcapReaction.h (73%) rename Application/{Ui => Qt/ApplicationComponents}/lqOpenRecentFilesReaction.cxx (100%) rename Application/{Ui => Qt/ApplicationComponents}/lqOpenRecentFilesReaction.h (93%) rename Application/{Ui => Qt/ApplicationComponents}/lqOpenSensorReaction.cxx (96%) rename Application/{Ui => Qt/ApplicationComponents}/lqOpenSensorReaction.h (66%) rename Application/{Ui => Qt/ApplicationComponents}/lqPythonQtLidarView.h (78%) rename Application/{Ui => Qt/ApplicationComponents}/lqUpdateCalibrationReaction.cxx (98%) rename Application/{Ui => Qt/ApplicationComponents}/lqUpdateCalibrationReaction.h (84%) create mode 100644 Application/Qt/ApplicationComponents/vtk.module delete mode 100644 Application/Ui/CMakeLists.txt diff --git a/Application/Qt/ApplicationComponents/CMakeLists.txt b/Application/Qt/ApplicationComponents/CMakeLists.txt new file mode 100644 index 000000000..820b50821 --- /dev/null +++ b/Application/Qt/ApplicationComponents/CMakeLists.txt @@ -0,0 +1,24 @@ +set(classes + lqLidarViewManager + lqOpenPcapReaction + lqOpenRecentFilesReaction + lqOpenSensorReaction + lqUpdateCalibrationReaction +) + +set(headers + lqPythonQtLidarView.h # Pending delete +) + +set(CMAKE_AUTOMOC 1) +set(CMAKE_AUTORCC 1) +set(CMAKE_AUTOUIC 1) + +vtk_module_add_module(LidarViewApp::lvApplicationComponents + CLASSES ${classes} + HEADERS ${headers}) +vtk_module_link(LidarViewApp::lvApplicationComponents + PRIVATE + Qt5::Core + Qt5::Widgets) +vtk_module_definitions(LidarViewApp::lvApplicationComponents PRIVATE QT_NO_KEYWORDS) diff --git a/Application/Ui/lqLidarViewManager.cxx b/Application/Qt/ApplicationComponents/lqLidarViewManager.cxx similarity index 98% rename from Application/Ui/lqLidarViewManager.cxx rename to Application/Qt/ApplicationComponents/lqLidarViewManager.cxx index 4d422a414..bc9d1baf9 100644 --- a/Application/Ui/lqLidarViewManager.cxx +++ b/Application/Qt/ApplicationComponents/lqLidarViewManager.cxx @@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================*/ #include "lqLidarViewManager.h" -#include "lqOpenPcapReaction.h" #include "lqPythonQtLidarView.h" #include diff --git a/Application/Ui/lqLidarViewManager.h b/Application/Qt/ApplicationComponents/lqLidarViewManager.h similarity index 93% rename from Application/Ui/lqLidarViewManager.h rename to Application/Qt/ApplicationComponents/lqLidarViewManager.h index bcb640c77..f16e7d684 100644 --- a/Application/Ui/lqLidarViewManager.h +++ b/Application/Qt/ApplicationComponents/lqLidarViewManager.h @@ -34,9 +34,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "applicationui_export.h" +#include "lvApplicationComponentsModule.h" -class APPLICATIONUI_EXPORT lqLidarViewManager : public lqLidarCoreManager +class LVAPPLICATIONCOMPONENTS_EXPORT lqLidarViewManager : public lqLidarCoreManager { Q_OBJECT diff --git a/Application/Ui/lqOpenPcapReaction.cxx b/Application/Qt/ApplicationComponents/lqOpenPcapReaction.cxx similarity index 98% rename from Application/Ui/lqOpenPcapReaction.cxx rename to Application/Qt/ApplicationComponents/lqOpenPcapReaction.cxx index 56ef38f60..1116a277c 100644 --- a/Application/Ui/lqOpenPcapReaction.cxx +++ b/Application/Qt/ApplicationComponents/lqOpenPcapReaction.cxx @@ -21,7 +21,7 @@ #include "lqLidarViewManager.h" #include "lqSensorListWidget.h" #include "lqUpdateCalibrationReaction.h" -#include "vvCalibrationDialog.h" +#include "lqCalibrationDialog.h" #include #include @@ -92,7 +92,7 @@ void lqOpenPcapReaction::createSourceFromFile(QString fileName) { // Launch the calibration Dialog before creating the Source to allow to cancel the action // (with the "cancel" button in the dialog) - vvCalibrationDialog dialog(lqLidarViewManager::instance()->getMainWindow(), false); + lqCalibrationDialog dialog(lqLidarViewManager::instance()->getMainWindow(), false); // DisplayDialogOnActiveWindow(dialog); if (dialog.exec()) { @@ -101,7 +101,7 @@ void lqOpenPcapReaction::createSourceFromFile(QString fileName) } //----------------------------------------------------------------------------- -void lqOpenPcapReaction::createSourceFromFile(QString fileName, const vvCalibrationDialog& dialog) +void lqOpenPcapReaction::createSourceFromFile(QString fileName, const lqCalibrationDialog& dialog) { pqServer* server = pqActiveObjects::instance().activeServer(); pqObjectBuilder* builder = pqApplicationCore::instance()->getObjectBuilder(); diff --git a/Application/Ui/lqOpenPcapReaction.h b/Application/Qt/ApplicationComponents/lqOpenPcapReaction.h similarity index 73% rename from Application/Ui/lqOpenPcapReaction.h rename to Application/Qt/ApplicationComponents/lqOpenPcapReaction.h index 8016cb3e7..f49c7e578 100644 --- a/Application/Ui/lqOpenPcapReaction.h +++ b/Application/Qt/ApplicationComponents/lqOpenPcapReaction.h @@ -1,17 +1,17 @@ #ifndef LQOPENPCAPREACTION_H #define LQOPENPCAPREACTION_H -#include "applicationui_export.h" +#include "lvApplicationComponentsModule.h" #include "pqReaction.h" -#include "vvCalibrationDialog.h" +#include "lqCalibrationDialog.h" #include /** * @ingroup Reactions * Reaction to open a pcap */ -class APPLICATIONUI_EXPORT lqOpenPcapReaction : public pqReaction +class LVAPPLICATIONCOMPONENTS_EXPORT lqOpenPcapReaction : public pqReaction { Q_OBJECT typedef pqReaction Superclass; @@ -19,7 +19,7 @@ class APPLICATIONUI_EXPORT lqOpenPcapReaction : public pqReaction public: lqOpenPcapReaction(QAction* action); static void createSourceFromFile(QString fileName); - static void createSourceFromFile(QString fileName, const vvCalibrationDialog& dialog); + static void createSourceFromFile(QString fileName, const lqCalibrationDialog& dialog); protected: /// Called when the action is triggered. diff --git a/Application/Ui/lqOpenRecentFilesReaction.cxx b/Application/Qt/ApplicationComponents/lqOpenRecentFilesReaction.cxx similarity index 100% rename from Application/Ui/lqOpenRecentFilesReaction.cxx rename to Application/Qt/ApplicationComponents/lqOpenRecentFilesReaction.cxx diff --git a/Application/Ui/lqOpenRecentFilesReaction.h b/Application/Qt/ApplicationComponents/lqOpenRecentFilesReaction.h similarity index 93% rename from Application/Ui/lqOpenRecentFilesReaction.h rename to Application/Qt/ApplicationComponents/lqOpenRecentFilesReaction.h index 8730a5b6f..61faad57d 100644 --- a/Application/Ui/lqOpenRecentFilesReaction.h +++ b/Application/Qt/ApplicationComponents/lqOpenRecentFilesReaction.h @@ -1,7 +1,7 @@ #ifndef lqOpenRecentFilesReaction_h #define lqOpenRecentFilesReaction_h -#include "applicationui_export.h" +#include "lvApplicationComponentsModule.h" #include #include @@ -17,7 +17,7 @@ class QMenu; * @brief manages recent files menu used in LidarView */ -class APPLICATIONUI_EXPORT lqOpenRecentFilesReaction : public QObject +class LVAPPLICATIONCOMPONENTS_EXPORT lqOpenRecentFilesReaction : public QObject { Q_OBJECT typedef QObject Superclass; @@ -25,7 +25,7 @@ class APPLICATIONUI_EXPORT lqOpenRecentFilesReaction : public QObject public: lqOpenRecentFilesReaction(QMenu* recentFilesMenu, QAction* clearRecentFiles, QObject* parent = 0); -protected slots: +protected Q_SLOTS: void onSourceAdded(pqPipelineSource* src); void onOpenRecentFile(QString filename); void onClearMenu(); diff --git a/Application/Ui/lqOpenSensorReaction.cxx b/Application/Qt/ApplicationComponents/lqOpenSensorReaction.cxx similarity index 96% rename from Application/Ui/lqOpenSensorReaction.cxx rename to Application/Qt/ApplicationComponents/lqOpenSensorReaction.cxx index 2299a9dca..7f93e4df5 100644 --- a/Application/Ui/lqOpenSensorReaction.cxx +++ b/Application/Qt/ApplicationComponents/lqOpenSensorReaction.cxx @@ -19,7 +19,7 @@ #include "lqLidarViewManager.h" #include "lqSensorListWidget.h" #include "lqUpdateCalibrationReaction.h" -#include "vvCalibrationDialog.h" +#include "lqCalibrationDialog.h" #include #include @@ -35,7 +35,7 @@ void lqOpenSensorReaction::onTriggered() { // Launch the calibration Dialog before creating the Source to allow to cancel the action // (with the "cancel" button in the dialog) - vvCalibrationDialog dialog(lqLidarViewManager::instance()->getMainWindow(), true); + lqCalibrationDialog dialog(lqLidarViewManager::instance()->getMainWindow(), true); DisplayDialogOnActiveWindow(dialog); if (dialog.exec()) { @@ -44,7 +44,7 @@ void lqOpenSensorReaction::onTriggered() } //----------------------------------------------------------------------------- -void lqOpenSensorReaction::createSensorStream(const vvCalibrationDialog& dialog) +void lqOpenSensorReaction::createSensorStream(const lqCalibrationDialog& dialog) { pqServer* server = pqActiveObjects::instance().activeServer(); pqObjectBuilder* builder = pqApplicationCore::instance()->getObjectBuilder(); diff --git a/Application/Ui/lqOpenSensorReaction.h b/Application/Qt/ApplicationComponents/lqOpenSensorReaction.h similarity index 66% rename from Application/Ui/lqOpenSensorReaction.h rename to Application/Qt/ApplicationComponents/lqOpenSensorReaction.h index 16c03cccd..d5c1c3534 100644 --- a/Application/Ui/lqOpenSensorReaction.h +++ b/Application/Qt/ApplicationComponents/lqOpenSensorReaction.h @@ -1,23 +1,23 @@ #ifndef LQOPENSENSORREACTION_H #define LQOPENSENSORREACTION_H -#include "applicationui_export.h" +#include "lvApplicationComponentsModule.h" #include "pqReaction.h" -#include "vvCalibrationDialog.h" +#include "lqCalibrationDialog.h" /** * @ingroup Reactions * Reaction to open a sensor stream */ -class APPLICATIONUI_EXPORT lqOpenSensorReaction : public pqReaction +class LVAPPLICATIONCOMPONENTS_EXPORT lqOpenSensorReaction : public pqReaction { Q_OBJECT typedef pqReaction Superclass; public: lqOpenSensorReaction(QAction* action); - static void createSensorStream(const vvCalibrationDialog& dialog); + static void createSensorStream(const lqCalibrationDialog& dialog); protected: /// Called when the action is triggered. diff --git a/Application/Ui/lqPythonQtLidarView.h b/Application/Qt/ApplicationComponents/lqPythonQtLidarView.h similarity index 78% rename from Application/Ui/lqPythonQtLidarView.h rename to Application/Qt/ApplicationComponents/lqPythonQtLidarView.h index df18215e6..e1bf288ed 100644 --- a/Application/Ui/lqPythonQtLidarView.h +++ b/Application/Qt/ApplicationComponents/lqPythonQtLidarView.h @@ -35,12 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "Widgets/vvCropReturnsDialog.h" -#include "Widgets/vvSelectFramesDialog.h" +#include "lqCropReturnsDialog.h" +#include "lqSelectFramesDialog.h" #include "lqLidarViewManager.h" +#include "lvApplicationComponentsModule.h" + // WIP Could thinks about subclassing and rework how manager add it -class lqPythonQtLidarView : public QObject +class LVAPPLICATIONCOMPONENTS_EXPORT lqPythonQtLidarView : public QObject { Q_OBJECT @@ -50,8 +52,8 @@ public: { this->registerClassForPythonQt(&lqLidarViewManager::staticMetaObject); - this->registerClassForPythonQt(&vvCropReturnsDialog::staticMetaObject); - this->registerClassForPythonQt(&vvSelectFramesDialog::staticMetaObject); + this->registerClassForPythonQt(&lqCropReturnsDialog::staticMetaObject); + this->registerClassForPythonQt(&lqSelectFramesDialog::staticMetaObject); } inline void registerClassForPythonQt(const QMetaObject* metaobject) @@ -60,14 +62,14 @@ public: } public Q_SLOTS: - vvCropReturnsDialog* new_vvCropReturnsDialog(QWidget* arg0) + lqCropReturnsDialog* new_lqCropReturnsDialog(QWidget* arg0) { - return new vvCropReturnsDialog(arg0); + return new lqCropReturnsDialog(arg0); } - vvSelectFramesDialog* new_vvSelectFramesDialog(QWidget* arg0) + lqSelectFramesDialog* new_lqSelectFramesDialog(QWidget* arg0) { - return new vvSelectFramesDialog(arg0); + return new lqSelectFramesDialog(arg0); } }; diff --git a/Application/Ui/lqUpdateCalibrationReaction.cxx b/Application/Qt/ApplicationComponents/lqUpdateCalibrationReaction.cxx similarity index 98% rename from Application/Ui/lqUpdateCalibrationReaction.cxx rename to Application/Qt/ApplicationComponents/lqUpdateCalibrationReaction.cxx index 214022b20..8c8aaa5b7 100644 --- a/Application/Ui/lqUpdateCalibrationReaction.cxx +++ b/Application/Qt/ApplicationComponents/lqUpdateCalibrationReaction.cxx @@ -19,7 +19,7 @@ #include "lqHelper.h" #include "lqLidarViewManager.h" #include "lqSensorListWidget.h" -#include "vvCalibrationDialog.h" +#include "lqCalibrationDialog.h" #include //----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ lqUpdateCalibrationReaction::lqUpdateCalibrationReaction(QAction* action) this->connect( smmodel, SIGNAL(sourceRemoved(pqPipelineSource*)), SLOT(onSourceRemoved(pqPipelineSource*))); - foreach (pqPipelineSource* src, smmodel->findItems()) + Q_FOREACH (pqPipelineSource* src, smmodel->findItems()) this->onSourceAdded(src); } @@ -188,7 +188,7 @@ void lqUpdateCalibrationReaction::setReaderCalibration(vtkSMProxy* proxy, //----------------------------------------------------------------------------- void lqUpdateCalibrationReaction::UpdateCalibration(pqPipelineSource*& lidarSource, pqPipelineSource*& posOrSource, - const vvCalibrationDialog& dialog) + const lqCalibrationDialog& dialog) { vtkSMProxy* lidarProxy = lidarSource->getProxy(); if (!lidarProxy) @@ -291,7 +291,7 @@ void lqUpdateCalibrationReaction::UpdateExistingSource(pqPipelineSource*& lidarS } // Create the dialog with the proxy so the dialog has the proxy information - vvCalibrationDialog dialog( + lqCalibrationDialog dialog( lidarSource->getProxy(), posOrProxy, lqLidarViewManager::instance()->getMainWindow()); DisplayDialogOnActiveWindow(dialog); diff --git a/Application/Ui/lqUpdateCalibrationReaction.h b/Application/Qt/ApplicationComponents/lqUpdateCalibrationReaction.h similarity index 84% rename from Application/Ui/lqUpdateCalibrationReaction.h rename to Application/Qt/ApplicationComponents/lqUpdateCalibrationReaction.h index fd0aa0297..6c6573fc0 100644 --- a/Application/Ui/lqUpdateCalibrationReaction.h +++ b/Application/Qt/ApplicationComponents/lqUpdateCalibrationReaction.h @@ -1,22 +1,22 @@ #ifndef LQUpdateCalibrationReaction_H #define LQUpdateCalibrationReaction_H -#include "applicationui_export.h" +#include "lvApplicationComponentsModule.h" -#include "Widgets/vvCalibrationStructs.h" +#include "lqCalibrationStructs.h" #include "pqReaction.h" #include "vtkSmartPointer.h" class pqPipelineSource; class vtkSMProxy; -class vvCalibrationDialog; +class lqCalibrationDialog; /** * @ingroup Reactions * Reaction to update the calibration */ -class APPLICATIONUI_EXPORT lqUpdateCalibrationReaction : public pqReaction +class LVAPPLICATIONCOMPONENTS_EXPORT lqUpdateCalibrationReaction : public pqReaction { Q_OBJECT typedef pqReaction Superclass; @@ -39,11 +39,11 @@ public: static void UpdateCalibration(pqPipelineSource*& lidarSource, pqPipelineSource*& posOrSource, - const vvCalibrationDialog& dialog); + const lqCalibrationDialog& dialog); static void UpdateExistingSource(pqPipelineSource*& lidarSource, pqPipelineSource*& posOrSource); -public slots: +public Q_SLOTS: /** * Called when the action is triggered. */ diff --git a/Application/Qt/ApplicationComponents/vtk.module b/Application/Qt/ApplicationComponents/vtk.module new file mode 100644 index 000000000..bcd6dd34a --- /dev/null +++ b/Application/Qt/ApplicationComponents/vtk.module @@ -0,0 +1,28 @@ +NAME +LidarViewApp::lvApplicationComponents +LIBRARY_NAME + lvApplicationComponents +DEPENDS + ParaView::pqApplicationComponents + ParaView::pqCore + ParaView::pqWidgets + ParaView::pqComponents + ParaView::pqPython + ParaView::pvpythonmodules + ParaView::PythonInitializer + ParaView::RemotingAnimation + ParaView::RemotingApplication + ParaView::RemotingClientServerStream + ParaView::RemotingCore + ParaView::RemotingLive + ParaView::RemotingMisc + ParaView::RemotingServerManager + ParaView::RemotingServerManagerPython + ParaView::RemotingSettings + ParaView::RemotingViews + ParaView::RemotingViewsPython + LidarView::lqApplicationComponents + LidarView::lqCore + LidarViewApp::lvComponents + PythonQt::PythonQt +EXCLUDE_WRAP diff --git a/Application/Ui/CMakeLists.txt b/Application/Ui/CMakeLists.txt deleted file mode 100644 index ad5a31e83..000000000 --- a/Application/Ui/CMakeLists.txt +++ /dev/null @@ -1,79 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -add_library(ApplicationUi - Widgets/vvCalibrationDialog.cxx - Widgets/vvCalibrationDialog.h - Widgets/vvCalibrationStructs.h - Widgets/vvCalibrationDialog.ui - Widgets/vvCropReturnsDialog.cxx - Widgets/vvCropReturnsDialog.h - Widgets/vvCropReturnsDialog.ui - Widgets/vvSelectFramesDialog.cxx - Widgets/vvSelectFramesDialog.h - Widgets/vvSelectFramesDialog.ui - Widgets/images/resources.qrc - - lqLidarViewManager.cxx - lqLidarViewManager.h - lqOpenPcapReaction.cxx - lqOpenPcapReaction.h - lqOpenRecentFilesReaction.cxx - lqOpenRecentFilesReaction.h - lqOpenSensorReaction.cxx - lqOpenSensorReaction.h - lqUpdateCalibrationReaction.cxx - lqUpdateCalibrationReaction.h - lqPythonQtLidarView.h # LV Specific PythonQt Decorators -) - -target_link_libraries(ApplicationUi PUBLIC - ParaView::pqCore - ParaView::pqWidgets - ParaView::pqComponents - ParaView::pqApplicationComponents - ParaView::pqPython - ParaView::pvpythonmodules - ParaView::PythonInitializer - ParaView::RemotingAnimation - ParaView::RemotingApplication - ParaView::RemotingClientServerStream - ParaView::RemotingCore - ParaView::RemotingLive - ParaView::RemotingMisc - ParaView::RemotingServerManager - ParaView::RemotingServerManagerPython - ParaView::RemotingSettings - ParaView::RemotingViews - ParaView::RemotingViewsPython - - # Common LVCore code base - LidarView::lqApplicationComponents - LidarView::lqCore - - # Required to Wrap additional functions - PythonQt::PythonQt -) - -target_include_directories(ApplicationUi PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/Widgets - ${CMAKE_CURRENT_BINARY_DIR} - ) - -target_compile_definitions(ApplicationUi - PRIVATE - "LIDARVIEW_BUILD_VELODYNE=$" - "LIDARVIEW_BUILD_HESAI=$" -) - -include(GenerateExportHeader) -generate_export_header(ApplicationUi) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/applicationui_export.h DESTINATION ${LV_INSTALL_LIBRARY_DIR}) - -# Install Library needed -install(TARGETS ApplicationUi - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -) -- GitLab From a46f7196742e9071b199baeedc81a621416c233a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 10:53:52 +0200 Subject: [PATCH 5/9] [refact] Move wrapping python files to Application directory --- Application/Wrapping/Python/CMakeLists.txt | 13 ++++++++++++ .../Wrapping/Python}/__init__.py | 0 .../Wrapping/Python}/aboutDialog.py | 2 +- .../Wrapping/Python}/applogic.py | 20 +++++++++---------- .../Wrapping/Python}/gridAdjustmentDialog.py | 2 +- .../Wrapping/Python}/planefit.py | 0 .../Wrapping/Python}/simple.py | 0 Wrapping/Python/CMakeLists.txt | 12 ----------- 8 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Application/Wrapping/Python/CMakeLists.txt rename {Wrapping/Python/lidarview => Application/Wrapping/Python}/__init__.py (100%) rename {Wrapping/Python/lidarview => Application/Wrapping/Python}/aboutDialog.py (98%) rename {Wrapping/Python/lidarview => Application/Wrapping/Python}/applogic.py (98%) rename {Wrapping/Python/lidarview => Application/Wrapping/Python}/gridAdjustmentDialog.py (97%) rename {Wrapping/Python/lidarview => Application/Wrapping/Python}/planefit.py (100%) rename {Wrapping/Python/lidarview => Application/Wrapping/Python}/simple.py (100%) delete mode 100644 Wrapping/Python/CMakeLists.txt diff --git a/Application/Wrapping/Python/CMakeLists.txt b/Application/Wrapping/Python/CMakeLists.txt new file mode 100644 index 000000000..1c545eb5c --- /dev/null +++ b/Application/Wrapping/Python/CMakeLists.txt @@ -0,0 +1,13 @@ +include(PythonModuleInstaller) + +python_module_install( + NAME lidarview + FILES + __init__.py + aboutDialog.py + applogic.py + gridAdjustmentDialog.py + planefit.py + simple.py + OUTPUT_DIRECTORY lidarview +) diff --git a/Wrapping/Python/lidarview/__init__.py b/Application/Wrapping/Python/__init__.py similarity index 100% rename from Wrapping/Python/lidarview/__init__.py rename to Application/Wrapping/Python/__init__.py diff --git a/Wrapping/Python/lidarview/aboutDialog.py b/Application/Wrapping/Python/aboutDialog.py similarity index 98% rename from Wrapping/Python/lidarview/aboutDialog.py rename to Application/Wrapping/Python/aboutDialog.py index 453cb9f21..41dbc1cb9 100644 --- a/Wrapping/Python/lidarview/aboutDialog.py +++ b/Application/Wrapping/Python/aboutDialog.py @@ -17,7 +17,7 @@ from PythonQt import QtCore, QtGui, QtUiTools def showDialog(mainWindow): loader = QtUiTools.QUiLoader() - uifile = QtCore.QFile(':/lvResources/lvAboutDialog.ui') + uifile = QtCore.QFile(':/lvResources/lqAboutDialog.ui') if not uifile.open(uifile.ReadOnly): print("Canno't open the ui for the about dialog.") return diff --git a/Wrapping/Python/lidarview/applogic.py b/Application/Wrapping/Python/applogic.py similarity index 98% rename from Wrapping/Python/lidarview/applogic.py rename to Application/Wrapping/Python/applogic.py index 39e0f7639..922fda591 100644 --- a/Wrapping/Python/lidarview/applogic.py +++ b/Application/Wrapping/Python/applogic.py @@ -27,7 +27,7 @@ import lidarview.aboutDialog import lidarview.planefit as planefit import lidarview.simple as lvsmp -from PythonQt.paraview import vvCropReturnsDialog, vvSelectFramesDialog #WIP rename to LV / Velodyne Specific +from PythonQt.paraview import lqCropReturnsDialog, lqSelectFramesDialog # import the vtk wrapping of the Lidar Plugin # this enable to get the specific vtkObject behind a proxy via GetClientSideObject() @@ -441,7 +441,7 @@ def getFrameSelectionFromUser(frameStrideVisibility=False, framePackVisibility=F class FrameOptions(object): pass - dialog = PythonQt.paraview.vvSelectFramesDialog(getMainWindow()) + dialog = PythonQt.paraview.lqSelectFramesDialog(getMainWindow()) dialog.frameMinimum = 0 if getReader() is None: dialog.frameMaximum = 0 @@ -488,13 +488,13 @@ def onSaveLAS(): if frameOptions is None: return - if frameOptions.mode == vvSelectFramesDialog.CURRENT_FRAME: + if frameOptions.mode == lqSelectFramesDialog.CURRENT_FRAME: frameOptions.start = frameOptions.stop = getAnimationScene().AnimationTime - elif frameOptions.mode == vvSelectFramesDialog.ALL_FRAMES: + elif frameOptions.mode == lqSelectFramesDialog.ALL_FRAMES: frameOptions.start = int(getAnimationScene().StartTime) frameOptions.stop = int(getAnimationScene().EndTime) - if frameOptions.mode == vvSelectFramesDialog.CURRENT_FRAME: + if frameOptions.mode == lqSelectFramesDialog.CURRENT_FRAME: fileName = getSaveFileName('Save LAS', 'las', getDefaultSaveFileName('las', appendFrameNumber=True)) if fileName: oldTransform = transformMode() @@ -504,7 +504,7 @@ def onSaveLAS(): setTransformMode(oldTransform) - elif frameOptions.pack == vvSelectFramesDialog.FILE_PER_FRAME: + elif frameOptions.pack == lqSelectFramesDialog.FILE_PER_FRAME: fileName = getSaveFileName('Save LAS (to zip file)', 'zip', getDefaultSaveFileName('zip')) if fileName: @@ -514,7 +514,7 @@ def onSaveLAS(): def saveTransformedLAS(filename, timesteps): saveLAS(filename, timesteps, frameOptions.transform) - if frameOptions.mode == vvSelectFramesDialog.ALL_FRAMES: + if frameOptions.mode == lqSelectFramesDialog.ALL_FRAMES: start = 0 stop = len(getLidar().TimestepValues) - 1 else: @@ -553,11 +553,11 @@ def onSavePCAP(): if frameOptions is None: return - if frameOptions.mode == vvSelectFramesDialog.CURRENT_FRAME: + if frameOptions.mode == lqSelectFramesDialog.CURRENT_FRAME: frameOptions.start = getFrameFromAnimationTime(getAnimationScene().AnimationTime) frameOptions.stop = frameOptions.start defaultFileName = getDefaultSaveFileName('pcap', frameId=frameOptions.start) - elif frameOptions.mode == vvSelectFramesDialog.ALL_FRAMES: + elif frameOptions.mode == lqSelectFramesDialog.ALL_FRAMES: frameOptions.start = 0 frameOptions.stop = 0 if getReader() is None else getReader().GetClientSideObject().GetNumberOfFrames() - 1 defaultFileName = getDefaultSaveFileName('pcap') @@ -698,7 +698,7 @@ def getPosition(): return getattr(app, 'position', None) def onCropReturns(show = True): - dialog = vvCropReturnsDialog(getMainWindow()) + dialog = lqCropReturnsDialog(getMainWindow()) cropEnabled = False cropOutside = False diff --git a/Wrapping/Python/lidarview/gridAdjustmentDialog.py b/Application/Wrapping/Python/gridAdjustmentDialog.py similarity index 97% rename from Wrapping/Python/lidarview/gridAdjustmentDialog.py rename to Application/Wrapping/Python/gridAdjustmentDialog.py index 72b840f0b..d4ce4517a 100644 --- a/Wrapping/Python/lidarview/gridAdjustmentDialog.py +++ b/Application/Wrapping/Python/gridAdjustmentDialog.py @@ -18,7 +18,7 @@ import math def showDialog(mainWindow, app): loader = QtUiTools.QUiLoader() - uifile = QtCore.QFile(':/LidarViewPlugin/vvGridAdjustmentDialog.ui') + uifile = QtCore.QFile(':/lvResources/lqGridAdjustmentDialog.ui') if not uifile.open(uifile.ReadOnly): print("error opening file") return diff --git a/Wrapping/Python/lidarview/planefit.py b/Application/Wrapping/Python/planefit.py similarity index 100% rename from Wrapping/Python/lidarview/planefit.py rename to Application/Wrapping/Python/planefit.py diff --git a/Wrapping/Python/lidarview/simple.py b/Application/Wrapping/Python/simple.py similarity index 100% rename from Wrapping/Python/lidarview/simple.py rename to Application/Wrapping/Python/simple.py diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt deleted file mode 100644 index 19bc1c6a2..000000000 --- a/Wrapping/Python/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -include(PythonModuleInstaller) - -python_module_install( - NAME lidarview - FILES - lidarview/__init__.py - lidarview/aboutDialog.py - lidarview/applogic.py - lidarview/gridAdjustmentDialog.py - lidarview/planefit.py - lidarview/simple.py -) -- GitLab From b3030ca67d8b966f4012a92344da77a6c76f29a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 10:56:44 +0200 Subject: [PATCH 6/9] [feat] Add CMake logic to build LidarView binary with new modules --- Application/CMakeLists.txt | 51 ++++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 3 +-- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 Application/CMakeLists.txt diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt new file mode 100644 index 000000000..fd2546c03 --- /dev/null +++ b/Application/CMakeLists.txt @@ -0,0 +1,51 @@ +#-------------------------------------- +# Scan and find LidarViewApp vtk modules +#-------------------------------------- +set(lidarview_source_directories + "${CMAKE_CURRENT_SOURCE_DIR}/Qt" +) + +vtk_module_find_modules(lidarview_module_files ${lidarview_source_directories}) +vtk_module_scan( + MODULE_FILES ${lidarview_module_files} + PROVIDES_MODULES lidarview_modules + REQUIRES_MODULES lidarview_required_modules + UNRECOGNIZED_MODULES lidarview_unrecognized_modules + WANT_BY_DEFAULT ON) + +set(lidarview_unrecognized_lidarview_modules) +foreach (lidarview_module IN LISTS lidarview_unrecognized_modules) + if (lidarview_module MATCHES "LidarViewApp::") + list(APPEND lidarview_unrecognized_lidarview_modules + "${lidarview_module}") + endif () +endforeach () + +if (lidarview_unrecognized_lidarview_modules) + message(FATAL_ERROR + "The following modules were requested or required, but not found: " + "${lidarview_unrecognized_lidarview_modules}.") +endif () + +#-------------------------------------- +# Build LidarViewApp vtk modules +#-------------------------------------- +vtk_module_build( + MODULES ${lidarview_modules} + PACKAGE LidarViewApp + INSTALL_EXPORT LidarViewApp + INSTALL_HEADERS "${LIDARVIEW_INSTALL_DEVELOPMENT_FILES}" + HEADERS_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lidarview" + CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/lidarview" + VERSION "${LV_VERSION}" + ENABLE_WRAPPING OFF) + +#-------------------------------------- +# Build LidarView binary +#-------------------------------------- +add_subdirectory(Client) + +#-------------------------------------- +# Export python wrapping +#-------------------------------------- +add_subdirectory(Wrapping/Python) \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cd74b7b2..6ad37adfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,10 +27,9 @@ set(lidarview_plugin_directories "${CMAKE_CURRENT_SOURCE_DIR}/Plugins") add_subdirectory(LVCore) +# Build lidarview application & QT module specific add_subdirectory(Application) -add_subdirectory(Wrapping/Python) - if (BUILD_DOCUMENTATION) add_subdirectory(Documentation) endif () -- GitLab From d374950bd201504fd7a1071917d5d941c8b9c3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 10:57:19 +0200 Subject: [PATCH 7/9] [doc] Update README.md path --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d03fe3896..cc0d3ec93 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![LidarView](Application/SoftwareInformation/About.png) +![LidarView](Application/Client/Resources/Images/About.png) # Introduction @@ -25,7 +25,7 @@ and screenshots of the currently displayed point cloud can be easily exported wi As a [Paraview](https://www.paraview.org/) based application, LidarView can effortlessly offer Paraview's features and plugins. -![LidarView](Application/SoftwareInformation/LidarViewExample.png) +![LidarView](Application/Client/Resources/Images/LidarViewExample.png) Lidar data processed by [Kitware's SLAM](#slam) within LidarView @@ -46,7 +46,7 @@ Many other features can be added using Plugins, some can be found on [this page] Feel free to reach out at kitware@kitware.com for support or new features development. -![LidarView](Application/SoftwareInformation/LidarViewLayout.svg) +![LidarView](Application/Client/Resources/Images/LidarViewLayout.svg) # How to get -- GitLab From c9aa7d48ab4c9ceaec26a77df3e37589ba49024e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Tue, 13 Jun 2023 11:10:21 +0200 Subject: [PATCH 8/9] [fix] Fix all qrc paths --- Application/Client/LidarViewMainWindow.ui | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Application/Client/LidarViewMainWindow.ui b/Application/Client/LidarViewMainWindow.ui index 9b9068f5e..aad33500d 100644 --- a/Application/Client/LidarViewMainWindow.ui +++ b/Application/Client/LidarViewMainWindow.ui @@ -17,7 +17,7 @@ MainWindow - + :/lvResources/Icons/logo.png:/lvResources/Icons/logo.png @@ -358,7 +358,7 @@ - + :/lvResources/Icons/WiresharkDoc-128.png:/lvResources/Icons/WiresharkDoc-128.png @@ -379,7 +379,7 @@ true - + :/lvResources/Icons/pqFrustumSelectionPoint24.png:/lvResources/Icons/pqFrustumSelectionPoint24.png @@ -394,7 +394,7 @@ true - + :/lvResources/Icons/pqSpreadsheet16.png:/lvResources/Icons/pqSpreadsheet16.png @@ -409,7 +409,7 @@ - + :/lvResources/Icons/lidar.png:/lvResources/Icons/lidar.png @@ -436,7 +436,7 @@ - + :/lvResources/Icons/calibrate.png:/lvResources/Icons/calibrate.png @@ -445,7 +445,7 @@ - + :/lvResources/Icons/media-playback-pause.png:/lvResources/Icons/media-playback-pause.png @@ -457,7 +457,7 @@ - + :/lvResources/Icons/python_logo_124.png:/lvResources/Icons/python_logo_124.png @@ -609,7 +609,7 @@ true - + :/lvResources/Icons/ViewOrtho.png :/lvResources/Icons/ViewPerspective.png:/lvResources/Icons/ViewOrtho.png @@ -625,7 +625,7 @@ false - + :/lvResources/Icons/Measurements.png:/lvResources/Icons/Measurements.png @@ -637,7 +637,7 @@ - + :/lvResources/Icons/planefit.png:/lvResources/Icons/planefit.png @@ -649,7 +649,7 @@ - + :/lvResources/Icons/pqSpreadsheet16.png:/lvResources/Icons/pqSpreadsheet16.png @@ -661,7 +661,7 @@ true - + :/lvResources/Icons/location.png:/lvResources/Icons/location.png @@ -676,7 +676,7 @@ true - + :/lvResources/Icons/absolute.png:/lvResources/Icons/absolute.png @@ -688,7 +688,7 @@ - + :/lvResources/Icons/las.png:/lvResources/Icons/las.png @@ -700,7 +700,7 @@ - + :/lvResources/Icons/crop.png:/lvResources/Icons/crop.png @@ -734,7 +734,7 @@ - + :/lvResources/Icons/errorConsole.png:/lvResources/Icons/errorConsole.png @@ -772,7 +772,7 @@ true - + :/lvResources/Icons/map.png:/lvResources/Icons/map.png @@ -837,7 +837,7 @@ - + -- GitLab From 8f550687aafaa23c0359a31ceecb97ab4728a658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= Date: Fri, 16 Jun 2023 09:11:10 +0200 Subject: [PATCH 9/9] [submodule] Bump LVCore 2226f926 Merge branch 'fix/fixLidarViewTests' into 'master' f26f030e Merge branch 'feat/addCustomVoxelGridFilter' into 'master' 253e3818 Merge branch 'refact/improvePluginsExamples' into 'master' 80c1185e Merge branch 'feat/addAggregatePointsFromtrajectoryOnline' into 'master' 0b306fcb Merge branch 'style/fixLicenseClassReference' into 'master' df84e9d5 Merge branch 'fix/fixVideoReaderOpenCV' into 'master' 8000a9b2 Merge branch 'feat/addAggregatePointsFromTrajectory' into 'master' --- LVCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LVCore b/LVCore index 81d4de6bc..2226f9260 160000 --- a/LVCore +++ b/LVCore @@ -1 +1 @@ -Subproject commit 81d4de6bc7d3ea6aa46c6bc642993277330cc3c5 +Subproject commit 2226f92600cc80a31f0cc23d6b54477b6fafeb26 -- GitLab