Merge lp:~jocke-karlsson/forssim/removedVoxels into lp:forssim

[jocke]

[jocke (jocke-karlsson)]

Fix for forbidden segments voxels removed was not saved in each drillstep.

[JohanO (johan-olofsson)]

Ok

review: Approve

[Bo Rasmusson (bo-rasmusson)]

Look ok to me

review: Approve

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-09-07 14:13:58 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-09-18 08:23:43 +0000
@@ -417,7 +417,7 @@
 						query.bindValue(":userCaseId", index );
 						query.bindValue(":segmentId", -(*segmentIdFieldIterator));
 						query.bindValue(":drillingStep", drillingStep);
-						query.bindValue(":voxelsRemoved", forbiddenSegmentationModel->noOfVoxelsBoredByUser->getValue()[(*segmentIdFieldIterator)]);
+						query.bindValue(":voxelsRemoved", forbiddenSegmentationModel->noOfForbiddenVoxelsDrilledByUser((*segmentIdFieldIterator),drillingStep));
 						query.bindValue(":noVoxelsEqualToExpert", 0);
 
 						if(query.exec())

=== modified file 'FsWisdom/ApplicationNode.h'
--- FsWisdom/ApplicationNode.h	2009-09-07 14:13:58 +0000
+++ FsWisdom/ApplicationNode.h	2009-09-18 08:23:43 +0000
@@ -64,6 +64,7 @@
 class SelectCaseWindow;
 class RemoveWisdomToothWindow;
 class GlWindowNode;
+class ForbiddenSegmentationModel;
 
 //old code
 class Updater_QButton_SaveAndExit;

=== modified file 'src/DrillingStepsNode.cpp'
--- src/DrillingStepsNode.cpp	2009-08-12 11:49:25 +0000
+++ src/DrillingStepsNode.cpp	2009-09-18 08:23:43 +0000
@@ -255,14 +255,13 @@
 	hasUserBoredThisDrillingStep = false;
 	currentDrillingStepId = (currentDrillingStepId%noOfDrillingSteps)+1;
 
-
-
 	cout << "Current Drilling Step Id: "<< (unsigned int)currentDrillingStepId<<endl;
 	cout << "StartTime: " << drillingStepData[currentDrillingStepId-1].startTime<<endl;
 	cout << "FinishTime: " << drillingStepData[currentDrillingStepId-1].finishTime<<endl;
 
 	// Inform the highlight module to redraw information based on new expert step
 	engageHighlightField->setValue(true,this->id);
+	forbiddenSegmentationModelNode->incrementCurrentDrillingStep();
 }
 
 void DrillingStepsNode::decrementCurrentDrillingStep()
@@ -280,6 +279,7 @@
 
 	// Inform the highlight module to redraw information based on new expert step
 	engageHighlightField->setValue(true,this->id);
+	forbiddenSegmentationModelNode->decrementCurrentDrillingStep();
 }
 
 void DrillingStepsNode::addDrillingStep()

=== modified file 'src/ForbiddenSegmentationModel.cpp'
--- src/ForbiddenSegmentationModel.cpp	2009-05-04 08:14:06 +0000
+++ src/ForbiddenSegmentationModel.cpp	2009-09-18 08:23:43 +0000
@@ -67,15 +67,34 @@
 	}
 
 	// initialize the noOfVoxelsBoredByUser list with zeros
+	//noOfVoxelsBoredByUser is kept for now. It is used (only?) for displaying number
+	//of voxels removed in the GUI (the GUI should use vForbiddenDrillingStepData).
+	//This is total number removed, not removed in each drillstep.
 	unsigned int size = (segmentIdField->getValue()).size()+1;
-	H3DInt32* data = new H3DInt32[size];
+	H3DInt32* data2 = new H3DInt32[size];
 	for(unsigned int i = 0; i< size;i++)
-		data[i] = 0;
-	noOfVoxelsBoredByUser->setValueFromVoidPtr(data,size,size*sizeof(H3DInt32),this->id);
-	delete[] data;
+		data2[i] = 0;
+	noOfVoxelsBoredByUser->setValueFromVoidPtr(data2,size,size*sizeof(H3DInt32),this->id);
+	delete[] data2;
+
+	//A vector with struct containing drilled data in each drill step.
+	forbiddenDrillingStepData_t sForbiddenDrillingStepData;
+	noOfDrillingSteps = 2;
+
+	for(unsigned char i = 1; i<=noOfDrillingSteps;i++)
+	{
+		cout <<"Adding initializingdata to struct, Forbidden Segmentation Model "<<endl;
+		H3DInt32* data = new H3DInt32[size];
+		for(unsigned int i = 0; i< size;i++)
+			data[i] = 0;
+		sForbiddenDrillingStepData.noOfForbiddenVoxelsBoredByUser.setValueFromVoidPtr(data,size,size*sizeof(H3DInt32),this->id);
+		delete[] data;
+		this->vForbiddenDrillingStepData.push_back(sForbiddenDrillingStepData);
+	}
+
+	currentDrillingStepId = 1;
 
 	X3DChildNode::initialize();
