Merge lp:~jimmy-jonsson-hiq/forssim/Bug_485691 into lp:forssim

[Jimmy Jonsson]

Unmerged revisions

357. By Jimmy <jimmy@ubuntu> on 2009-12-02

Bug_485691

=== modified file 'src/DrillingStepsNode.cpp'
--- src/DrillingStepsNode.cpp	2009-09-18 08:23:43 +0000
+++ src/DrillingStepsNode.cpp	2009-12-04 13:05:28 +0000
@@ -438,3 +438,8 @@
 unsigned char DrillingStepsNode::getNoOfDrillingSteps(){
 	return noOfDrillingSteps;
 }
+
+unsigned char DrillingStepsNode::getCurrentDrillingStepId()
+{
+	return currentDrillingStepId;
+}

=== modified file 'src/DrillingStepsNode.h'
--- src/DrillingStepsNode.h	2009-08-12 11:49:25 +0000
+++ src/DrillingStepsNode.h	2009-12-04 13:05:28 +0000
@@ -232,6 +232,12 @@
 	 */
 	unsigned char getNoOfDrillingSteps();
 
+	unsigned char getCurrentDrillingStepId();
+
+	const vector<Vec3i> getVoxelsDrilledByExpertForDrillingStep(unsigned char drillingStepId);
+
+	const vector<Vec3i> getVoxelsDrilledByUserForDrillingStep(unsigned char drillingStepId);
+
 	/**
 	 * Exception class for DrillingStepsNode
 	 */
@@ -256,8 +262,6 @@
 	std::vector<drillingStepData_t> drillingStepData;
 	unsigned char currentDrillingStepId;		// The currently selected drilling step
 	bool hasUserBoredThisDrillingStep;
-	const vector<Vec3i> getVoxelsDrilledByUserForDrillingStep(unsigned char drillingStepId);
-	const vector<Vec3i> getVoxelsDrilledByExpertForDrillingStep(unsigned char drillingStepId);
 	bool isExpertDrillingStep(Vec3i p, unsigned char expertDrillingStepId);
 	bool isCurrentExpertDrillingStep(Vec3i p);
 	void setExpertDrillingStepId(Vec3i p, unsigned char step);

=== modified file 'src/HighlightNode.cpp'
--- src/HighlightNode.cpp	2009-06-03 13:57:58 +0000
+++ src/HighlightNode.cpp	2009-12-04 13:05:29 +0000
@@ -58,147 +58,15 @@
 	volumeModelNode = static_cast< VolumeModel * >( volumeModelField->getValue() );
 	drillingStepsNode = static_cast< DrillingStepsNode * >( drillingStepsField->getValue() );
 
+	currentDrillingStep = 1;
+
+	highlightExpertOn = false;
+
 	X3DChildNode::initialize();
 
 	cout<<"Initialized Highlight Node"<<endl;
 }
 
