Fix CropReturn Dialog logic and behavior

 
See internal merge request 100

Author: bastienjacquet

VelodyneHDL/Testing/TestReader.cxx

@@ -135,16 +135,16 @@ bool testPointCount(vtkSmartPointer<vtkPolyData>& frame, std::istream& is)
 //-----------------------------------------------------------------------------
 bool testCropSettings(vtkSmartPointer<vtkPolyData>& frame, std::istream& is)
 {
-  bool cropEnabled, cropInside;
+  bool cropEnabled, cropOutside;
   double ptcropregion[6];
-  is >> cropEnabled >> cropInside;
+  is >> cropEnabled >> cropOutside;
   for(int i = 0; i < 6; ++i)
     {
     is >> ptcropregion[i];
     }
 
   reader->SetCropReturns(cropEnabled);
-  reader->SetCropInside(cropInside);
+  reader->SetCropOutside(cropOutside);
   reader->SetCropRegion(ptcropregion);
 
   return true;

VelodyneHDL/python/veloview/applogic.py

@@ -1615,7 +1615,7 @@ def onCropReturns(show = True):
     dialog = vvCropReturnsDialog(getMainWindow())
 
     cropEnabled = False
-    cropInside = False
+    cropOutside = False
     firstCorner = QtGui.QVector3D()
     secondCorner = QtGui.QVector3D()
 
@@ -1624,29 +1624,35 @@ def onCropReturns(show = True):
 
     if reader is not None:
         cropEnabled = reader.CropReturns
-        cropInside = reader.CropInside
+        cropOutside = reader.CropOutside
         firstCorner = QtGui.QVector3D(reader.CropRegion[0], reader.CropRegion[2], reader.CropRegion[4])
         secondCorner = QtGui.QVector3D(reader.CropRegion[1], reader.CropRegion[3], reader.CropRegion[5])
 
     if sensor is not None:
         cropEnabled = sensor.CropReturns
-        cropInside = sensor.CropInside
+        cropOutside = sensor.CropOutside
         firstCorner = QtGui.QVector3D(sensor.CropRegion[0], sensor.CropRegion[2], sensor.CropRegion[4])
         secondCorner = QtGui.QVector3D(sensor.CropRegion[1], sensor.CropRegion[3], sensor.CropRegion[5])
 
     #show the dialog box
     if show:
-        dialog.croppingEnabled = cropEnabled
-        dialog.cropInside = cropInside
+        dialog.cropOutside = cropOutside
         dialog.firstCorner = firstCorner
         dialog.secondCorner = secondCorner
+        dialog.croppingEnabled = cropEnabled
+        # Enforce the call to dialog.croppingEnabled."onChanged" even if dialog.croppingEnabled == cropEnabled
+        dialog.croppingEnabled = not dialog.croppingEnabled
+        dialog.croppingEnabled = not dialog.croppingEnabled
+
+        # update the dialog configuration
+        dialog.UpdateDialogWithCurrentSetting()
 
         if not dialog.exec_():
             return
 
     if reader is not None:
         reader.CropReturns = dialog.croppingEnabled
-        reader.CropInside = dialog.cropInside
+        reader.CropOutside = dialog.cropOutside
         reader.GetClientSideObject().SetCropMode(dialog.GetCropMode())
         p1 = dialog.firstCorner
         p2 = dialog.secondCorner
@@ -1656,7 +1662,7 @@ def onCropReturns(show = True):
 
     if sensor is not None:
         sensor.CropReturns = dialog.croppingEnabled
-        sensor.CropInside = dialog.cropInside
+        sensor.CropOutside = dialog.cropOutside
         p1 = dialog.firstCorner
         p2 = dialog.secondCorner
         sensor.CropRegion = [p1.x(), p2.x(), p1.y(), p2.y(), p1.z(), p2.z()]

VelodyneHDL/vtkVelodyneHDLReader.cxx

@@ -374,7 +374,7 @@ class vtkVelodyneHDLReader::vtkInternal
     this->ApplyTransform = 0;
     this->PointsSkip = 0;
     this->CropReturns = false;
-    this->CropInside = false;
+    this->CropOutside = false;
     this->CropRegion[0] = this->CropRegion[1] = 0.0;
     this->CropRegion[2] = this->CropRegion[3] = 0.0;
     this->CropRegion[4] = this->CropRegion[5] = 0.0;
@@ -485,7 +485,7 @@ class vtkVelodyneHDLReader::vtkInternal
   bool UseIntraFiringAdjustment;
 
   bool CropReturns;
-  bool CropInside;
+  bool CropOutside;
   bool AlreadyWarnAboutCalibration;
   double CropRegion[6];
   double distanceResolutionM;
@@ -812,11 +812,11 @@ void vtkVelodyneHDLReader::SetCropReturns(int crop)
 }
 
 //-----------------------------------------------------------------------------
