Merge remote-tracking branch 'remotes/origin/BioTracker3_View+' into BioTracker3_publication

Author: Hauke Jürgen Mönck

.gitignore

@@ -121,3 +121,5 @@ CMakeFiles
 .vscode/tasks.json
 .vscode/launch.json
 .vscode/c_cpp_properties.json
+.vscode/c_cpp_properties.json
+.vscode/c_cpp_properties.json

.vscode/c_cpp_properties.json

@@ -40,7 +40,16 @@
                 "/usr/include/qt4/QtCore",
                 "/usr/local/include/opencv",
                 "/usr/include/qt4/QtGui",
-                "${workspaceRoot}/BioTracker/Interfaces/BioTrackerInterfaces"
+                "${workspaceRoot}/BioTracker/Interfaces/BioTrackerInterfaces",
+                "${workspaceRoot}/BioTracker/CoreApp/BioTracker",
+                "${workspaceRoot}/BioTracker/Utils/BioTrackerUtils",
+                "${workspaceRoot}/BioTracker/Utils/BioTrackerUtils",
+                "/usr/include/x86_64-linux-gnu/qt5/QtWidgets",
+                "/usr/include/x86_64-linux-gnu/qt5",
+                "/usr/include/x86_64-linux-gnu/qt5/QtGui",
+                "/usr/include/x86_64-linux-gnu/qt5/QtMultimedia",
+                "/usr/include/x86_64-linux-gnu/qt5/QtMultimediaWidgets",
+                "/usr/include/x86_64-linux-gnu/qt5/QtCore"
             ],
             "defines": [],
             "intelliSenseMode": "clang-x64",

BioTracker/CoreApp/BioTracker/Controller/ControllerCoreParameter.cpp

@@ -70,9 +70,6 @@ void ControllerCoreParameter::connectControllerToController()
 		QObject::connect(view, &CoreParameterView::emitToggleAntialiasingEntities, tcview, &TrackedComponentView::receiveToggleAntialiasingEntities, Qt::DirectConnection);
 		QObject::connect(view, &CoreParameterView::emitToggleAntialiasingFull, ctrGrphScn, &ControllerGraphicScene::receiveToggleAntialiasingFull, Qt::DirectConnection);
 
