The cross section box orientation can now be setup via the 'advanced' button

dgirardeau · dgirardeau · commit 1531ef36f24c · 2016-03-17T21:55:28.000+01:00
diff --git a/libs/qCC_db/ccClipBox.cpp b/libs/qCC_db/ccClipBox.cpp
@@ -436,7 +436,7 @@ bool ccClipBox::move3D(const CCVector3d& uInput)
 	{
 		//we guess the rotation order by comparing the current screen 'normal'
 		//and the vector prod of u and the current rotation axis
-		CCVector3d Rb(0,0,0);
+		CCVector3d Rb(0, 0, 0);
 		switch(m_activeComponent)
 		{
 		case X_MINUS_TORUS:
@@ -464,7 +464,9 @@ bool ccClipBox::move3D(const CCVector3d& uInput)
 		
 		CCVector3d R = Rb;
 		if (m_glTransEnabled)
+		{
 			m_glTrans.applyRotation(R);
+		}
 
 		CCVector3d RxU = R.cross(u);
 
@@ -480,12 +482,12 @@ bool ccClipBox::move3D(const CCVector3d& uInput)
 		}
 
 		//angle is proportional to absolute displacement
-		double angle_rad = u.norm()/m_box.getDiagNorm() * M_PI;
+		double angle_rad = u.norm() / m_box.getDiagNorm() * M_PI;
 		if (maxDot < 0.0)
 			angle_rad = -angle_rad;
 
 		ccGLMatrixd rotMat;
-		rotMat.initFromParameters(angle_rad,Rb,CCVector3d(0,0,0));
+		rotMat.initFromParameters(angle_rad, Rb, CCVector3d(0, 0, 0));
 
 		CCVector3 C = m_box.getCenter();
 		ccGLMatrixd transMat;
diff --git a/qCC/bin_other/history.txt b/qCC/bin_other/history.txt
@@ -3,8 +3,11 @@
 v2.6.3.1 - 03/XX/2016
 
 - Enhancements:
+	
 	* Camera sensors can now be created 'freely' (i.e. not necessarily attached to a given entity) and moved freely in the DB tree
 
+	* The cross section box orientation can now be setup via the 'advanced' button
+
 - Bug fixes:
 	* The meshes over the user-specified limit (display options) were ALWAYS decimated (and not only when the mouse is moved)
 	* 2D area label picking was broken (first corner was misplaced)
diff --git a/qCC/ccBoundingBoxEditorDlg.cpp b/qCC/ccBoundingBoxEditorDlg.cpp
@@ -29,6 +29,8 @@ ccBoundingBoxEditorDlg::ccBoundingBoxEditorDlg(QWidget* parent/*=0*/)
 {
 	setupUi(this);
 
+	showBoxAxes(false);
+
 	xDoubleSpinBox->setMinimum(-1.0e9);
 	yDoubleSpinBox->setMinimum(-1.0e9);
 	zDoubleSpinBox->setMinimum(-1.0e9);
@@ -58,6 +60,16 @@ ccBoundingBoxEditorDlg::ccBoundingBoxEditorDlg(QWidget* parent/*=0*/)
 	connect(dyDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(updateYWidth(double)));	
 	connect(dzDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(updateZWidth(double)));	
 
+	connect(xOriXDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(xOriYDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(xOriZDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(yOriXDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(yOriYDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(yOriZDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(zOriXDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(zOriYDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+	connect(zOriZDoubleSpinBox,	SIGNAL(valueChanged(double)),		this,	SLOT(onAxisValueChanged(double)));
+
 	defaultPushButton->setVisible(false);
 	lastPushButton->setVisible(s_lastBBox.isValid());
 	checkBaseInclusion();
@@ -196,6 +208,30 @@ void ccBoundingBoxEditorDlg::resetToLast()
 
 void ccBoundingBoxEditorDlg::saveBoxAndAccept()
 {
+	if (oriGroupBox->isVisible())
+	{
+		CCVector3 X, Y, Z;
+		getBoxAxes(X, Y, Z);
+		X.normalize();
+		Y.normalize();
+		Z.normalize();
+		if (	X.norm2d() == 0
+			||	Y.norm2d() == 0
+			||	Z.norm2d() == 0 )
+		{
+			ccLog::Error("Invalid axes definition: at least two vectors are colinear");
+			return;
+		}
+
+		//if (	fabs(X.dot(Y)) > 1.0e-6 
+		//	||	fabs(Y.dot(Z)) > 1.0e-6 
+		//	||	fabs(Z.dot(X)) > 1.0e-6 )
+		//{
+		//	ccLog::Error("Invalid axes definition: vectors must be orthogonal");
+		//	return;
+		//}
+	}
+
 	s_lastBBox = m_currentBBox;
 	
 	accept();
@@ -349,3 +385,90 @@ void ccBoundingBoxEditorDlg::reflectChanges(int dummy)
 		dzDoubleSpinBox->blockSignals(false);
 	}
 }
+
+void ccBoundingBoxEditorDlg::showBoxAxes(bool state)
+{
+	oriGroupBox->setVisible(state);
+
+	resize(QSize(600, state ? 400 : 250));
+}
+
+void ccBoundingBoxEditorDlg::setBoxAxes(const CCVector3& X, const CCVector3& Y, const CCVector3& Z)
+{
+	//if (xOriFrame->isEnabled())
+	{
+		xOriXDoubleSpinBox->setValue(X.x);
+		xOriYDoubleSpinBox->setValue(X.y);
+		xOriZDoubleSpinBox->setValue(X.z);
+	}
+
+	//if (yOriFrame->isEnabled())
+	{
+		yOriXDoubleSpinBox->setValue(Y.x);
+		yOriYDoubleSpinBox->setValue(Y.y);
+		yOriZDoubleSpinBox->setValue(Y.z);
+	}
+
+	//if (zOriFrame->isEnabled())
+	{
+		zOriXDoubleSpinBox->setValue(Z.x);
+		zOriYDoubleSpinBox->setValue(Z.y);
+		zOriZDoubleSpinBox->setValue(Z.z);
+	}
+}
+
+void ccBoundingBoxEditorDlg::getBoxAxes(CCVector3& X, CCVector3& Y, CCVector3& Z)
+{
+	X = CCVector3(	static_cast<PointCoordinateType>(xOriXDoubleSpinBox->value()),
+					static_cast<PointCoordinateType>(xOriYDoubleSpinBox->value()),
+					static_cast<PointCoordinateType>(xOriZDoubleSpinBox->value()) );
+
+	Y = CCVector3(	static_cast<PointCoordinateType>(yOriXDoubleSpinBox->value()),
+					static_cast<PointCoordinateType>(yOriYDoubleSpinBox->value()),
+					static_cast<PointCoordinateType>(yOriZDoubleSpinBox->value()) );
+
+	Z = CCVector3(	static_cast<PointCoordinateType>(zOriXDoubleSpinBox->value()),
+					static_cast<PointCoordinateType>(zOriYDoubleSpinBox->value()),
+					static_cast<PointCoordinateType>(zOriZDoubleSpinBox->value()) );
+}
+
+void ccBoundingBoxEditorDlg::onAxisValueChanged(double)
+{
+	CCVector3 X, Y, Z;
+	getBoxAxes(X, Y, Z);
+
+	QDoubleSpinBox* vecSpinBoxes[3] = { 0, 0, 0 };
+	CCVector3 N(0, 0, 0);
+	if (oriXCheckBox->isChecked())
+	{
+		N = Y.cross(Z);
+		vecSpinBoxes[0] = xOriXDoubleSpinBox;
+		vecSpinBoxes[1] = xOriYDoubleSpinBox;
+		vecSpinBoxes[2] = xOriZDoubleSpinBox;
+	}
+	else if (oriYCheckBox->isChecked())
+	{
+		N = Z.cross(X);
+		vecSpinBoxes[0] = yOriXDoubleSpinBox;
+		vecSpinBoxes[1] = yOriYDoubleSpinBox;
+		vecSpinBoxes[2] = yOriZDoubleSpinBox;
+	}
+	else if (oriZCheckBox->isChecked())
+	{
+		N = X.cross(Y);
+		vecSpinBoxes[0] = zOriXDoubleSpinBox;
+		vecSpinBoxes[1] = zOriYDoubleSpinBox;
+		vecSpinBoxes[2] = zOriZDoubleSpinBox;
+	}
+	else
+	{
+		assert(false);
+	}
+
+	for (int i=0; i<3; ++i)
+	{
+		vecSpinBoxes[i]->blockSignals(true);
+		vecSpinBoxes[i]->setValue(N.u[i]);
+		vecSpinBoxes[i]->blockSignals(false);
+	}
+}
diff --git a/qCC/ccBoundingBoxEditorDlg.h b/qCC/ccBoundingBoxEditorDlg.h
@@ -34,14 +34,20 @@ class ccBoundingBoxEditorDlg : public QDialog, public Ui::BoundingBoxEditorDialo
 	explicit ccBoundingBoxEditorDlg(QWidget* parent = 0);
 
 	//! Returns bounding box
-	ccBBox getBox() const { return m_currentBBox; }
+	const ccBBox& getBox() const { return m_currentBBox; }
 
-	//! Sets (minimal) base box
+	//! Sets the (minimal) base box
 	/** \param box base box
 		\param isMinimal set whether the user must define a bounding-box at least as large as this one
 	**/
 	void setBaseBBox(const ccBBox& box, bool isMinimal = true);
 
+	//! Sets the box axes
+	void setBoxAxes(const CCVector3& X, const CCVector3& Y, const CCVector3& Z);
+
+	//! Returns the box axes
+	void getBoxAxes(CCVector3& X, CCVector3& Y, CCVector3& Z);
+
 	//! Whether the warning about bounding box inclusion in the base one should be displayed or not
 	/** True by default.
 	**/
@@ -53,9 +59,12 @@ class ccBoundingBoxEditorDlg : public QDialog, public Ui::BoundingBoxEditorDialo
 	//! Returns whether 'keep square' mode is enabled or not
 	bool keepSquare() const;
 
-	//! Sets 2D mode ('dim' line will be hidden)
+	//! Sets 2D mode (the line 'dim' will be hidden)
 	void set2DMode(bool state, unsigned char dim);
 
+	//! Whether to display or not the box axes
+	void showBoxAxes(bool state);
+
 public slots:
 
 	//overloaded from QDialog
@@ -77,6 +86,9 @@ protected slots:
 	void updateCurrentBBox(double dummy = 0.0);
 	//! Reflects changes on bbox
 	void reflectChanges(int dummy = 0);
+	
+	//! Slot called anytime a component of the box axes is modified
+	void onAxisValueChanged(double);
 
 protected:
 
diff --git a/qCC/ccClippingBoxTool.cpp b/qCC/ccClippingBoxTool.cpp
@@ -116,23 +116,59 @@ void ccClippingBoxTool::editBox()
 	if (!m_clipBox)
 		return;
 
-	ccBBox box = m_clipBox->getBox();
+	ccBBox box;
+	ccGLMatrix transformation;
+	m_clipBox->get(box, transformation);
 
 	ccBoundingBoxEditorDlg bbeDlg(this);
 	bbeDlg.setBaseBBox(box, false);
 	bbeDlg.showInclusionWarning(false);
 	bbeDlg.setWindowTitle("Edit clipping box");
+	
+	//show the box 'axes' (orientation)
+	bbeDlg.showBoxAxes(true);
+	//transformation.invert();
+	bbeDlg.setBoxAxes(	transformation.getColumnAsVec3D(0),
+						transformation.getColumnAsVec3D(1),
+						transformation.getColumnAsVec3D(2) );
 
 	if (!bbeDlg.exec())
 		return;
 
 	box = bbeDlg.getBox();
 	m_clipBox->setBox(box);
 
+	//construct the local box orientation matrix
+	{
+		CCVector3 X, Y, Z;
+		bbeDlg.getBoxAxes(X, Y, Z);
+		//make sure the vectors define an orthogonal basis
+		Z = X.cross(Y);
+		Y = Z.cross(X);
+
+		X.normalize();
+		Y.normalize();
+		Z.normalize();
+		ccGLMatrix rotMat;
+		rotMat.setColumn(0, X);
+		rotMat.setColumn(1, Y);
+		rotMat.setColumn(2, Z);
+
+		CCVector3 C = box.getCenter();
+		ccGLMatrix transMat;
+		transMat.setTranslation(-C);
+		transMat = rotMat.inverse() * transMat;
+		transMat.setTranslation(transMat.getTranslationAsVec3D() + C);
+
+		m_clipBox->setGLTransformation(transMat.inverse());
+	}
+
 	//onBoxModified(&box); //DGM: automatically called by 'm_clipBox'
 
 	if (m_associatedWin)
+	{
 		m_associatedWin->redraw();
+	}
 }
 
 void ccClippingBoxTool::toggleInteractors(bool state)
@@ -355,7 +391,7 @@ void ccClippingBoxTool::exportSlice()
 	if (!obj)
 		return;
 
-	ccHObject* result = GetSlice(obj,m_clipBox,false);
+	ccHObject* result = GetSlice(obj, m_clipBox, false);
 
 	if (result)
 	{
@@ -537,7 +573,7 @@ void ccClippingBoxTool::extractSlicesAndContours(bool extractSlices, bool extrac
 			//single cloud: easy
 			assert(slices.size() == 1);
 
-			slices[0] = GetSlice(obj,m_clipBox,false);
+			slices[0] = GetSlice(obj, m_clipBox, false);
 			if (!slices[0])
 			{
 				//error message already issued
diff --git a/qCC/ui_templates/boundingBoxEditorDlg.ui b/qCC/ui_templates/boundingBoxEditorDlg.ui
