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

[jocke]

[jocke (jocke-karlsson)]

Nerladdningen av timestamp fil sker först när användaren trycker på Playback knappen.
Vid exit från playback mode skall statistik ej sparas.

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-06-09 07:51:35 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-06-09 14:25:42 +0000
@@ -324,99 +324,120 @@
 void ApplicationNode::exitX3DWithStandardGuiWindow()
 {
 	glWindow->stopTimer();
-
-	switch(QMessageBox::question(NULL,tr("Save Data on Exit"),
-			tr("Do you wish to save the data associated with this case?"),
-			QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,QMessageBox::Yes))
-	{
-	case QMessageBox::Yes:
-		// save timestamps
-		this->setOverrideCursor(QCursor(Qt::WaitCursor));
-		volumeModel = static_cast <VolumeModel*> (glWindow->getSceneNode("VM"));
-		materialSegmentationModel = static_cast< MaterialSegmentationModel * >(glWindow->getSceneNode("SM"));
-
-		//Number of Forbidden voxels
-		forbiddenSegmentationModel = static_cast< ForbiddenSegmentationModel * >(glWindow->getSceneNode("FM"));
-
-
-		volumeModel->saveTimeStamps();
-		volumeModel->saveStatistics();
-
-		// Save user case to database
-		if(forsDatabase.open())
-		{
-			QSqlQuery query;
-
-			query.prepare("INSERT INTO userCase (userId, forsCaseVersionId, timeStampFile) "
-					"VALUES (:userId, :forsCaseVersionId, :timeStampFile)");
-			query.bindValue(":userId", userId);
-			query.bindValue(":forsCaseVersionId", forsCaseVersionId);
-			QFile file( QDir(  QString (volumeModel->saveTimeStamps().c_str()) ).path() );
-			file.open(QIODevice::ReadOnly);
-			QByteArray byteArray = file.readAll();
-			query.bindValue(":timeStampFile", byteArray);
-
-			if(query.exec())
-				cout << "Added recorded data to database" << endl;
-			else
-				throw ApplicationNodeException("Failed to add recorded data to database");
-
-			MFUnsignedInt8::const_iterator segmentIdFieldIterator;
-
-			query.prepare("SELECT LAST_INSERT_ID()");
-			if(!query.exec())
-				throw ApplicationNodeException("Failed to read last index from database");
-			query.next();
-			int index = query.value(0).toInt();
-
-			for(segmentIdFieldIterator=forbiddenSegmentationModel->segmentIdField->begin();
-			segmentIdFieldIterator<forbiddenSegmentationModel->segmentIdField->end();
-			segmentIdFieldIterator++)
+	cout << "exitX3DWithStandardGuiWindow" <<endl;
+	if (this->isPlayback)
+	{
+		switch(QMessageBox::question(NULL,tr("Do you want to Exit"),
+				tr("Do you want to Exit?"),
+				QMessageBox::Yes|QMessageBox::Cancel,QMessageBox::Yes))
+		{
+		case QMessageBox::Yes:
+			// back to select case menu
+			glWindow->close();
+			selectCaseWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
+			selectCaseWindow->showFullScreen();
+			removeWisdomToothWindow->close();
+			return;
+		default:
+			glWindow->startTimer();
+			return;
+		}
+	}
+	else
+	{
+		switch(QMessageBox::question(NULL,tr("Save Data on Exit"),
+				tr("Do you wish to save the data associated with this case?"),
+				QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,QMessageBox::Yes))
+		{
+		case QMessageBox::Yes:
+			// save timestamps
+			this->setOverrideCursor(QCursor(Qt::WaitCursor));
+			volumeModel = static_cast <VolumeModel*> (glWindow->getSceneNode("VM"));
+			materialSegmentationModel = static_cast< MaterialSegmentationModel * >(glWindow->getSceneNode("SM"));
+
+			//Number of Forbidden voxels
+			forbiddenSegmentationModel = static_cast< ForbiddenSegmentationModel * >(glWindow->getSceneNode("FM"));
+
+
+			volumeModel->saveTimeStamps();
+			volumeModel->saveStatistics();
+
+			// Save user case to database
+			if(forsDatabase.open())
 			{
-				query.prepare("INSERT INTO segments (userCaseId, segmentId, voxelsRemoved) "
-						"VALUES (:userCaseId, :segmentId, :voxelsRemoved)");
-				query.bindValue(":userCaseId", index );
-				query.bindValue(":segmentId", -(*segmentIdFieldIterator));
-				query.bindValue(":voxelsRemoved", forbiddenSegmentationModel->noOfVoxelsBoredByUser->getValue()[(*segmentIdFieldIterator)]);
-				if(query.exec())
-					cout << "Added forbidden segment data to database" << endl;
-				else
-					cout << "No forbidden segments added to database" << endl;
-
-				cout << query.lastError().databaseText ().toStdString()<< endl;
-			}
-
-
-			int noOfSegments = materialSegmentationModel->getNoOfSegments();
-			for (int i = 1;i<noOfSegments;i++){
-				query.prepare("INSERT INTO segments (userCaseId, segmentId, voxelsRemoved) "
-						"VALUES (:userCaseId, :segmentId, :voxelsRemoved)");
-				query.bindValue(":userCaseId", index );
-				query.bindValue(":segmentId", i);
-				query.bindValue(":voxelsRemoved", volumeModel->noOfVoxelsRemoved(i));
-
-				if(query.exec())
-					cout << "Added segment data to database" << endl;
-				else
-					cout << "No segments added to database" << endl;
-
-				cout << query.lastError().databaseText ().toStdString()<< endl;
-			}
-
+				QSqlQuery query;
+
+				query.prepare("INSERT INTO userCase (userId, forsCaseVersionId, timeStampFile) "
+						"VALUES (:userId, :forsCaseVersionId, :timeStampFile)");
+				query.bindValue(":userId", userId);
+				query.bindValue(":forsCaseVersionId", forsCaseVersionId);
+				QFile file( QDir(  QString (volumeModel->saveTimeStamps().c_str()) ).path() );
+				file.open(QIODevice::ReadOnly);
+				QByteArray byteArray = file.readAll();
+				query.bindValue(":timeStampFile", byteArray);
+
+				if(query.exec())
+					cout << "Added recorded data to database" << endl;
+				else
+					throw ApplicationNodeException("Failed to add recorded data to database");
+
+				MFUnsignedInt8::const_iterator segmentIdFieldIterator;
+
+				query.prepare("SELECT LAST_INSERT_ID()");
+				if(!query.exec())
+					throw ApplicationNodeException("Failed to read last index from database");
+				query.next();
+				int index = query.value(0).toInt();
+
+				for(segmentIdFieldIterator=forbiddenSegmentationModel->segmentIdField->begin();
+				segmentIdFieldIterator<forbiddenSegmentationModel->segmentIdField->end();
+				segmentIdFieldIterator++)
+				{
+					query.prepare("INSERT INTO segments (userCaseId, segmentId, voxelsRemoved) "
+							"VALUES (:userCaseId, :segmentId, :voxelsRemoved)");
+					query.bindValue(":userCaseId", index );
+					query.bindValue(":segmentId", -(*segmentIdFieldIterator));
+					query.bindValue(":voxelsRemoved", forbiddenSegmentationModel->noOfVoxelsBoredByUser->getValue()[(*segmentIdFieldIterator)]);
+					if(query.exec())
+						cout << "Added forbidden segment data to database" << endl;
+					else
+						cout << "No forbidden segments added to database" << endl;
+
+					cout << query.lastError().databaseText ().toStdString()<< endl;
+				}
+
+
+				int noOfSegments = materialSegmentationModel->getNoOfSegments();
+				for (int i = 1;i<noOfSegments;i++){
+					query.prepare("INSERT INTO segments (userCaseId, segmentId, voxelsRemoved) "
+							"VALUES (:userCaseId, :segmentId, :voxelsRemoved)");
+					query.bindValue(":userCaseId", index );
+					query.bindValue(":segmentId", i);
+					query.bindValue(":voxelsRemoved", volumeModel->noOfVoxelsRemoved(i));
+
+					if(query.exec())
+						cout << "Added segment data to database" << endl;
+					else
+						cout << "No segments added to database" << endl;
+
+					cout << query.lastError().databaseText ().toStdString()<< endl;
+				}
+
+			}
+
+			this->restoreOverrideCursor();
+			// falls down into no
+		case QMessageBox::No:
+			// back to select case menu
+			glWindow->close();
+			selectCaseWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
+			selectCaseWindow->showFullScreen();
+			removeWisdomToothWindow->close();
+			return;
+		default:
+			glWindow->startTimer();
+			return;
 		}
-
-		this->restoreOverrideCursor();
-		// falls down into no
-	case QMessageBox::No:
-		// back to select case menu
-		glWindow->close();
-		selectCaseWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
-		selectCaseWindow->showFullScreen();
-		removeWisdomToothWindow->close();
-		return;
-	default:
-		glWindow->startTimer();
-		return;
 	}
 }
 
@@ -463,9 +484,9 @@
 
 	// show the gui screen
 	if(!removeWisdomToothWindow.get())
-		removeWisdomToothWindow.reset(new RemoveWisdomToothWindow(this));
+		removeWisdomToothWindow.reset(new RemoveWisdomToothWindow(this, playback));
 	else
-		removeWisdomToothWindow->initialize();
+		removeWisdomToothWindow->initialize(playback);
 
 	volumeModel 	= static_cast <VolumeModel*>	(glWindow->getSceneNode("VM"));
 	loggingNode		= static_cast <LoggingNode*>	(glWindow->getSceneNode("LN"));
@@ -474,10 +495,14 @@
 	if(loggingNode)
 		loggingNode->userLoggingPathField->setValue(userLoggingDirectory->path().toStdString());
 
+	this->isPlayback = false;
 	// set playback data
 	if(playback)
+	{
+		this->isPlayback = true;
 		if(volumeModel)
 			volumeModel->setTimeStampFile(playbackFilePath.path().toStdString());
+	}
 
 	removeWisdomToothWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
 	removeWisdomToothWindow->showFullScreen();

=== modified file 'FsWisdom/ApplicationNode.h'
--- FsWisdom/ApplicationNode.h	2009-06-03 14:26:23 +0000
+++ FsWisdom/ApplicationNode.h	2009-06-09 14:25:42 +0000
@@ -239,6 +239,7 @@
 	LoggingNode* loggingNode;
 
 	QSqlDatabase forsDatabase;
+	bool isPlayback;
 };
 
 }