-
-
-		//
 	}
 	//Connections to the AreaDescriptor
 	{

BioTracker/CoreApp/BioTracker/Controller/ControllerDataExporter.cpp

@@ -1,4 +1,6 @@
 #include "ControllerDataExporter.h"
+#include "Controller/ControllerCommands.h"
+#include "Controller/ControllerTrackedComponentCore.h"
 #include "Model/DataExporters/DataExporterCSV.h"
 #include "Model/DataExporters/DataExporterSerialize.h"
 #include "Model/DataExporters/DataExporterJson.h"
@@ -22,6 +24,18 @@ void ControllerDataExporter::cleanup() {
 }
 
 void ControllerDataExporter::connectControllerToController() {
+    //connect to controller commands
+	IController* ictrcmd = m_BioTrackerContext->requestController(ENUMS::CONTROLLERTYPE::COMMANDS);
+	ControllerCommands *ctrcmd = static_cast<ControllerCommands*>(ictrcmd);
+
+    QObject::connect(this, &ControllerDataExporter::emitResetUndoStack, ctrcmd, &ControllerCommands::receiveClear, Qt::DirectConnection);
+
+    //connect to view controller
+    IController* ctr = m_BioTrackerContext->requestController(ENUMS::CONTROLLERTYPE::TRACKEDCOMPONENTCORE
+    );
+	ControllerTrackedComponentCore *tccController = dynamic_cast<ControllerTrackedComponentCore*>(ctr);
+
+	QObject::connect(this, &ControllerDataExporter::emitViewUpdate, tccController, &ControllerTrackedComponentCore::receiveUpdateView, Qt::DirectConnection);
 }
 
 void ControllerDataExporter::createModel() {
@@ -89,14 +103,18 @@ void ControllerDataExporter::receiveTrackingDone(uint frame) {
 
 void ControllerDataExporter::receiveFinalizeExperiment() {
     if (getModel()) {
+        emitResetUndoStack();
         dynamic_cast<IModelDataExporter*>(getModel())->finalizeAndReInit();
+        emitViewUpdate();
     }
 }
 
 void ControllerDataExporter::receiveReset() {
     if (getModel()) {
+        emitResetUndoStack();
         dynamic_cast<IModelDataExporter*>(getModel())->finalizeAndReInit();
         dynamic_cast<IModelDataExporter*>(getModel())->close();
+        emitViewUpdate();
     }
 
     createModel();

BioTracker/CoreApp/BioTracker/Controller/ControllerDataExporter.h

@@ -31,6 +31,10 @@ class ControllerDataExporter : public IController {
 
 	void loadFile(std::string file);
 
+Q_SIGNALS:
+	void emitResetUndoStack();
+	void emitViewUpdate();
+
 	public Q_SLOTS:
     void receiveReset();
 	void receiveTrackingDone(uint frame);

BioTracker/CoreApp/BioTracker/Controller/ControllerMainWindow.cpp

@@ -141,6 +141,7 @@ void ControllerMainWindow::connectControllerToController() {
 	QObject::connect(this, &ControllerMainWindow::emitRedoCommand, ctrcmd, &ControllerCommands::receiveRedo, Qt::DirectConnection);
 	QObject::connect(this, &ControllerMainWindow::emitOnLoadMedia, ctrcmd, &ControllerCommands::receiveClear, Qt::DirectConnection);
 	QObject::connect(this, &ControllerMainWindow::emitOnLoadPlugin, ctrcmd, &ControllerCommands::receiveClear, Qt::DirectConnection);
+    //QObject::connect(this, &ControllerMainWindow::emit, ctrcmd, &ControllerCommands::receiveClear, Qt::DirectConnection);
 	QObject::connect(this, &ControllerMainWindow::emitShowActionListCommand, ctrcmd, &ControllerCommands::receiveShowActionList, Qt::DirectConnection);
 
 	//

BioTracker/CoreApp/BioTracker/Model/Annotations.cpp

@@ -79,6 +79,10 @@ void Annotations::deserialize()
 					annotation = std::make_shared<AnnotationArrow>();
 				else if (type == "label")
 					annotation = std::make_shared<AnnotationLabel>();
+				else if (type == "rect")
+					annotation = std::make_shared<AnnotationRect>();
+				else if (type == "ellipse")
+					annotation = std::make_shared<AnnotationEllipse>();
 				if (annotation)
 				{
 					annotation->deserializeFrom(args);
@@ -329,11 +333,13 @@ bool Annotations::updateAnnotation(QPoint cursor)
 	if (currentAnnotation)
 	{
 		currentAnnotation->onEndAnnotation(cursor);
+		dirty = true;
 		return true;
 	}
 	if (selection)
 	{
 		*selection.handle = cursor;
+		dirty = true;
 		return true;
 	}
 	return false;
@@ -375,8 +381,10 @@ bool Annotations::removeSelection()
 	for (auto iter = annotations.begin(); iter != annotations.end();)
 	{
 		const auto annotation = *iter;
-		if (annotation.get() == selectedAnnotation)
+		if (annotation.get() == selectedAnnotation){
 			iter = annotations.erase(iter);
+			dirty = true;
+		}
 		else
 			++iter;
 	}

BioTracker/CoreApp/BioTracker/Model/Annotations.h

@@ -115,7 +115,7 @@ class Annotations : public IModel {
 		using Annotation::Annotation;
 		virtual ~AnnotationEllipse() = default;
 
-		virtual std::string name() const override { return "rect"; }
+		virtual std::string name() const override { return "ellipse"; }
 		virtual void deserializeFrom(std::queue<std::string> &args);
 		virtual std::vector<std::string> serializeToVector() const;
 		virtual bool onEndAnnotation(QPoint currentPosition) override { bottomRight = currentPosition; return true; };

BioTracker/CoreApp/BioTracker/View/GraphicsView.cpp

@@ -19,7 +19,7 @@ GraphicsView::GraphicsView(QWidget *parent, IController *controller, IModel *mod
 	m_BackgroundImage = NULL; 
 
 	this->setScene(m_GraphicsScene);
-	this->setViewport(new QGLWidget());
+	//this->setViewport(new QGLWidget());
 
 	this->setBackgroundBrush(QBrush(Qt::white));
 

BioTracker/CoreApp/BioTracker/View/MainWindow.cpp

@@ -52,7 +52,6 @@ void MainWindow::addTrackerElementsView(IView *elemView)
 		_currentCoreView->setParent(0);
 		m_graphView->removeGraphicsItem(_currentElementView);
 		m_graphView->removeGraphicsItem(_currentCoreView);
-
 	}
 	QGraphicsObject *graphObj = dynamic_cast<QGraphicsObject *>(elemView);
 	graphObj->setParent(ui->trackingArea);