-
 	cout<<"Forbidden Segmentation Model Initialized"<<endl;
 }
 
@@ -94,8 +113,11 @@
 	else
 		index = getSegmentIdFieldIndex(segmentId)+1;
 
-	unsigned int currentValue = noOfVoxelsBoredByUser->getValue(this->id)[index];
-	noOfVoxelsBoredByUser->setValue(index, ++currentValue,this->id);
+	unsigned int currentValue2 = noOfVoxelsBoredByUser->getValue(this->id)[index];
+	noOfVoxelsBoredByUser->setValue(index, ++currentValue2,this->id);
+
+	unsigned int currentValue = this->vForbiddenDrillingStepData[currentDrillingStepId-1].noOfForbiddenVoxelsBoredByUser.getValue(this->id)[index];
+	this->vForbiddenDrillingStepData[currentDrillingStepId-1].noOfForbiddenVoxelsBoredByUser.setValue(index, ++currentValue,this->id);
 }
 
 const std::vector<unsigned char> ForbiddenSegmentationModel::getSegmentIds()
@@ -159,3 +181,20 @@
 	return false;
 }
 
+void ForbiddenSegmentationModel::incrementCurrentDrillingStep()
+{
+	//currentDrillingStepId = (currentDrillingStepId%noOfDrillingSteps)+1;
+	currentDrillingStepId++;
+}
+
+void ForbiddenSegmentationModel::decrementCurrentDrillingStep()
+{
+	//currentDrillingStepId = (currentDrillingStepId%noOfDrillingSteps)+1;
+	currentDrillingStepId--;
+}
+
+int ForbiddenSegmentationModel::noOfForbiddenVoxelsDrilledByUser(int segmentID, int drillingStepId)
+{
+	return vForbiddenDrillingStepData[drillingStepId-1].noOfForbiddenVoxelsBoredByUser.getValue()[segmentID];
+}
+

=== modified file 'src/ForbiddenSegmentationModel.h'
--- src/ForbiddenSegmentationModel.h	2009-03-26 08:28:57 +0000
+++ src/ForbiddenSegmentationModel.h	2009-09-18 08:23:43 +0000
@@ -28,6 +28,16 @@
 class ForbiddenSegmentationModel : public H3D::X3DChildNode
 {
 public:
+
+	/**
+	 * Information about Forbidden segments drilled in each drilling step
+	 */
+	struct forbiddenDrillingStepData_t
+	{
+		//The amount bored in each Forbidden segment by the user.
+		H3D::MFInt32 noOfForbiddenVoxelsBoredByUser;
+	};
+
 	/**
 	 * Constructor
 	 * \param segmentIdField A list of Forbidden Segment Ids, INITIALIZE_ONLY Field
@@ -57,6 +67,22 @@
 	const std::vector<unsigned char> getSegmentIds();
 
 	/**
+	 * Increment by one the current drilling step.
+	 */
+	void incrementCurrentDrillingStep();
+
+	/**
+	 * Decrement by one the current drilling step.
+	 */
+	void decrementCurrentDrillingStep();
+
+	/**
+		 * Returns the number of voxels drilled by the user in each drillstep for each forbidden segment,
+		 * with the undefined segment value stored as the first value in the noOfForbiddenVoxelsBoredByUser field.
+		 */
+	int noOfForbiddenVoxelsDrilledByUser(int segmentID, int drillingStepId);
+
+	/**
 	 * The H3DNodeDatabase for this node.
 	 */
 	static H3D::H3DNodeDatabase database;
@@ -97,6 +123,9 @@
 	const bool existsInSegmentIdField(const unsigned char& segmentId);
 	const bool existsInSegmentNameField(const string& segmentName);
 	const unsigned char getSegmentIdFieldIndex(const unsigned char& segmentId);
+	std::vector<forbiddenDrillingStepData_t> vForbiddenDrillingStepData; //Vector with amount bored in each Forbidden segment and in each drilling step by the user.
+	int noOfDrillingSteps;
+	int currentDrillingStepId;
 };
 }