=== modified file 'FsWisdom/RemoveWisdomToothWindow.cpp'
--- FsWisdom/RemoveWisdomToothWindow.cpp	2009-06-03 13:57:58 +0000
+++ FsWisdom/RemoveWisdomToothWindow.cpp	2009-06-09 14:25:42 +0000
@@ -2,7 +2,7 @@
 
 using namespace FS;
 
-RemoveWisdomToothWindow::RemoveWisdomToothWindow(ApplicationNode *applicationNode, QWidget* parent)
+RemoveWisdomToothWindow::RemoveWisdomToothWindow(ApplicationNode *applicationNode, bool playback, QWidget* parent)
 : QMainWindow(parent)
 {
 	this->applicationNode = applicationNode;
@@ -52,10 +52,10 @@
 	QObject::connect(ui.selectElevatorButton, SIGNAL(clicked ()), this, SLOT(selectElevator ()));
 
 
-	initialize();
+	initialize(playback);
 }
 
-void RemoveWisdomToothWindow::initialize()
+void RemoveWisdomToothWindow::initialize(bool playback)
 {
 	materialSegmentationModel 	= static_cast <MaterialSegmentationModel*>		(applicationNode->getSceneNode("SM"));
 	volumeModel 				= static_cast <VolumeModel*>					(applicationNode->getSceneNode("VM"));
@@ -169,7 +169,7 @@
 
 	updater_label_teethRotationField_2.reset(new Updater_QLabel_SFRotation(ui,ui.teethRotation,ui.teethRadio,teeth->rotation.get(),defaultValues->rotationZoomFactorField.get(),1));
 
-
+	this->isPlayback = playback;
 	setupStatistics();
 
 }

