Merge lp:~forsslundsystems/forssim/forssim_0.2.6 into lp:forssim

[Ulrika Dreifaldt]

[JohanO (johan-olofsson)]

Ok. All previous bugs rechecked.

review: Approve

[lp:~forsslundsystems/forssim/forssim_0.2.6]

345. By Ulrika Dreifaldt on 2009-09-18

updated changelog

Unmerged revisions

345. By Ulrika Dreifaldt on 2009-09-18

updated changelog

344. By Ulrika Dreifaldt on 2009-09-18

updated CHANGELOG, INSTALL and VersionNo

343. By Ulrika Dreifaldt on 2009-09-18

lp:~johan-schonning/forssim/warning_message_login

342. By Ulrika Dreifaldt on 2009-09-18

lp:~daniel-stehn/forssim/MemoryFix_for_Perform_selected_exercise

341. By Ulrika Dreifaldt on 2009-09-18

merged from lp:~jocke-karlsson/forssim/removedVoxels

=== modified file 'CHANGELOG'
--- CHANGELOG	2009-09-11 12:29:09 +0000
+++ CHANGELOG	2009-09-18 09:55:28 +0000
@@ -1,138 +1,135 @@
-
-------------------------------------------------------------
-revno: 343
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 14:22:53 +0200
-message:
-  Updated version number
-------------------------------------------------------------
-revno: 342
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 14:21:37 +0200
-message:
-  Merged from lp:~jonas.forsslund/forssim/403552
-    ------------------------------------------------------------
-    revno: 327.5.1
-    committer: funkis <funkis@ubuntu>
-    branch nick: 403552
-    timestamp: Tue 2009-08-18 19:49:45 +0200
-    message:
-      Solved 403552 by description in INSTALL
-------------------------------------------------------------
-revno: 341
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 14:06:59 +0200
-message:
-  merged lp:~johan-schonning/forssim/dialogboxes_added
-    ------------------------------------------------------------
-    revno: 336.2.1
-    committer: johansc <johansc@hiq-desktop>
-    branch nick: dialogbox
-    timestamp: Wed 2009-09-09 14:07:42 +0200
-    message:
-      Dialog boxes added
-------------------------------------------------------------
-revno: 340
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 13:59:10 +0200
-message:
-  merged lp:~jimmy-jonsson-hiq/forssim/Bug_423041_2
-    ------------------------------------------------------------
-    revno: 332.1.2
-    committer: Jimmy Jonsson <[e-mail]>
-    branch nick: Bug_423041
-    timestamp: Wed 2009-09-09 14:22:21 +0200
-    message:
-      Bug_423041_2
-    ------------------------------------------------------------
-    revno: 332.1.1
-    committer: Jimmy Jonsson <[e-mail]>
-    branch nick: Bug_423041
-    timestamp: Mon 2009-09-07 16:13:58 +0200
-    message:
-      Bug_423041
-ulrikadr@ubuntu:~/forssim$ bzr log -r 3~..
-bzr: ERROR: No namespace registered for string: u'3~'
-ulrikadr@ubuntu:~/forssim$ bzr log -r 335..
-------------------------------------------------------------
-revno: 343
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 14:22:53 +0200
-message:
-  Updated version number
-------------------------------------------------------------
-revno: 342
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 14:21:37 +0200
-message:
-  Merged from lp:~jonas.forsslund/forssim/403552
-    ------------------------------------------------------------
-    revno: 327.5.1
-    committer: funkis <funkis@ubuntu>
-    branch nick: 403552
-    timestamp: Tue 2009-08-18 19:49:45 +0200
-    message:
-      Solved 403552 by description in INSTALL
-------------------------------------------------------------
-revno: 341
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 14:06:59 +0200
-message:
-  merged lp:~johan-schonning/forssim/dialogboxes_added
-    ------------------------------------------------------------
-    revno: 336.2.1
-    committer: johansc <johansc@hiq-desktop>
-    branch nick: dialogbox
-    timestamp: Wed 2009-09-09 14:07:42 +0200
-    message:
-      Dialog boxes added
-------------------------------------------------------------
-revno: 340
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 13:59:10 +0200
-message:
-  merged lp:~jimmy-jonsson-hiq/forssim/Bug_423041_2
-    ------------------------------------------------------------
-    revno: 332.1.2
-    committer: Jimmy Jonsson <[e-mail]>
-    branch nick: Bug_423041
-    timestamp: Wed 2009-09-09 14:22:21 +0200
-    message:
-      Bug_423041_2
-    ------------------------------------------------------------
-    revno: 332.1.1
-    committer: Jimmy Jonsson <[e-mail]>
-    branch nick: Bug_423041
-    timestamp: Mon 2009-09-07 16:13:58 +0200
-    message:
-      Bug_423041
-------------------------------------------------------------
-revno: 339
-committer: Ulrika-Dreifaldt <[e-mail]> 
-branch nick: forssim
-timestamp: Fri 2009-09-11 11:42:12 +0200
-message:
-  merged from lp:~daniel-stehn/forssim/VolumeModelMemleakFix
-    ------------------------------------------------------------
-    revno: 337.1.1
-    committer: daniel stehn <danielst@HIQSTOW047>
-    branch nick: VolumeModelMemleakFix
-    timestamp: Thu 2009-09-10 13:41:44 +0200
-    message:
-      Fixed memory leaking ptr startTime
-------------------------------------------------------------
-revno: 338
+------------------------------------------------------------
+revno: 343
+committer: Ulrika-Dreifaldt <[e-mail]> 
+branch nick: forssim
+timestamp: Fri 2009-09-18 11:49:33 +0200
+message:
+  lp:~johan-schonning/forssim/warning_message_login
+    ------------------------------------------------------------
+    revno: 336.2.2
+    committer: johansc <johansc@hiq-desktop>
+    branch nick: dialogbox
+    timestamp: Mon 2009-09-14 14:29:12 +0200
+    message:
+      Warning_message_login
+------------------------------------------------------------
+revno: 342
+committer: Ulrika-Dreifaldt <[e-mail]> 
+branch nick: forssim
+timestamp: Fri 2009-09-18 11:48:14 +0200
+message:
+  lp:~daniel-stehn/forssim/MemoryFix_for_Perform_selected_exercise
+    ------------------------------------------------------------
+    revno: 339.1.4
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Fri 2009-09-18 08:49:45 +0200
+    message:
+      added function CleanupX3dWindows
+    ------------------------------------------------------------
+    revno: 339.1.3
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Thu 2009-09-17 12:00:49 +0200
+    message:
+      fixed memory leaks by destroying the windows and their resources
+    ------------------------------------------------------------
+    revno: 339.1.2
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Wed 2009-09-16 14:32:26 +0200
+    message:
+      fix_for_bug_419190
+    ------------------------------------------------------------
+    revno: 339.1.1
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Tue 2009-09-15 14:03:38 +0200
+    message:
+      Initializing variables and pointers
+------------------------------------------------------------
+revno: 341
+committer: Ulrika-Dreifaldt <[e-mail]> 
+branch nick: forssim
+timestamp: Fri 2009-09-18 11:46:53 +0200
+message:
+  merged from lp:~jocke-karlsson/forssim/removedVoxels
+    ------------------------------------------------------------
+    revno: 340.1.1
+    committer: Jocke Karlsson <[e-mail]>
+    branch nick: removedVoxels
+    timestamp: Fri 2009-09-18 10:23:43 +0200
+    message:
+      Voxels drilled in forbidden segments are now stored for each drillstep seperately.
+------------------------------------------------------------
+revno: 340
 committer: Jocke Karlsson <[e-mail]>
 branch nick: forssim