-void vtkVelodyneHDLReader::SetCropInside(int crop)
+void vtkVelodyneHDLReader::SetCropOutside(int crop)
 {
-  if (!this->Internal->CropInside == !!crop)
+  if (!this->Internal->CropOutside == !!crop)
     {
-    this->Internal->CropInside = !!crop;
+    this->Internal->CropOutside = !!crop;
     this->Modified();
     }
 }
@@ -1335,8 +1335,8 @@ bool vtkVelodyneHDLReader::vtkInternal::shouldBeCroppedOut(double pos[3],double
         bool pointOutsideOfBox = pos[0] >= this->CropRegion[0] && pos[0] <= this->CropRegion[1] &&
           pos[1] >= this->CropRegion[2] && pos[1] <= this->CropRegion[3] &&
           pos[2] >= this->CropRegion[4] && pos[2] <= this->CropRegion[5];
-        return ((pointOutsideOfBox && !this->CropInside) ||
-            (!pointOutsideOfBox && this->CropInside));
+        return ((pointOutsideOfBox && this->CropOutside) ||
+            (!pointOutsideOfBox && !this->CropOutside));
         break;
       }
       case Spherical:
@@ -1354,8 +1354,8 @@ bool vtkVelodyneHDLReader::vtkInternal::shouldBeCroppedOut(double pos[3],double
           pointInsideOfBounds = (theta >= this->CropRegion[0] || theta <= this->CropRegion[1]) &&
           R >= this->CropRegion[4] && R <= this->CropRegion[5];
           }
-        return ((pointInsideOfBounds && !this->CropInside) ||
-            (!pointInsideOfBounds && this->CropInside));
+        return ((pointInsideOfBounds && this->CropOutside) ||
+            (!pointInsideOfBounds && !this->CropOutside));
         break;
       }
       case Cylindric:

VelodyneHDL/vtkVelodyneHDLReader.h

@@ -135,7 +135,7 @@ class VTK_EXPORT vtkVelodyneHDLReader : public vtkPolyDataAlgorithm
   void SetPointsSkip(int);
 
   void SetCropReturns(int);
-  void SetCropInside(int);
+  void SetCropOutside(int);
   void SetCropRegion(double[6]);
   void SetCropRegion(double, double, double, double, double, double);
   void SetCropMode(int cropMode);

VelodyneHDL/vtkVelodyneHDLSource.cxx

@@ -953,11 +953,11 @@ void vtkVelodyneHDLSource::SetCropReturns(int cr)
 }
 
 //-----------------------------------------------------------------------------
-void vtkVelodyneHDLSource::SetCropInside(int ci)
+void vtkVelodyneHDLSource::SetCropOutside(int ci)
 {
   boost::lock_guard<boost::mutex> lock(this->Internal->Consumer->ReaderMutex);
 
-  this->Internal->Consumer->GetReader()->SetCropInside(ci);
+  this->Internal->Consumer->GetReader()->SetCropOutside(ci);
   this->Modified();
 }
 

VelodyneHDL/vtkVelodyneHDLSource.h

@@ -90,7 +90,7 @@ class VTK_EXPORT vtkVelodyneHDLSource : public vtkPolyDataAlgorithm
   double GetDistanceResolutionM();
 
   void SetCropReturns(int);
-  void SetCropInside(int);
+  void SetCropOutside(int);
   void SetCropRegion(double[6]);
   void SetCropRegion(double, double, double, double, double, double);
 

VelodyneHDL/vvCropReturnsDialog.cxx

@@ -69,8 +69,8 @@ void vvCropReturnsDialog::pqInternal::saveSettings()
     this->CropGroupBox->isChecked());
 
   this->Settings->setValue(
-    "VelodyneHDLPlugin/CropReturnsDialog/CropInside",
-    this->CropInsideCheckBox->isChecked());
+    "VelodyneHDLPlugin/CropReturnsDialog/CropOutside",
+    this->CropOutsideCheckBox->isChecked());
 
   this->Settings->setValue(
     "VelodyneHDLPlugin/CropReturnsDialog/FirstCornerX",
@@ -120,10 +120,10 @@ void vvCropReturnsDialog::pqInternal::restoreSettings()
       "VelodyneHDLPlugin/CropReturnsDialog/EnableCropping",
       false).toBool());
 