=== modified file 'FsWisdom/RemoveWisdomToothWindow.h'
--- FsWisdom/RemoveWisdomToothWindow.h	2009-06-03 13:57:58 +0000
+++ FsWisdom/RemoveWisdomToothWindow.h	2009-06-09 14:25:42 +0000
@@ -61,10 +61,10 @@
     Q_OBJECT
 
 public:
-	RemoveWisdomToothWindow(ApplicationNode *applicationNode, QWidget* parent = 0);
+	RemoveWisdomToothWindow(ApplicationNode *applicationNode, bool playback, QWidget* parent = 0);
     ~RemoveWisdomToothWindow();
 
-    void initialize();
+    void initialize(bool playback);
 
     void setupStatistics();
 
@@ -123,6 +123,7 @@
 	Switch* vibrations;
 	StateMachine* stateMachine;
 	LoggingNode* loggingNode;
+	bool isPlayback;
 
 	// routing between fields and widgets
 
@@ -203,10 +204,6 @@
 
 	auto_ptr<Updater_QTableWidget> updater_tableWidget_forbiddenSegmentationField;
 	auto_ptr<Updater_QTableWidget> updater_tableWidget_materialSegmentationField;
-
-
-
-
 };
 
 }

=== modified file 'FsWisdom/SelectCaseWindow.cpp'
--- FsWisdom/SelectCaseWindow.cpp	2009-06-05 09:07:12 +0000
+++ FsWisdom/SelectCaseWindow.cpp	2009-06-09 14:25:42 +0000
@@ -43,8 +43,6 @@
 	QObject::connect(ui.caseListWidget, SIGNAL(itemSelectionChanged ()), this, SLOT(updateAnamnesTextWidget()));
 	QObject::connect(ui.caseListWidget, SIGNAL(itemSelectionChanged ()), this, SLOT(updateObjectivesTextWidget()));
 	QObject::connect(ui.caseListWidget, SIGNAL(itemSelectionChanged ()), this, SLOT(updateImageViewer()));