-/*
-void HighlightNode::enterNormalHighlightMode()
-{
-	highlightType = NORMAL;
-
-	cout << "Entering Highlight Node: Normal" << endl;
-
-	for(unsigned int i =0;i<volumeModelNode->getWidth();i++)
-		for(unsigned int j =0;j<volumeModelNode->getHeight();j++)
-			for(unsigned int k =0;k<volumeModelNode->getDepth();k++)
-				if(volumeModelNode->getMaterialRemaining(Vec3i(i,j,k))!=0) // not air at this point in time
-					volumeModelNode->setImageValue(Vec3i(i,j,k),volumeModelNode->getOriginalImageValue(Vec3i(i,j,k)),0,0);
-				else
-					volumeModelNode->setImageValue(Vec3i(i,j,k),0.0,0.0,0.0);
-}
-
-void HighlightNode::enterUserHighlightMode()
-{
-	highlightType = USER;
-
-	cout << "Entering Highlight Node: User" << endl;
-
-	// establish the original image
-	for(unsigned int i =0;i<volumeModelNode->getWidth();i++)
-		for(unsigned int j =0;j<volumeModelNode->getHeight();j++)
-			for(unsigned int k =0;k<volumeModelNode->getDepth();k++)
-				volumeModelNode->setImageValue(Vec3i(i,j,k),volumeModelNode->getOriginalImageValue(Vec3i(i,j,k)),0,0);
-
-	vector<Vec3i>::const_iterator i;
-	const vector<Vec3i> voxelsDrilledByUserForCurrentStep = drillingStepsNode->getVoxelsDrilledByUserForCurrentDrillingStep();
-
-	for(i=voxelsDrilledByUserForCurrentStep.begin();i<voxelsDrilledByUserForCurrentStep.end();i++)
-		volumeModelNode->setImageValue(*i,1/255.0,0.0,0.0);
-}
-
-void HighlightNode::enterExpertHighlightMode()
-{
-	highlightType = EXPERT;
-
-	cout << "Entering Highlight Node: Expert" << endl;
-
-	// establish the original image
-	for(unsigned int i =0;i<volumeModelNode->getWidth();i++)
-		for(unsigned int j =0;j<volumeModelNode->getHeight();j++)
-			for(unsigned int k =0;k<volumeModelNode->getDepth();k++)
-				volumeModelNode->setImageValue(Vec3i(i,j,k),volumeModelNode->getOriginalImageValue(Vec3i(i,j,k)),0,0);
-
-	vector<Vec3i>::const_iterator i;
-	const vector<Vec3i> voxelsDrilledByExpertForCurrentStep = drillingStepsNode->getVoxelsDrilledByExpertForCurrentDrillingStep();
-
-	for(i=voxelsDrilledByExpertForCurrentStep.begin();i<voxelsDrilledByExpertForCurrentStep.end();i++)
-		volumeModelNode->setImageValue(*i,6/255.0,0.0,0.0);
-}
-
-void HighlightNode::enterForbiddenHighlightMode()
-{
-	highlightType = FORBIDDEN;
-
-	cout << "Entering Highlight Node: Forbidden" << endl;
-
-	// establish the original image
-	for(unsigned int i =0;i<volumeModelNode->getWidth();i++)
-		for(unsigned int j =0;j<volumeModelNode->getHeight();j++)
-			for(unsigned int k =0;k<volumeModelNode->getDepth();k++)
-				volumeModelNode->setImageValue(Vec3i(i,j,k),volumeModelNode->getOriginalImageValue(Vec3i(i,j,k)),0,0);
-
-	vector<Vec3i>::const_iterator i;
-	const vector<Vec3i> forbiddenVoxels = volumeModelNode->getAllForbiddenVoxels();
-
-	for(i=forbiddenVoxels.begin();i<forbiddenVoxels.end();i++)
-		volumeModelNode->setImageValue(*i,3/255.0,0.0,0.0);
-}
-
-void HighlightNode::enterUserVsExpertVsForbiddenHighlightMode()
-{
-	highlightType = USER_VS_EXPERT_VS_FORBIDDEN;
-
-	cout << "Entering Highlight Node: User Versus Expert" << endl;
-
-	for(unsigned int i =0;i<volumeModelNode->getWidth();i++)
-		for(unsigned int j =0;j<volumeModelNode->getHeight();j++)
-			for(unsigned int k =0;k<volumeModelNode->getDepth();k++)
-				volumeModelNode->setImageValue(Vec3i(i,j,k),volumeModelNode->getOriginalImageValue(Vec3i(i,j,k)),0,0);
-
-	vector<Vec3i>::const_iterator i;
-	const vector<Vec3i> voxelsDrilledByUserForCurrentStep = drillingStepsNode->getVoxelsDrilledByUserForCurrentDrillingStep();
-	const vector<Vec3i> voxelsDrilledByExpertForCurrentStep = drillingStepsNode->getVoxelsDrilledByExpertForCurrentDrillingStep();
-	const vector<Vec3i> forbiddenVoxels = volumeModelNode->getAllForbiddenVoxels();
-	vector<Vec3i> voxelsDrilledByExpertOnlyForCurrentStep;
-	vector<Vec3i> voxelsDrilledByUserOnlyForCurrentStep;
-	vector<Vec3i> voxelsDrilledByUserNotDrilledByExpertForCurrentStep;
-	vector<Vec3i> voxelsDrilledByBothUserAndExpertForCurrentStep;
-	vector<Vec3i> forbiddenVoxelsOnly;
-	vector<Vec3i> forbiddenVoxelsDrilledByUserForCurrentStep;
-
-	std::set_difference(voxelsDrilledByExpertForCurrentStep.begin(), voxelsDrilledByExpertForCurrentStep.end(),
-			voxelsDrilledByUserForCurrentStep.begin(), voxelsDrilledByUserForCurrentStep.end(),
-		std::inserter(voxelsDrilledByExpertOnlyForCurrentStep, voxelsDrilledByExpertOnlyForCurrentStep.end()));
-
-	std::set_difference(voxelsDrilledByUserForCurrentStep.begin(), voxelsDrilledByUserForCurrentStep.end(),
-			voxelsDrilledByExpertForCurrentStep.begin(), voxelsDrilledByExpertForCurrentStep.end(),
-		std::inserter(voxelsDrilledByUserNotDrilledByExpertForCurrentStep, voxelsDrilledByUserNotDrilledByExpertForCurrentStep.end()));
-	std::set_difference(voxelsDrilledByUserNotDrilledByExpertForCurrentStep.begin(), voxelsDrilledByUserNotDrilledByExpertForCurrentStep.end(),
-			forbiddenVoxels.begin(), forbiddenVoxels.end(),
-		std::inserter(voxelsDrilledByUserOnlyForCurrentStep, voxelsDrilledByUserOnlyForCurrentStep.end()));
-
-	std::set_difference(forbiddenVoxels.begin(), forbiddenVoxels.end(),
-			voxelsDrilledByUserForCurrentStep.begin(), voxelsDrilledByUserForCurrentStep.end(),
-		std::inserter(forbiddenVoxelsOnly, forbiddenVoxelsOnly.end()));
-
-	std::set_intersection(voxelsDrilledByExpertForCurrentStep.begin(), voxelsDrilledByExpertForCurrentStep.end(),
-		voxelsDrilledByUserForCurrentStep.begin(), voxelsDrilledByUserForCurrentStep.end(),
-		std::inserter(voxelsDrilledByBothUserAndExpertForCurrentStep, voxelsDrilledByBothUserAndExpertForCurrentStep.end()));
-
-	std::set_intersection(voxelsDrilledByUserForCurrentStep.begin(), voxelsDrilledByUserForCurrentStep.end(),
-		forbiddenVoxels.begin(), forbiddenVoxels.end(),
-		std::inserter(forbiddenVoxelsDrilledByUserForCurrentStep, forbiddenVoxelsDrilledByUserForCurrentStep.end()));
-
-	for(i=voxelsDrilledByUserOnlyForCurrentStep.begin();i<voxelsDrilledByUserOnlyForCurrentStep.end();i++)
-		volumeModelNode->setImageValue(*i,1/255.0,0.0,0.0);
-
-	for(i=voxelsDrilledByExpertOnlyForCurrentStep.begin();i<voxelsDrilledByExpertOnlyForCurrentStep.end();i++)
-		volumeModelNode->setImageValue(*i,6/255.0,0.0,0.0);
-
-	for(i=voxelsDrilledByBothUserAndExpertForCurrentStep.begin();i<voxelsDrilledByBothUserAndExpertForCurrentStep.end();i++)
-		volumeModelNode->setImageValue(*i,4/255.0,0.0,0.0);
-
-	for(i=forbiddenVoxelsOnly.begin();i<forbiddenVoxelsOnly.end();i++)
-		volumeModelNode->setImageValue(*i,3/255.0,0.0,0.0);
-
-	for(i=forbiddenVoxelsDrilledByUserForCurrentStep.begin();i<forbiddenVoxelsDrilledByUserForCurrentStep.end();i++)
-		volumeModelNode->setImageValue(*i,2/255.0,0.0,0.0);
-
-}
-
- */
 void HighlightNode::highlightUser(bool enable)
 {
 
@@ -242,6 +110,7 @@
 			if(volumeModelNode->getMaterialRemaining(*i)!=0) // not air at this point in time
 				volumeModelNode->setImageValue(*i,6/255.0,0.0,0.0);
 		}