-timestamp: Thu 2009-09-10 15:44:23 +0200
-message:
-  Removed some debug cout.
+timestamp: Wed 2009-09-16 13:04:14 +0200
+message:
+  Minor byggfix in volumemodel.
+ulrikadr@ubuntu:~/forssim$ bzr log -r338..
+------------------------------------------------------------
+revno: 343
+committer: Ulrika-Dreifaldt <[e-mail]> 
+branch nick: forssim
+timestamp: Fri 2009-09-18 11:49:33 +0200
+message:
+  lp:~johan-schonning/forssim/warning_message_login
+    ------------------------------------------------------------
+    revno: 336.2.2
+    committer: johansc <johansc@hiq-desktop>
+    branch nick: dialogbox
+    timestamp: Mon 2009-09-14 14:29:12 +0200
+    message:
+      Warning_message_login
+------------------------------------------------------------
+revno: 342
+committer: Ulrika-Dreifaldt <[e-mail]> 
+branch nick: forssim
+timestamp: Fri 2009-09-18 11:48:14 +0200
+message:
+  lp:~daniel-stehn/forssim/MemoryFix_for_Perform_selected_exercise
+    ------------------------------------------------------------
+    revno: 339.1.4
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Fri 2009-09-18 08:49:45 +0200
+    message:
+      added function CleanupX3dWindows
+    ------------------------------------------------------------
+    revno: 339.1.3
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Thu 2009-09-17 12:00:49 +0200
+    message:
+      fixed memory leaks by destroying the windows and their resources
+    ------------------------------------------------------------
+    revno: 339.1.2
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Wed 2009-09-16 14:32:26 +0200
+    message:
+      fix_for_bug_419190
+    ------------------------------------------------------------
+    revno: 339.1.1
+    committer: daniel-stehn <[e-mail]>
+    branch nick: forssimmemoryfixbranch
+    timestamp: Tue 2009-09-15 14:03:38 +0200
+    message:
+      Initializing variables and pointers
+------------------------------------------------------------
+revno: 341
+committer: Ulrika-Dreifaldt <[e-mail]> 
+branch nick: forssim
+timestamp: Fri 2009-09-18 11:46:53 +0200
+message:
+  merged from lp:~jocke-karlsson/forssim/removedVoxels
+    ------------------------------------------------------------
+    revno: 340.1.1
+    committer: Jocke Karlsson <[e-mail]>
+    branch nick: removedVoxels
+    timestamp: Fri 2009-09-18 10:23:43 +0200
+    message:
+      Voxels drilled in forbidden segments are now stored for each drillstep seperately.
 

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-09-07 14:13:58 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-09-18 09:48:14 +0000
@@ -40,7 +40,16 @@
 forsDatabase(QSqlDatabase::addDatabase("QMYSQL")),
 userId(-1),
 forsCaseVersionId(-1),