-  this->CropInsideCheckBox->setChecked(
+  this->CropOutsideCheckBox->setChecked(
     this->Settings->value(
-      "VelodyneHDLPlugin/CropReturnsDialog/CropInside",
-      this->CropInsideCheckBox->isChecked()).toBool());
+      "VelodyneHDLPlugin/CropReturnsDialog/CropOutside",
+      this->CropOutsideCheckBox->isChecked()).toBool());
 
   this->X1SpinBox->setValue (
     this->Settings->value(
@@ -193,9 +193,10 @@ vvCropReturnsDialog::vvCropReturnsDialog(QWidget *p)
   connect(this->Internal->noneRadioButton,SIGNAL(clicked()),this,SLOT(onNoneToggled()));
   connect(this->Internal->cartesianRadioButton,SIGNAL(clicked()),this,SLOT(onCartesianToggled()));
   connect(this->Internal->sphericalRadioButton,SIGNAL(clicked()),this,SLOT(onSphericalToggled()));
+  connect(this->Internal->CropGroupBox, SIGNAL(clicked()), this, SLOT(onCropGroupBoxToggled()));
 
-  // Without configuration file, the none mode is set by default
-  this->Internal->noneRadioButton->setChecked(true);
+  // Without configuration file, the cartesian mode is set by default
+  this->Internal->cartesianRadioButton->setChecked(true);
   this->Internal->restoreSettings();
 }
 
@@ -217,15 +218,15 @@ void vvCropReturnsDialog::setCroppingEnabled(bool checked)
 }
 
 //-----------------------------------------------------------------------------
-bool vvCropReturnsDialog::cropInside() const
+bool vvCropReturnsDialog::cropOutside() const
 {
-  return this->Internal->CropInsideCheckBox->isChecked();
+  return this->Internal->CropOutsideCheckBox->isChecked();
 }
 
 //-----------------------------------------------------------------------------
-void vvCropReturnsDialog::setCropInside(bool checked)
+void vvCropReturnsDialog::setCropOutside(bool checked)
 {
-  this->Internal->CropInsideCheckBox->setChecked(checked);
+  this->Internal->CropOutsideCheckBox->setChecked(checked);
 }
 
 //-----------------------------------------------------------------------------
@@ -330,9 +331,9 @@ void vvCropReturnsDialog::pqInternal::SetSphericalSettings()
   this->ActivateSpinBox();
   // change the labels
   // list of unicode symbol : http://sites.psu.edu/symbolcodes/languages/ancient/greek/greekchart/
-  this->XLabel->setText(QString("theta ") + QString((QChar)0x03b8)); // theta symbol
-  this->YLabel->setText(QString("phi ") + QString((QChar)0x03c6)); //phi symbol
-  this->ZLabel->setText("R");
+  this->XLabel->setText("Rotational angle");
+  this->YLabel->setText("Vertical angle");
+  this->ZLabel->setText("Distance");
 
   // Here we take the spherical coordinates used in mathematics (and not physic)
   // (r,theta,phi)
@@ -354,15 +355,9 @@ void vvCropReturnsDialog::pqInternal::SetSphericalSettings()
   this->Z1SpinBox->setMinimum(0);
   this->Z2SpinBox->setMinimum(0);
   this->ZDoubleRangeSlider.setMinimum(0);
-  this->Z1SpinBox->setMaximum(1000);
-  this->Z2SpinBox->setMaximum(1000);
-  this->ZDoubleRangeSlider.setMaximum(1000);
-
-  // Hide phi selection since the laser 
-  // selection does almost the same thing
-  this->Y1SpinBox->setDisabled(true);
-  this->Y2SpinBox->setDisabled(true);
-  this->YDoubleRangeSlider.setDisabled(true);
+  this->Z1SpinBox->setMaximum(120);
+  this->Z2SpinBox->setMaximum(120);
+  this->ZDoubleRangeSlider.setMaximum(120);
 }
 
 //-----------------------------------------------------------------------------
@@ -382,7 +377,7 @@ void vvCropReturnsDialog::pqInternal::SetCartesianSettings()
   this->XDoubleRangeSlider.setMinimum(minV);
   this->X1SpinBox->setMaximum(maxV);
   this->X2SpinBox->setMaximum(maxV);
-  this->XDoubleRangeSlider.setMaximumValue(maxV);
+  this->XDoubleRangeSlider.setMaximum(maxV);
   // Y [-10000,10000]
   this->Y1SpinBox->setMinimum(minV);
   this->Y2SpinBox->setMinimum(minV);
