Add toggleAction to control idle rotation

Author: ChangLi27

src/Renderer/OpenGL/OpenGLRendererWidget.cpp

@@ -27,6 +27,7 @@ void OpenGLRendererWidget::setColors(std::vector<float>& colors)
 {
     makeCurrent();
     _volumeRenderer.setColors(colors);
+    update();
 }
 
 void OpenGLRendererWidget::setColormap(const QImage& colormap)
@@ -40,6 +41,16 @@ void OpenGLRendererWidget::setCursorPoint(mv::Vector3f cursorPoint)
     update();
 }
 
+void OpenGLRendererWidget::setRotating(bool rotating)
+{
+    if (_rotating != rotating) {
+        _rotating = rotating;
+        if (_rotating) {
+            update(); 
+        }
+    }
+}
+
 void OpenGLRendererWidget::initializeGL()
 {
     initializeOpenGLFunctions();
@@ -133,7 +144,6 @@ bool OpenGLRendererWidget::eventFilter(QObject* target, QEvent* event)
         _previousMousePos = mousePos;
 
         _mousePressed = true;
-        _rotating = false; // FIXME: improve interaction with roation
         break;
     }
     case QEvent::MouseMove:

src/Renderer/OpenGL/OpenGLRendererWidget.h

@@ -28,7 +28,7 @@ class OpenGLRendererWidget : public QOpenGLWidget, QOpenGLFunctions_4_2_Core
     void setColors(std::vector<float>& colors);
     void setColormap(const QImage& colormap);
     void setCursorPoint(mv::Vector3f cursorPoint);
-
+    void setRotating(bool rotating);
 
 public:
     bool eventFilter(QObject* target, QEvent* event);
@@ -51,6 +51,5 @@ class OpenGLRendererWidget : public QOpenGLWidget, QOpenGLFunctions_4_2_Core
 
     bool _isInitialized = false;
 
-    // for rotation
-    bool _rotating = true;
+    bool _rotating = false;
 };

src/SettingsAction.cpp

@@ -16,7 +16,8 @@ SettingsAction::SettingsAction(QObject* parent, const QString& title) :
     _focusSelectionAction(this, "Focus Selection"),
     _focusFloodfillAction(this, "Focus Floodfill"),
     _focusSelectionNormAction(this, "SNorm"),
-    _focusFloodfillNormAction(this, "FNorm")
+    _focusFloodfillNormAction(this, "FNorm"),
+    _idleRotationAction(this, "Idle Rotation")
 {
     GroupsAction::GroupActions groupActions;
 
@@ -43,20 +44,25 @@ SettingsAction::SettingsAction(QObject* parent, const QString& title) :
     });
 
     connect(&_focusSelectionAction, &ToggleAction::toggled, this, [this](const bool& toggled) {
-            _plugin->setFocusSelection(toggled);
+        _plugin->setFocusSelection(toggled);
     });
 
     connect(&_focusFloodfillAction, &ToggleAction::toggled, this, [this](const bool& toggled) {
-            _plugin->setFocusFloodfill(toggled);
+        _plugin->setFocusFloodfill(toggled);
     });
 
     connect(&_focusSelectionNormAction, &ToggleAction::toggled, this, [this](const bool& toggled) {
-            _plugin->setFocusSelectionNorm(toggled);
+        _plugin->setFocusSelectionNorm(toggled);
     });
 
     connect(&_focusFloodfillNormAction, &ToggleAction::toggled, this, [this](const bool& toggled) {
-            _plugin->setFocusFloodfillNorm(toggled);
+        _plugin->setFocusFloodfillNorm(toggled);
     });
+
+    connect(&_idleRotationAction, &ToggleAction::toggled, this, [this](const bool& toggled) {
+        _plugin->setIdleRotation(toggled);
+    });
+
 }
 
 QMenu* SettingsAction::getContextMenu(QWidget* parent /*= nullptr*/)
@@ -75,6 +81,8 @@ void SettingsAction::fromVariantMap(const QVariantMap& variantMap)
     _positionDatasetPickerAction.fromParentVariantMap(variantMap);
     _colorDatasetPickerAction.fromParentVariantMap(variantMap);
 