-ftpAborted(false)
+myCDcommand(-1),
+ftpAborted(false),
+isMirrored(false),
+isStereo(false),
+isPlayback(false),
+volumeModel(NULL),
+materialSegmentationModel(NULL),
+forbiddenSegmentationModel(NULL),
+loggingNode(NULL),
+drillingStepsNode(NULL)
 {
 	this->setOverrideCursor(QCursor(Qt::WaitCursor));
 
@@ -337,7 +346,9 @@
 
 void ApplicationNode::exitX3DWithStandardGuiWindow()
 {
-	glWindow->stopTimer();
+	if( glWindow.get() )
+		glWindow->stopTimer();
+
 	cout << "exitX3DWithStandardGuiWindow" <<endl;
 	if (this->isPlayback)
 	{
@@ -347,13 +358,15 @@
 		{
 		case QMessageBox::Yes:
 			// back to select case menu
-			glWindow->close();
 			selectCaseWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
 			selectCaseWindow->showFullScreen();
-			removeWisdomToothWindow->close();
+			CleanupX3dWindows();
+
 			return;
 		default:
-			glWindow->startTimer();
+			if( glWindow.get() )
+				glWindow->startTimer();
+
 			return;
 		}
 	}
@@ -417,7 +430,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())
@@ -436,7 +449,6 @@
 						query.bindValue(":voxelsRemoved", drillingStepsNode->noOfNonExpertVoxelsDrilledByUser(i,drillingStep) + drillingStepsNode->noOfExpertVoxelsDrilledByUser(i,drillingStep));
 						query.bindValue(":noVoxelsEqualToExpert", drillingStepsNode->noOfExpertVoxelsDrilledByUser(i,drillingStep));
 
-
 						if(query.exec()){
 							cout << "Added segment data to database" << query.lastError().databaseText ().toStdString()<< endl;
 						}
@@ -451,10 +463,10 @@
 			// falls down into no
 		case QMessageBox::No:
 			// back to select case menu
-			glWindow->close();
 			selectCaseWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
 			selectCaseWindow->showFullScreenAndUpdate();
-			removeWisdomToothWindow->close();
+			CleanupX3dWindows();
+
 			return;
 		default:
 			glWindow->startTimer();
@@ -463,6 +475,25 @@
 	}
 }
 