@@ -397,19 +392,13 @@ void vvCropReturnsDialog::pqInternal::SetCartesianSettings()
   this->Z1SpinBox->setMaximum(maxV);
   this->Z2SpinBox->setMaximum(maxV);
   this->ZDoubleRangeSlider.setMaximum(maxV);
-
-  // Activate the Y SpinBox since the Spherical
-  // settings desactivate it
-  this->Y1SpinBox->setDisabled(false);
-  this->Y2SpinBox->setDisabled(false);
-  this->YDoubleRangeSlider.setDisabled(false);
 }
 
 //-----------------------------------------------------------------------------
 void vvCropReturnsDialog::onNoneToggled()
 {
   this->Internal->DesactivateSpinBox();
-  this->Internal->CropInsideCheckBox->setChecked(false);
+  this->Internal->CropOutsideCheckBox->setChecked(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -458,7 +447,7 @@ void vvCropReturnsDialog::pqInternal::ActivateSpinBox()
   this->YDoubleRangeSlider.setDisabled(false);
   this->ZDoubleRangeSlider.setDisabled(false);
 
-  this->CropInsideCheckBox->setDisabled(false);
+  this->CropOutsideCheckBox->setDisabled(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -569,7 +558,7 @@ void vvCropReturnsDialog::pqInternal::DesactivateSpinBox()
   this->YDoubleRangeSlider.setDisabled(true);
   this->ZDoubleRangeSlider.setDisabled(true);
 
-  this->CropInsideCheckBox->setDisabled(true);
+  this->CropOutsideCheckBox->setDisabled(true);
 }
 
 //-----------------------------------------------------------------------------
@@ -644,4 +633,32 @@ void vvCropReturnsDialog::pqInternal::updateRangeValues(bool isSliderMode)
 void vvCropReturnsDialog::onSpinBoxChanged(double value)
 {
   this->Internal->updateRangeValues(false);
+}
+
+//-----------------------------------------------------------------------------
+void vvCropReturnsDialog::onCropGroupBoxToggled()
+{
+  this->Internal->X1SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->X2SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->Y1SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->Y2SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->Z1SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->Z2SpinBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->XDoubleRangeSlider.setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->YDoubleRangeSlider.setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->ZDoubleRangeSlider.setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->noneRadioButton->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->cartesianRadioButton->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->sphericalRadioButton->setDisabled(!this->Internal->CropGroupBox->isChecked());
+  this->Internal->CropOutsideCheckBox->setDisabled(!this->Internal->CropGroupBox->isChecked());
+}
+
+//-----------------------------------------------------------------------------
+void vvCropReturnsDialog::UpdateDialogWithCurrentSetting()
+{
+  this->onCropGroupBoxToggled();
+  if (this->Internal->noneRadioButton->isChecked())
+    {
+    this->onNoneToggled();
+    }
 }

VelodyneHDL/vvCropReturnsDialog.h

@@ -23,26 +23,29 @@ class VelodyneHDLPlugin_EXPORT vvCropReturnsDialog : public QDialog
 {
   Q_OBJECT
   Q_PROPERTY(bool croppingEnabled READ croppingEnabled WRITE setCroppingEnabled)
-  Q_PROPERTY(bool cropInside READ cropInside WRITE setCropInside)
+  Q_PROPERTY(bool cropOutside READ cropOutside WRITE setCropOutside)
   Q_PROPERTY(QVector3D firstCorner READ firstCorner WRITE setFirstCorner)
   Q_PROPERTY(QVector3D secondCorner READ secondCorner WRITE setSecondCorner)
+  Q_PROPERTY(QVector3D secondCorner READ secondCorner WRITE setSecondCorner)
 
 public:
   vvCropReturnsDialog(QWidget *p=0);
   virtual ~vvCropReturnsDialog();
 
   bool croppingEnabled() const;
-  bool cropInside() const;
+  bool cropOutside() const;
 
   void setCroppingEnabled(bool);
-  void setCropInside(bool);
+  void setCropOutside(bool);
 
   QVector3D firstCorner() const;
   QVector3D secondCorner() const;
 
   void setFirstCorner(QVector3D);
   void setSecondCorner(QVector3D);
 
+  Q_INVOKABLE void UpdateDialogWithCurrentSetting();
+
   Q_INVOKABLE int GetCropMode() const;
 
 public slots:
@@ -51,6 +54,7 @@ public slots:
   void onCartesianToggled();
   void onSphericalToggled();
   void onSliderBoxToggled();
+  void onCropGroupBoxToggled();
   void onSpinBoxChanged(double value);
   void onXSliderChanged(double vmin, double vmax);
   void onYSliderChanged(double vmin, double vmax);