-	QObject::connect(ui.caseListTimestampsWidget, SIGNAL(itemSelectionChanged ()), this, SLOT(getCurrentTimestampForPlayback()));
-
 
 	//standardOutputToTextEdit.reset(new QDebugStream(std::cout, ui.standardOutputPlainTextEdit,QDir("stdout.txt")));
 	//standardErrorToTextEdit.reset(new QDebugStream(std::cerr, ui.standardErrorPlainTextEdit,QDir("stderr.txt")));
@@ -156,6 +154,10 @@
 				forsCaseVersionId = query.value(0).toInt();
 			}
 		}
+		if (isPlayback)
+		{
+			this->getCurrentTimestampForPlayback();
+		}
 		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-06-05 09:07:12 +0000
+++ FsWisdom/SelectCaseWindow.h	2009-06-09 14:25:42 +0000
@@ -31,6 +31,7 @@
     ~SelectCaseWindow();
 
     void initialize();
+	void getCurrentTimestampForPlayback();
 
 public slots:
 	/// locates an x3d file to execute
@@ -53,7 +54,6 @@
 	void updateCaseListTimestampsWidget();
 	void updateAnamnesTextWidget();
 	void updateObjectivesTextWidget();
-	void getCurrentTimestampForPlayback();
 	void updateImageViewer();
 
 

=== modified file 'FsWisdom/SelectCaseWindow.ui'
--- FsWisdom/SelectCaseWindow.ui	2009-06-08 14:19:45 +0000
+++ FsWisdom/SelectCaseWindow.ui	2009-06-09 14:25:42 +0000
@@ -114,7 +114,7 @@
          <rect>
           <x>600</x>
           <y>340</y>
-          <width>201</width>
+          <width>241</width>
           <height>18</height>
          </rect>
         </property>