+bool ApplicationNode::CleanupX3dWindows()
+{
+	if( !glWindow.get() )
+		return false;
+
+	if( !removeWisdomToothWindow.get() )
+		return false;
+
+	//Destroy the RemovewisdomToothwindow and clear the autoptr
+	removeWisdomToothWindow->DestroyRemoveWisdomToothWindow();
+	removeWisdomToothWindow.reset();
+
+	//Destroy the openGL window and all its data. Clear the autoptr
+	glWindow->DestroyOpenGLWindow();
+	glWindow.reset();
+
+	return true;
+}
+
 void ApplicationNode::launchX3D(const QDir& x3dFilePath)
 {
 	if(!glWindow.get())

=== modified file 'FsWisdom/ApplicationNode.h'
--- FsWisdom/ApplicationNode.h	2009-09-07 14:13:58 +0000
+++ FsWisdom/ApplicationNode.h	2009-09-18 09:48:14 +0000
@@ -64,6 +64,7 @@
 class SelectCaseWindow;
 class RemoveWisdomToothWindow;
 class GlWindowNode;
+class ForbiddenSegmentationModel;
 
 //old code
 class Updater_QButton_SaveAndExit;
@@ -196,6 +197,7 @@
 	 * Data is stored in the database. Forbidden segements are stored with their segmentID negative.
 	 */
 	void exitX3DWithStandardGuiWindow();
+	bool CleanupX3dWindows();
 
 	void ftpCommandFinished(int commandID, bool error);
 	void ftpCommandStarted(int id);

=== modified file 'FsWisdom/GlWindowNode.cpp'
--- FsWisdom/GlWindowNode.cpp	2009-05-20 08:27:38 +0000
+++ FsWisdom/GlWindowNode.cpp	2009-09-17 10:00:49 +0000
@@ -110,18 +110,44 @@
 
 void GlWindowNode::release()
 {
-	scene->window->clear();
+	if( scene.get() )
+	{
+		if( scene->window.get() )
+			scene->window->clear();
+	}
 }
 
 GlWindowNode::~GlWindowNode()
 {
 	cout << "Destroying GlWindowNode" << endl;
-	timer->stop();
-	defNodes->clear();
-	group->children->clear();
+
+	ClearAll();
+
 	cout << "Destroyed GlWindowNode" << endl;
 }
 
+void GlWindowNode::ClearAll()
+{
+
+	if( timer.get() )
+		timer->stop();
+
+	if( defNodes.get() )
+		defNodes->clear();
+
+	if( group.get() )
+	{
+		if( group->children.get() )
+			group->children->clear();
+	}
+}
+
+void GlWindowNode::DestroyOpenGLWindow()
+{
+	release();
+	ClearAll();
+}
+
 void GlWindowNode::initWindow()
 {
 	glInit();

=== modified file 'FsWisdom/GlWindowNode.h'
--- FsWisdom/GlWindowNode.h	2009-05-20 08:27:38 +0000
+++ FsWisdom/GlWindowNode.h	2009-09-17 10:00:49 +0000
@@ -81,6 +81,7 @@
   public slots:
     /// refreshes the scene in a periodic fashion
     void updateScene();
+    void DestroyOpenGLWindow();
 
   protected:
     void initializeGL();
@@ -91,6 +92,7 @@
     static H3DNodeDatabase database;
 
   private:
+    void ClearAll();
 
 	// the timer used to update the scene in the gl window
 	auto_ptr<QTimer> timer;

=== modified file 'FsWisdom/LocalCaseList.cpp'
--- FsWisdom/LocalCaseList.cpp	2009-09-09 12:22:21 +0000
+++ FsWisdom/LocalCaseList.cpp	2009-09-15 12:03:38 +0000
@@ -3,7 +3,9 @@
 using namespace FS;
 
 LocalCaseList::LocalCaseList(ApplicationNode *applicationNode, const QDir& caseDirectory, QFtp* Ftp)
-	: caseDirectory(caseDirectory)
+	: caseDirectory(caseDirectory),
+ftp(NULL),
+fileFtp(NULL)
 {
 	this->applicationNode = applicationNode;
 	// build up a list of locally installed cases

=== modified file 'FsWisdom/ProgressDialog.cpp'
--- FsWisdom/ProgressDialog.cpp	2009-09-09 12:22:21 +0000
+++ FsWisdom/ProgressDialog.cpp	2009-09-15 12:03:38 +0000
@@ -17,7 +17,8 @@
 using namespace FS;
 
 ProgressDialog::ProgressDialog(ApplicationNode *a_applicationNode, const QString & labelText, const QString & cancelButtonText, int minimum, int maximum, QWidget *parent)
-:QProgressDialog(labelText,cancelButtonText,minimum,maximum,parent)
+:QProgressDialog(labelText,cancelButtonText,minimum,maximum,parent),
+maxValue(-1)
 {
 	applicationNode = a_applicationNode;
 	aborted = false;

=== modified file 'FsWisdom/RegisterUserWindow.cpp'
--- FsWisdom/RegisterUserWindow.cpp	2009-08-14 10:57:29 +0000
+++ FsWisdom/RegisterUserWindow.cpp	2009-09-14 12:29:12 +0000
@@ -61,9 +61,15 @@
 	}
 	else if((ui.usernameLineEdit->text()!="") && (ui.passwordLineEdit->text()==""))
 	{
+		QMessageBox::warning( this, "FsWisdom",
+					                     "\nPlease enter password!\n");
 		ui.passwordLineEdit->setFocus();
+
 	}
-	else
+	else{
+		QMessageBox::warning( this, "FsWisdom",
+							             "\nPlease enter user name!\n");
 		ui.usernameLineEdit->setFocus();
+	}
 }
 

=== modified file 'FsWisdom/RemoveWisdomToothWindow.cpp'
--- FsWisdom/RemoveWisdomToothWindow.cpp	2009-09-04 11:25:02 +0000
+++ FsWisdom/RemoveWisdomToothWindow.cpp	2009-09-17 10:00:49 +0000
@@ -3,9 +3,44 @@
 using namespace FS;
 
 RemoveWisdomToothWindow::RemoveWisdomToothWindow(ApplicationNode *applicationNode, bool playback, QWidget* parent)
-: QMainWindow(parent)
+: QMainWindow(parent),
+applicationNode(NULL),
+volumeModel(NULL),
+room(NULL),
+fakeCamera(NULL),
+patient(NULL),
+teeth(NULL),
+head(NULL),
+gumCut(NULL),
+teethGum(NULL),
+lowerTeeth(NULL),
+upperTeeth(NULL),
+floorOfMouth(NULL),
+tongue(NULL),
+hook(NULL),
+aDrillableNode(NULL),
+hapticDeviceNode(NULL),
+drillingStepsNode(NULL),
+materialSegmentationModel(NULL),
+forbiddenSegmentationModel(NULL),
+highlightNode(NULL),
+playbackNode(NULL),
+defaultValues(NULL),
+saveVolume(NULL),
+showHead(NULL),
+showRoom(NULL),
+drillable(NULL),
+showTeeth(NULL),
+deviceShape(NULL),
+vibrations(NULL),
+stateMachine(NULL),
+loggingNode(NULL),
+isPlayback(false),
+orgAngle(0.0),
+orgRot(0.0, 0.0, 0.0)
 {
 	this->applicationNode = applicationNode;
+
 	ui.setupUi(this);
 
 	ui.statisticsTableWidget->horizontalHeader()->setDefaultSectionSize(173);
@@ -323,6 +358,11 @@
 	cout << "Destroying RemoveWisdomToothWindow"<<endl;
 }
 
+void RemoveWisdomToothWindow::DestroyRemoveWisdomToothWindow()
+{
+	this->destroy(true, true );
+}
+
 void RemoveWisdomToothWindow::decrementCurrentDrillingStep()
 {
 	drillingStepsNode->decrementCurrentDrillingStep();

=== modified file 'FsWisdom/RemoveWisdomToothWindow.h'
--- FsWisdom/RemoveWisdomToothWindow.h	2009-09-02 09:21:36 +0000
+++ FsWisdom/RemoveWisdomToothWindow.h	2009-09-17 10:00:49 +0000
@@ -66,9 +66,9 @@
     ~RemoveWisdomToothWindow();
 
     void initialize(bool playback);
-
     void setupStatistics();
     void setupObjectives();
+    void DestroyRemoveWisdomToothWindow();
 
 private slots:
 

=== modified file 'FsWisdom/SelectCaseWindow.cpp'
--- FsWisdom/SelectCaseWindow.cpp	2009-09-11 12:06:59 +0000
+++ FsWisdom/SelectCaseWindow.cpp	2009-09-16 12:32:26 +0000
@@ -188,9 +188,20 @@
 			                     "\nNo performed exercise selected! \n");
 		}
 		else{
-			//Display application window
-			cout<< " the File to be lauched now " << x3dFilePath.path().toStdString()<<endl;
-			applicationNode->launchX3DWithStandardGuiWindow(x3dFilePath, isPlayback, forsCaseVersionId);
+			//Check if x3d file exists
+			QFileInfo fi( x3dFilePath.path());
+
+			if( !fi.exists() )
+			{
+				cout<< "Missing file " << x3dFilePath.path().toStdString() << "aborting launch" <<endl;
+				QMessageBox::critical( this, "FsWisdom", "\nYour cases has been deleted! Please log out and log in again to reload cases.\n");
+			}
+			else
+			{
+				//Display application window
+				cout<< " the File to be lauched now " << x3dFilePath.path().toStdString()<<endl;
+				applicationNode->launchX3DWithStandardGuiWindow(x3dFilePath, isPlayback, forsCaseVersionId);
+			}
 		}
 
 

=== modified file 'FsWisdom/SelectCaseWindow.h'
--- FsWisdom/SelectCaseWindow.h	2009-08-12 06:49:46 +0000
+++ FsWisdom/SelectCaseWindow.h	2009-09-16 12:32:26 +0000
@@ -2,6 +2,7 @@
 #define SELECTCASEWINDOW_H
 
 #include <QtGui/QMainWindow>
+#include <QFileInfo>
 #include "ui_SelectCaseWindow.h"
 #include "ApplicationNode.h"
 #include "QDebugStream.h"

=== modified file 'FsWisdom/VersionNo.h'
--- FsWisdom/VersionNo.h	2009-09-11 12:22:53 +0000
+++ FsWisdom/VersionNo.h	2009-09-18 09:55:28 +0000
@@ -8,6 +8,6 @@
 #ifndef VERSIONNO_H_
 #define VERSIONNO_H_
 
-#define PRODUCTVER "0.2.5"
+#define PRODUCTVER "0.2.6"
 
 #endif /* VERSIONNO_H_ */

=== modified file 'INSTALL'
--- INSTALL	2009-09-11 12:29:09 +0000
+++ INSTALL	2009-09-18 09:55:28 +0000
@@ -1,6 +1,6 @@
-
Forssim 0.2.4 
+
Forssim 0.2.6 
 
-This release is corresponding to forssim_dependencies_0.2.5 
which has to be installed before you install Forssim 0.2.5. 
+This release is corresponding to forssim_dependencies_0.2.5 
which has to be installed before you install Forssim 0.2.6. 
 Download and install dependencies:
 
 forssim_dependencies_0.2.5.tar.gz 
@@ -19,10 +19,10 @@
 ./make -j3
 to build all dependencies and locally install some shaders for the volume rendering. 
 
-When all dependencies are installed, you need to download and install Forssim 0.2.5. 
-Download forssim_0.2.5.tar.gz
-tar -xzvf forssim_0.2.5.tar.gz 
-cd forssim_0.2.5
+When all dependencies are installed, you need to download and install Forssim 0.2.6. 
+Download forssim_0.2.6.tar.gz
+tar -xzvf forssim_0.2.6.tar.gz 
+cd forssim_0.2.6
 
 
 ./makeAll -j3
@@ -32,9 +32,9 @@
 ./makedoc
 
 
-You will find the generated pdf-document in folder /forssim_0.2.5/Doxypaper/latex. 
+You will find the generated pdf-document in folder /forssim_0.2.6/Doxypaper/latex. 
 
-To try the simulator run ./run_one_cylinder in /forssim_0.2.5.
+To try the simulator run ./run_one_cylinder in /forssim_0.2.6.
 
 
 To run FsWisdom you need to have obtained a user name and password from 

=== 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;
 };
 }