Skip to content

Add mv namespace #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alxvth merged 1 commit into from
May 27, 2026
Merged

Add mv namespace #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DVRTransferFunction/src/GlobalAlphaAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ void GlobalAlphaAction::connectToPublicAction(WidgetAction* publicAction, bool r
return;

if (recursive) {
actions().connectPrivateActionToPublicAction(&_globalAlphaToggle, &publicGlobalAlphaAction->getAlphaToggleAction(), recursive);
actions().connectPrivateActionToPublicAction(&_globalAlphaValue, &publicGlobalAlphaAction->getAlphaIntegerAction(), recursive);
mv::actions().connectPrivateActionToPublicAction(&_globalAlphaToggle, &publicGlobalAlphaAction->getAlphaToggleAction(), recursive);
mv::actions().connectPrivateActionToPublicAction(&_globalAlphaValue, &publicGlobalAlphaAction->getAlphaIntegerAction(), recursive);
}

GroupAction::connectToPublicAction(publicAction, recursive);
Expand All @@ -64,8 +64,8 @@ void GlobalAlphaAction::disconnectFromPublicAction(bool recursive)
return;

if (recursive) {
actions().disconnectPrivateActionFromPublicAction(&_globalAlphaToggle, recursive);
actions().disconnectPrivateActionFromPublicAction(&_globalAlphaValue, recursive);
mv::actions().disconnectPrivateActionFromPublicAction(&_globalAlphaToggle, recursive);
mv::actions().disconnectPrivateActionFromPublicAction(&_globalAlphaValue, recursive);
}

GroupAction::disconnectFromPublicAction(recursive);
Expand Down
10 changes: 5 additions & 5 deletions DVRTransferFunction/src/PointAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <DataHierarchyItem.h>

using namespace gui;
using namespace mv::gui;

PointAction::PointAction(QObject* parent, const QString& title) :
HorizontalGroupAction(parent, title),
Expand All @@ -27,8 +27,8 @@ void PointAction::connectToPublicAction(WidgetAction* publicAction, bool recursi
return;

if (recursive) {
actions().connectPrivateActionToPublicAction(&_sizeAction, &publicPointAction->getSizeAction(), recursive);
actions().connectPrivateActionToPublicAction(&_opacityAction, &publicPointAction->getOpacityAction(), recursive);
mv::actions().connectPrivateActionToPublicAction(&_sizeAction, &publicPointAction->getSizeAction(), recursive);
mv::actions().connectPrivateActionToPublicAction(&_opacityAction, &publicPointAction->getOpacityAction(), recursive);
}

GroupAction::connectToPublicAction(publicAction, recursive);
Expand All @@ -40,8 +40,8 @@ void PointAction::disconnectFromPublicAction(bool recursive)
return;

if (recursive) {
actions().disconnectPrivateActionFromPublicAction(&_sizeAction, recursive);
actions().disconnectPrivateActionFromPublicAction(&_opacityAction, recursive);
mv::actions().disconnectPrivateActionFromPublicAction(&_sizeAction, recursive);
mv::actions().disconnectPrivateActionFromPublicAction(&_opacityAction, recursive);
}

GroupAction::disconnectFromPublicAction(recursive);
Expand Down
6 changes: 3 additions & 3 deletions DVRTransferFunction/src/SelectionAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SelectionAction::SelectionAction(QObject* parent, const QString& title) :
GroupAction(parent, title),
_pixelSelectionAction(this, "Point Selection")
{
setIcon(util::StyledIcon("mouse-pointer"));
setIcon(mv::util::StyledIcon("mouse-pointer"));

setConfigurationFlag(WidgetAction::ConfigurationFlag::HiddenInActionContextMenu);
setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
Expand Down Expand Up @@ -47,7 +47,7 @@ void SelectionAction::connectToPublicAction(WidgetAction* publicAction, bool rec
return;

if (recursive) {
actions().connectPrivateActionToPublicAction(&_pixelSelectionAction, &publicSelectionAction->getPixelSelectionAction(), recursive);
mv::actions().connectPrivateActionToPublicAction(&_pixelSelectionAction, &publicSelectionAction->getPixelSelectionAction(), recursive);
}

GroupAction::connectToPublicAction(publicAction, recursive);
Expand All @@ -59,7 +59,7 @@ void SelectionAction::disconnectFromPublicAction(bool recursive)
return;

if (recursive) {
actions().disconnectPrivateActionFromPublicAction(&_pixelSelectionAction, recursive);
mv::actions().disconnectPrivateActionFromPublicAction(&_pixelSelectionAction, recursive);
}

GroupAction::disconnectFromPublicAction(recursive);
Expand Down
6 changes: 3 additions & 3 deletions DVRTransferFunction/src/TransferFunctionPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TransferFunctionPlugin : public ViewPlugin
* Load one (or more datasets in the view)
* @param datasets Dataset(s) to load
*/
void loadData(const Datasets& datasets) override;
void loadData(const mv::Datasets& datasets) override;

/** Get number of points in the position dataset */
std::uint32_t getNumberOfPoints() const;
Expand All @@ -56,7 +56,7 @@ class TransferFunctionPlugin : public ViewPlugin
public: // Miscellaneous

/** Get smart pointer to points dataset for point position */
Dataset<Points>& getPositionDataset();
mv::Dataset<Points>& getPositionDataset();

public:

Expand Down Expand Up @@ -87,7 +87,7 @@ class TransferFunctionPlugin : public ViewPlugin
QPointer<TransferFunctionWidget> _transferFunctionWidget; /** The visualization widget */
mv::gui::DropWidget* _dropWidget; /** Widget for dropping datasets */

Dataset<Points> _positionDataset; /** Smart pointer to points dataset for point position */
mv::Dataset<Points> _positionDataset; /** Smart pointer to points dataset for point position */
std::vector<mv::Vector2f> _positions; /** Point positions */
unsigned int _numPoints; /** Number of point positions */

Expand Down
Loading