+		highlightExpertOn = true;
 
 	}
 	else
@@ -252,6 +121,7 @@
 			if(volumeModelNode->getMaterialRemaining(*i)!=0) // not air at this point in time
 				volumeModelNode->setImageValue(*i,volumeModelNode->getOriginalImageValue(*i),0,0);
 		}
+		highlightExpertOn = false;
 	}
 }
 
@@ -280,3 +150,31 @@
 		}
 	}
 }
+
+void HighlightNode::traverseSG( H3D::TraverseInfo &ti )
+{
+	if(currentDrillingStep != drillingStepsNode->getCurrentDrillingStepId())
+	{
+		if(highlightExpertOn)
+		{
+			vector<Vec3i>::const_iterator i;
+
+			// Remove highlighted voxels for previous drillingstep
+			const vector<Vec3i> voxelsDrilledByExpertForPreviousStep = drillingStepsNode->getVoxelsDrilledByExpertForDrillingStep(currentDrillingStep);
+			for(i=voxelsDrilledByExpertForPreviousStep.begin();i<voxelsDrilledByExpertForPreviousStep.end();i++)
+			{
+				if(volumeModelNode->getMaterialRemaining(*i)!=0) // not air at this point in time
+						volumeModelNode->setImageValue(*i,volumeModelNode->getOriginalImageValue(*i),0,0);
+			}
+
+			// Highlight voxels in current drillingstep
+			const vector<Vec3i> voxelsDrilledByExpertForCurrentStep = drillingStepsNode->getVoxelsDrilledByExpertForDrillingStep(currentDrillingStep + 1);
+			for(i=voxelsDrilledByExpertForCurrentStep.begin();i<voxelsDrilledByExpertForCurrentStep.end();i++)
+			{
+				if(volumeModelNode->getMaterialRemaining(*i)!=0) // not air at this point in time
+					volumeModelNode->setImageValue(*i,6/255.0,0.0,0.0);
+			}
+		}
+		currentDrillingStep = drillingStepsNode->getCurrentDrillingStepId();
+	}
+}

=== modified file 'src/HighlightNode.h'
--- src/HighlightNode.h	2009-06-03 13:57:58 +0000
+++ src/HighlightNode.h	2009-12-04 13:05:29 +0000
@@ -58,8 +58,10 @@
         }
 
         virtual void initialize();
+        virtual void traverseSG( H3D::TraverseInfo &ti );
 
         /*
+         *
          * The volume model node
          */
         auto_ptr< H3D::SFNode > volumeModelField;
@@ -69,6 +71,7 @@
          */
         auto_ptr< H3D::SFNode > drillingStepsField;
 
+
         /// The H3DNodeDatabase for this node.
         static H3D::H3DNodeDatabase database;
 
@@ -100,6 +103,8 @@
 
     	VolumeModel *volumeModelNode;
     	DrillingStepsNode* drillingStepsNode;
+    	unsigned char currentDrillingStep;
+    	bool highlightExpertOn;
 
     	enum highlightType_e { NORMAL, USER, EXPERT, FORBIDDEN, USER_VS_EXPERT_VS_FORBIDDEN };