+    _idleRotationAction.fromParentVariantMap(variantMap);
+
     auto positionDataset = _positionDatasetPickerAction.getCurrentDataset();
     if (positionDataset.isValid())
     {
@@ -99,5 +107,7 @@ QVariantMap SettingsAction::toVariantMap() const
     _positionDatasetPickerAction.insertIntoVariantMap(variantMap);
     _colorDatasetPickerAction.insertIntoVariantMap(variantMap);
 
+    _idleRotationAction.insertIntoVariantMap(variantMap);
+
     return variantMap;
 }

src/SettingsAction.h

@@ -57,6 +57,7 @@ class SettingsAction : public GroupAction
     ToggleAction& getFocusFloodfillAction() { return _focusFloodfillAction; }
     ToggleAction& getFocusSelectionNormAction() { return _focusSelectionNormAction; }
     ToggleAction& getFocusFloodfillNormAction() { return _focusFloodfillNormAction; }
+    ToggleAction& getIdleRotationAction() { return _idleRotationAction; }
 
 protected:
     VolumeViewerPlugin*     _plugin;                /** Pointer to volume viewer plugin */
@@ -68,4 +69,5 @@ class SettingsAction : public GroupAction
     ToggleAction            _focusFloodfillAction;
     ToggleAction            _focusSelectionNormAction;
     ToggleAction            _focusFloodfillNormAction;
+    ToggleAction            _idleRotationAction;
 };

src/VolumeViewerPlugin.cpp

@@ -102,10 +102,12 @@ VolumeViewerPlugin::VolumeViewerPlugin(const PluginFactory* factory) :
 
     _primaryToolbarAction.addAction(&_settingsAction->getPickRendererAction(), 4, GroupAction::Horizontal);
 
+
     _secondaryToolbarAction.addAction(&_settingsAction->getFocusSelectionAction());
     _secondaryToolbarAction.addAction(&_settingsAction->getFocusSelectionNormAction());
     _secondaryToolbarAction.addAction(&_settingsAction->getFocusFloodfillAction());
     _secondaryToolbarAction.addAction(&_settingsAction->getFocusFloodfillNormAction());
+    _secondaryToolbarAction.addAction(&_settingsAction->getIdleRotationAction());
 
 }
 
@@ -360,7 +362,6 @@ void VolumeViewerPlugin::init()
         }
 
         _volumeViewerWidget->getOpenGLWidget()->setColors(localUV);
-        _volumeViewerWidget->getOpenGLWidget()->update();
     });
 
     // Respond when the name of the dataset in the dataset reference changes
@@ -486,6 +487,10 @@ void VolumeViewerPlugin::init()
 
 }
 
+void VolumeViewerPlugin::setIdleRotation(bool idleRotation){
+    _volumeViewerWidget->getOpenGLWidget()->setRotating(idleRotation);
+}
+
 void VolumeViewerPlugin::setFocusSelection(bool focusSelection) {
     _focusSelection = focusSelection;
     qDebug() << "Focus selection: " << _focusSelection;

src/VolumeViewerPlugin.h

@@ -126,12 +126,16 @@ class VolumeViewerPlugin : public ViewPlugin
         return _pointsColorPoints;
     }
 
-public: // Focus selection
+public: 
+    // Focus selection
     void setFocusSelection(bool focusSelection);
     void setFocusFloodfill(bool focusFloodfill);
     void setFocusSelectionNorm(bool focusSelectionNorm);
     void setFocusFloodfillNorm(bool focusFloodfillNorm);
 
+    // Idle rotation
+    void setIdleRotation(bool idleRotation);
+
 public: // Serialization
     /**
     * Load plugin from variant map
@@ -169,7 +173,7 @@ class VolumeViewerPlugin : public ViewPlugin
     Dataset<Points>                     _floodFillDataset;          /** For focusing on floodfill */
 
     QStringList                         _pointsDatasets;            /** Point datasets loaded in mv */
-    mv::gui::DropWidget*              _dropWidget;                /** Widget for dropping data */
+    mv::gui::DropWidget*                _dropWidget;                /** Widget for dropping data */
     QString                             _currentDatasetName;        /** Name of the current dataset */
     std::vector<int>                    _planeArray;                /** Array indicating the index+1 of the x,y and z clipping planes in the plane collection*/
     std::vector<double>                 _shadingParameters;         /** Shading parameter save vector index 0 = ambient, index 1 = diffuse and index 2 = specular*/