瀏覽代碼

COMP: ctkVTK[..]Transfer[...]: Update enums to be compatible with C++98

Jean-Christophe Fillion-Robin 7 年之前
父節點
當前提交
7969d078a8

+ 7 - 7
Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferChart.cpp

@@ -230,7 +230,7 @@ void vtkDiscretizableColorTransferChart::UpdateMarkerPosition(
   this->Transform->InverseTransformPoints(m.GetScenePos().GetData(),
     pos.GetData(), 1);
 
-  if (rangeMoving == RangeMoving::MIN)
+  if (rangeMoving == RangeMoving_MIN)
   {
     double newValue = static_cast<double>(pos.GetX());
     if (newValue < this->OriginalRange[0])
@@ -250,7 +250,7 @@ void vtkDiscretizableColorTransferChart::UpdateMarkerPosition(
       this->ControlPoints->EndProcessing();
     }
   }
-  else if (rangeMoving == RangeMoving::MAX)
+  else if (rangeMoving == RangeMoving_MAX)
   {
     double newValue = static_cast<double>(pos.GetX());
     if (newValue > this->OriginalRange[1])
@@ -277,7 +277,7 @@ bool vtkDiscretizableColorTransferChart::MouseMoveEvent(
   const vtkContextMouseEvent &mouse)
 {
   if (mouse.GetButton() == vtkContextMouseEvent::LEFT_BUTTON &&
-    rangeMoving != RangeMoving::NONE)
+    rangeMoving != RangeMoving_NONE)
   {
     this->UpdateMarkerPosition(mouse);
   }
@@ -298,7 +298,7 @@ bool vtkDiscretizableColorTransferChart::MouseButtonPressEvent(
 {
   if (mouse.GetButton() == vtkContextMouseEvent::LEFT_BUTTON)
   {
-    if (rangeMoving == RangeMoving::NONE)
+    if (rangeMoving == RangeMoving_NONE)
     {
       this->CalculateUnscaledPlotTransform(
         this->CompositeHiddenItem->GetXAxis(),
@@ -318,12 +318,12 @@ bool vtkDiscretizableColorTransferChart::MouseButtonPressEvent(
       if (IsInRange(pixelMin[0] - catchWidth,
         pixelMin[0] + catchWidth, mouse.GetPos().GetX()))
       {
-        rangeMoving = RangeMoving::MIN;
+        rangeMoving = RangeMoving_MIN;
       }
       else if (IsInRange( pixelMax[0] - catchWidth, pixelMax[0] + catchWidth,
         mouse.GetPos().GetX()))
       {
-        rangeMoving = RangeMoving::MAX;
+        rangeMoving = RangeMoving_MAX;
       }
     }
   }
@@ -334,7 +334,7 @@ bool vtkDiscretizableColorTransferChart::MouseButtonPressEvent(
 bool vtkDiscretizableColorTransferChart::MouseButtonReleaseEvent(
   const vtkContextMouseEvent &mouse)
 {
-  rangeMoving = RangeMoving::NONE;
+  rangeMoving = RangeMoving_NONE;
   return this->Superclass::MouseButtonReleaseEvent(mouse);
 }
 

+ 5 - 3
Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferChart.h

@@ -91,9 +91,11 @@ protected:
   vtkSmartPointer<vtkHistogramMarker> MinMarker;
   vtkSmartPointer<vtkHistogramMarker> MaxMarker;
 
-  enum class RangeMoving {
-    NONE, MIN, MAX
-  } rangeMoving = RangeMoving::NONE;
+  enum RangeMoving {
+    RangeMoving_NONE, RangeMoving_MIN, RangeMoving_MAX
+  };
+  RangeMoving rangeMoving = RangeMoving_NONE;
+
   double DataRange[2];
   double CurrentRange[2];
   double OriginalRange[2];

+ 1 - 1
Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsComboBox.cpp

@@ -100,7 +100,7 @@ int ctkVTKScalarsToColorsComboBox::addScalarsToColors(
   }
   else
   {
-    img = QImage(this->iconSize(), QImage::Format::Format_ARGB32);
+    img = QImage(this->iconSize(), QImage::Format_ARGB32);
     img.fill(Qt::transparent);
   }