Coding/style improvements

Author: ThomasKroes

src/ColoringAction.cpp

@@ -71,30 +71,30 @@ ColoringAction::ColoringAction(QObject* parent, const QString& title) :
         _constantColorAction.setEnabled(currentIndex == 0);
 
         const auto currentColorDataset = getCurrentColorDataset();
-        if (_currentColorPointsDataset.isValid())
-        {
+
+        if (_currentColorPointsDataset.isValid()) {
             disconnect(&_currentColorPointsDataset, &Dataset<Points>::dataDimensionsChanged, this, nullptr);
         }
+
         _currentColorPointsDataset = Dataset<Points>();
-        if (currentColorDataset.isValid()) {
-            const auto currentColorDatasetTypeIsPointType = currentColorDataset->getDataType() == PointType;
 
-            if (currentColorDatasetTypeIsPointType) {      
+        if (currentColorDataset.isValid()) {
+            if (currentColorDataset->getDataType() == PointType) {
                 _currentColorPointsDataset = currentColorDataset.get<Points>();
+
                 if (_currentColorPointsDataset.isValid()) {
                     connect(&_currentColorPointsDataset, &Dataset<Points>::dataDimensionsChanged, this, [this]() {
-                        if (_currentColorPointsDataset.isValid())
-                        {
+                        if (_currentColorPointsDataset.isValid()) {
                             _dimensionAction.setPointsDataset(_currentColorPointsDataset);
                             updateScatterPlotWidgetColors();
                         }
-                        });
+					});
+
                     _dimensionAction.setPointsDataset(_currentColorPointsDataset);
                 }
                 else {
                     _dimensionAction.setPointsDataset(Dataset<Points>());
                 }
-                
             }
             else {
                 _dimensionAction.setPointsDataset(Dataset<Points>());

src/ColoringAction.h

@@ -127,14 +127,14 @@ class ColoringAction : public VerticalGroupAction
     void currentColorDatasetChanged(Dataset<DatasetImpl> currentColorDataset);
 
 private:
-    ScatterplotPlugin*      _scatterplotPlugin;     /** Pointer to scatter plot plugin */
-    ColorSourceModel        _colorByModel;          /** Color by model (model input for the color by action) */
-    OptionAction            _colorByAction;         /** Action for picking the coloring type */
-    ColorAction             _constantColorAction;   /** Action for picking the constant color */
-    DimensionPickerAction   _dimensionAction;       /** Dimension picker action */
-    ColorMap1DAction        _colorMap1DAction;      /** One-dimensional color map action */
-    ColorMap2DAction        _colorMap2DAction;      /** Two-dimensional color map action */
-    Dataset<Points>    _currentColorPointsDataset;      /** Current color dataset */
+    ScatterplotPlugin*      _scatterplotPlugin;             /** Pointer to scatter plot plugin */
+    ColorSourceModel        _colorByModel;                  /** Color by model (model input for the color by action) */
+    OptionAction            _colorByAction;                 /** Action for picking the coloring type */
+    ColorAction             _constantColorAction;           /** Action for picking the constant color */
+    DimensionPickerAction   _dimensionAction;               /** Dimension picker action */
+    ColorMap1DAction        _colorMap1DAction;              /** One-dimensional color map action */
+    ColorMap2DAction        _colorMap2DAction;              /** Two-dimensional color map action */
+    Dataset<Points>         _currentColorPointsDataset;     /** Current color dataset */
 
     /** Default constant color */
     static const QColor DEFAULT_CONSTANT_COLOR;