Skip to content

Commit

Permalink
Change HDPS to ManiVault
Browse files Browse the repository at this point in the history
  • Loading branch information
alxvth committed Jan 4, 2024
1 parent 38c6af9 commit 96911b1
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions ExampleAnalysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ target_sources(${EXAMPLEANALYSIS} PRIVATE ${EXAMPLEANALYSIS_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLEANALYSIS} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -81,7 +81,7 @@ target_link_libraries(${EXAMPLEANALYSIS} PRIVATE Qt6::WebEngineWidgets)
# -----------------------------------------------------------------------------
# Target library linking
# -----------------------------------------------------------------------------
# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
2 changes: 1 addition & 1 deletion ExampleAnalysis/src/ExampleAnalysisPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void ExampleAnalysisPlugin::init()
setOutputDataset(_core->createDerivedDataset("Output Data", getInputDataset(), getInputDataset()));

// Retrieve the input dataset for our specific data type (in our case points)
// The HDPS core sets the input dataset reference when the plugin is created
// The ManiVault core sets the input dataset reference when the plugin is created
const auto inputPoints = getInputDataset<Points>();

// Retrieve the output dataset for our specific data type (in our case points)
Expand Down
6 changes: 3 additions & 3 deletions ExampleAnalysis/src/ExampleAnalysisPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
#include <QRandomGenerator>
#include <QtMath>

/** All plugin related classes are in the HDPS plugin namespace */
/** All plugin related classes are in the ManiVault plugin namespace */
using namespace mv::plugin;

/** Vector classes used in this plugin are in the HDPS namespace */
/** Vector classes used in this plugin are in the ManiVault namespace */
using namespace mv;

/**
* Example analysis plugin class
*
* This analysis plugin class provides skeleton code that shows how to develop
* an analysis plugin in HDPS.
* an analysis plugin in ManiVault.
*
* The plugin simulates the analysis of points, where point positions are randomly
* initialized. During simulation, the points are advanced along a random heading
Expand Down
4 changes: 2 additions & 2 deletions ExampleAnalysis/src/SettingsAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "actions/Actions.h"

/** All GUI related classes are in the HDPS Graphical User Interface namespace */
/** All GUI related classes are in the ManiVault Graphical User Interface namespace */
using namespace mv::gui;

/**
Expand All @@ -16,7 +16,7 @@ using namespace mv::gui;
* actions in a form-like fashion. The order in which they appear corresponds with
* the order of declaration.
*
* Note: we strongly encourage you to use HDPS core actions to build the user
* Note: we strongly encourage you to use ManiVault core actions to build the user
* interface. Actions separate the data and business logic from the user interface.
* We have standard actions for editing of strings, decimals, integrals, options,
* color and color maps. With these components, there is no need to write to create
Expand Down
4 changes: 2 additions & 2 deletions ExampleData/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ target_sources(${EXAMPLEDATA} PRIVATE ${EXAMPLEDATA_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLEDATA} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -81,7 +81,7 @@ set_target_properties(${EXAMPLEDATA} PROPERTIES PUBLIC_HEADER "${EXAMPLE_DATA_HE
target_link_libraries(${EXAMPLEDATA} PRIVATE Qt6::Widgets)
target_link_libraries(${EXAMPLEDATA} PRIVATE Qt6::WebEngineWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
4 changes: 2 additions & 2 deletions ExampleLoader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ target_sources(${EXAMPLELOADER} PRIVATE ${EXAMPLELOADER_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLELOADER} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -79,7 +79,7 @@ target_compile_features(${EXAMPLELOADER} PRIVATE cxx_std_17)
target_link_libraries(${EXAMPLELOADER} PRIVATE Qt6::Widgets)
target_link_libraries(${EXAMPLELOADER} PRIVATE Qt6::WebEngineWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
4 changes: 2 additions & 2 deletions ExampleTransformation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ target_sources(${EXAMPLETRANSFORMATION} PRIVATE ${EXAMPLETRANSFORMATION_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLETRANSFORMATION} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -79,7 +79,7 @@ target_compile_features(${EXAMPLETRANSFORMATION} PRIVATE cxx_std_17)
target_link_libraries(${EXAMPLETRANSFORMATION} PRIVATE Qt6::Widgets)
target_link_libraries(${EXAMPLETRANSFORMATION} PRIVATE Qt6::WebEngineWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
4 changes: 2 additions & 2 deletions ExampleView/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ target_sources(${EXAMPLEVIEW} PRIVATE ${EXAMPLEVIEW_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLEVIEW} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -79,7 +79,7 @@ target_compile_features(${EXAMPLEVIEW} PRIVATE cxx_std_17)
target_link_libraries(${EXAMPLEVIEW} PRIVATE Qt6::Widgets)
target_link_libraries(${EXAMPLEVIEW} PRIVATE Qt6::WebEngineWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
10 changes: 5 additions & 5 deletions ExampleView/src/ExampleViewPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

#include <QWidget>

/** All plugin related classes are in the HDPS plugin namespace */
/** All plugin related classes are in the ManiVault plugin namespace */
using namespace mv::plugin;

/** Drop widget used in this plugin is located in the HDPS gui namespace */
/** Drop widget used in this plugin is located in the ManiVault gui namespace */
using namespace mv::gui;

/** Dataset reference used in this plugin is located in the HDPS util namespace */
/** Dataset reference used in this plugin is located in the ManiVault util namespace */
using namespace mv::util;

class QLabel;
Expand All @@ -24,12 +24,12 @@ class QLabel;
* Example view plugin class
*
* This view plugin class provides skeleton code that shows how to develop
* a view plugin in HDPS. It shows how to use the built-in drag and drop
* a view plugin in ManiVault. It shows how to use the built-in drag and drop
* behavior.
*
* To see the plugin in action, please follow the steps below:
*
* 1. Go to the visualization menu in HDPS
* 1. Go to the visualization menu in ManiVault
* 2. Choose the Example view menu item, the view will be added to the layout
*
* @authors J. Thijssen & T. Kroes
Expand Down
4 changes: 2 additions & 2 deletions ExampleViewJS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ target_sources(${EXAMPLEVIEWJS} PRIVATE ${EXAMPLEVIEWJS_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLEVIEWJS} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -98,7 +98,7 @@ target_compile_features(${EXAMPLEVIEWJS} PRIVATE cxx_std_17)
target_link_libraries(${EXAMPLEVIEWJS} PRIVATE Qt6::Widgets)
target_link_libraries(${EXAMPLEVIEWJS} PRIVATE Qt6::WebEngineWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
6 changes: 3 additions & 3 deletions ExampleViewJS/src/ExampleViewJSPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

#include <QWidget>

/** All plugin related classes are in the HDPS plugin namespace */
/** All plugin related classes are in the ManiVault plugin namespace */
using namespace mv::plugin;

/** Drop widget used in this plugin is located in the HDPS gui namespace */
/** Drop widget used in this plugin is located in the ManiVault gui namespace */
using namespace mv::gui;

/** Dataset reference used in this plugin is located in the HDPS util namespace */
/** Dataset reference used in this plugin is located in the ManiVault util namespace */
using namespace mv::util;

class ChartWidget;
Expand Down
4 changes: 2 additions & 2 deletions ExampleViewOpenGL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ target_sources(${EXAMPLEVIEWGL} PRIVATE ${EXAMPLEVIEWGL_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLEVIEWGL} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -93,7 +93,7 @@ target_link_libraries(${EXAMPLEVIEWGL} PRIVATE Qt6::WebEngineWidgets)
target_link_libraries(${EXAMPLEVIEWGL} PRIVATE Qt6::OpenGL)
target_link_libraries(${EXAMPLEVIEWGL} PRIVATE Qt6::OpenGLWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
6 changes: 3 additions & 3 deletions ExampleViewOpenGL/src/ExampleViewGLPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

#include <QWidget>

/** All plugin related classes are in the HDPS plugin namespace */
/** All plugin related classes are in the ManiVault plugin namespace */
using namespace mv::plugin;

/** Drop widget used in this plugin is located in the HDPS gui namespace */
/** Drop widget used in this plugin is located in the ManiVault gui namespace */
using namespace mv::gui;

/** Dataset reference used in this plugin is located in the HDPS util namespace */
/** Dataset reference used in this plugin is located in the ManiVault util namespace */
using namespace mv::util;

class ExampleGLWidget;
Expand Down
4 changes: 2 additions & 2 deletions ExampleWriter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ target_sources(${EXAMPLEWRITER} PRIVATE ${EXAMPLERITER_MOC})
# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
# Include HDPS headers, including system data plugins
# Include ManiVault headers, including system data plugins
target_include_directories(${EXAMPLEWRITER} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")

# -----------------------------------------------------------------------------
Expand All @@ -79,7 +79,7 @@ target_compile_features(${EXAMPLEWRITER} PRIVATE cxx_std_17)
target_link_libraries(${EXAMPLEWRITER} PRIVATE Qt6::Widgets)
target_link_libraries(${EXAMPLEWRITER} PRIVATE Qt6::WebEngineWidgets)

# Link to HDPS and data plugins
# Link to ManiVault and data plugins
# The link path in this repo assumes that the ManiVault core was built locally
# in contrast to having been installed with an installer. In the latter case you'll have
# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
Expand Down
10 changes: 5 additions & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ class ExamplePluginsConan(ConanFile):
"""Class to package ExamplePlugins using conan
Packages both RELEASE and DEBUG.
Uses rules_support (github.com/hdps/rulessupport) to derive
Uses rules_support (github.com/ManiVaultStudio/rulessupport) to derive
versioninfo based on the branch naming convention
as described in https://github.com/hdps/core/wiki/Branch-naming-rules
as described in https://github.com/ManiVaultStudio/core/wiki/Branch-naming-rules
"""

name = "ExamplePlugins"
description = (
"A collection of examples including analys, data, loader and view plugins."
)
topics = ("hdps", "plugin", "examples", "various")
url = "https://github.com/hdps/ExamplePlugins"
url = "https://github.com/ManiVaultStudio/ExamplePlugins"
author = "B. van Lew b.van_lew@lumc.nl" # conan recipe author
license = "MIT"

Expand All @@ -36,7 +36,7 @@ class ExamplePluginsConan(ConanFile):

scm = {
"type": "git",
"subfolder": "hdps/ExamplePlugins",
"subfolder": "ManiVaultStudio/ExamplePlugins",
"url": "auto",
"revision": "auto",
}
Expand Down Expand Up @@ -115,7 +115,7 @@ def _configure_cmake(self):
def build(self):
print("Build OS is : ", self.settings.os)

# The ExamplePlugins build expects the HDPS package to be in this install dir
# The ExamplePlugins build expects the ManiVaultStudio package to be in this install dir
hdps_pkg_root = self.deps_cpp_info["hdps-core"].rootpath
print("Install dir type: ", self.install_dir)
shutil.copytree(hdps_pkg_root, self.install_dir)
Expand Down

0 comments on commit 96911b1

Please sign in to comment.