Polishing: CSV fillers, more convinient plugin creation, removing comments

Author: Hauke Jürgen Mönck

BioTracker/CoreApp/BioTracker/Model/DataExporters/DataExporterCSV.cpp

@@ -238,9 +238,12 @@ void DataExporterCSV::writeAll() {
     //write header
     int vcount = _root->validCount();
     IModelTrackedComponentFactory* factory = ctr ? ctr->getComponentFactory() : nullptr;
+    int headerCount = 0;
     if (factory != nullptr) {
         IModelTrackedComponent *ptraj = static_cast<IModelTrackedComponent*>(factory->getNewTrackedElement("0"));
-        o << getHeader(ptraj, vcount) << "\n";
+        std::string header = getHeader(ptraj, vcount);
+        headerCount = getHeaderElements(ptraj).size();
+        o << header << "\n";
         delete ptraj;
     }
 
@@ -254,18 +257,27 @@ void DataExporterCSV::writeAll() {
         o << std::to_string(idx)
             << _separator + std::to_string((((float)idx) / _fps) * 1000);
 
+        int linecnt = 0;
         //i is the track number
         for (int i = 0; i < _root->size(); i++) {
 
             IModelTrackedTrajectory *t = dynamic_cast<IModelTrackedTrajectory *>(_root->getChild(i));
             if (t) {
                 IModelTrackedPoint *e = dynamic_cast<IModelTrackedPoint*>(t->getChild(idx));
                 if (e) {
-                    o << writeComponentCSV(e, trajNumber);
+                    std::string line = writeComponentCSV(e, trajNumber);
+                    o << line;
+                    linecnt++;
                 }
                 trajNumber++;
             }
         }
+        int count = _root->validCount();
+        while (linecnt < count) {
+            for (int i = 0; i<headerCount; i++)
+                o << _separator;
+            linecnt++;
+        }
         o << std::endl;
     }
     o.close();

BioTracker/Interfaces/BioTrackerInterfaces/Interfaces/IBioTrackerPlugin.cpp

@@ -0,0 +1,9 @@
+#include "IBioTrackerPlugin.h"
+
+IView *IBioTrackerPlugin::getTrackerParameterWidget()  { return nullptr; };
+IView *IBioTrackerPlugin::getTrackerElementsWidget() { return nullptr; };
+IModel *IBioTrackerPlugin::getTrackerComponentModel() { return nullptr; };
+void IBioTrackerPlugin::sendCorePermissions() { return; };
+IModelTrackedComponentFactory *IBioTrackerPlugin::getComponentFactory() { return nullptr; };
+void IBioTrackerPlugin::connectInterfaces() { return; };
+void IBioTrackerPlugin::receiveAreaDescriptor(IModelAreaDescriptor *areaDescr) { return; };

BioTracker/Interfaces/BioTrackerInterfaces/Interfaces/IBioTrackerPlugin.h

@@ -18,15 +18,15 @@ class IBioTrackerPlugin : public QObject
 
     virtual void createPlugin() = 0;
 
-	virtual IView *getTrackerParameterWidget() = 0;// { return nullptr; };
-	virtual IView *getTrackerElementsWidget() = 0;// { return nullptr; };
-	virtual IModel *getTrackerComponentModel() = 0;// { return nullptr; };
-	virtual void sendCorePermissions() = 0;// { return; };
+    virtual IView *getTrackerParameterWidget();
+    virtual IView *getTrackerElementsWidget();
+    virtual IModel *getTrackerComponentModel();
+    virtual void sendCorePermissions();
 
-	virtual IModelTrackedComponentFactory *getComponentFactory() = 0;// { return nullptr; };
+    virtual IModelTrackedComponentFactory *getComponentFactory();
 
 private:
-    virtual void connectInterfaces() = 0;
+    virtual void connectInterfaces();
 
 Q_SIGNALS:
     virtual void emitCvMat(std::shared_ptr<cv::Mat> mat, QString name) = 0;
@@ -36,7 +36,7 @@ class IBioTrackerPlugin : public QObject
 
 public Q_SLOTS:
     virtual void receiveCurrentFrameFromMainApp(std::shared_ptr<cv::Mat> mat, uint frameNumber) = 0;
-	virtual void receiveAreaDescriptor(IModelAreaDescriptor *areaDescr) = 0;
+	virtual void receiveAreaDescriptor(IModelAreaDescriptor *areaDescr);
 
 private Q_SLOTS:
     virtual void receiveCvMatFromController(std::shared_ptr<cv::Mat> mat, QString name) = 0;

BioTracker/Plugin/BackgroundSubtraction/Model/BioTrackerTrackingAlgorithm.cpp

@@ -23,9 +23,6 @@ BioTrackerTrackingAlgorithm::BioTrackerTrackingAlgorithm(IModel *parameter, IMod
 
     _lastImage = nullptr;
     _lastFramenumber = -1;
-
-	//This is null so far...
-	//_bd.setAreaInfo(_AreaInfo);
 }
 
 

BioTracker/Plugin/BackgroundSubtraction/Model/TrackedComponents/TrackedElement.cpp

@@ -93,7 +93,6 @@ void  TrackedElement::setY(float val) {
 	_pose = pnew;
 };
 
-//TODO for all setters from here -> why no _pose = pnew;?
 void  TrackedElement::setRad(float r) {
 	_rad = r;
 	FishPose pnew(_pose.position_cm(), _pose.position_px(), _rad, _deg, _pose.width(), _pose.height(), _pose.getScore());
@@ -163,14 +162,12 @@ void TrackedElement::operate()
 
 void TrackedElement::pressed()
 {
-	//_pressed = true;
 	Q_EMIT notifyView();
 
 }
 
 void TrackedElement::notPressed()
 {
-	//_pressed = false;
 	Q_EMIT notifyView();
 }
 

BioTracker/Plugin/BackgroundSubtraction/Model/TrackedComponents/TrackedTrajectory.cpp

@@ -23,7 +23,7 @@ TrackedTrajectory::TrackedTrajectory(QObject *parent, QString name) :
     g_calcValid = 1;
     g_validCount = 0;
     _size = 0;
-    _valid = true;// setValid(true);
+    _valid = true;
 }
 
 void TrackedTrajectory::operate()
@@ -118,9 +118,6 @@ int TrackedTrajectory::size()
     return (_size == 0 ? _size : _size = _TrackedComponents.size());
 }
 
-
-//int calcValid = 1;
-//int validCount = 0;
 int TrackedTrajectory::validCount()
 {
     if (g_calcValid == 1) {

BioTracker/Plugin/BackgroundSubtraction/Model/TrackedComponents/pose/FishPose.cpp

@@ -19,10 +19,8 @@ std::string FishPose::toString(bool rectified)
 {
 	std::ostringstream out;
 	if(rectified == false)
-		//out << _position_px.x << "," << _position_px.y << "," << _degAngle << "," << _radAngle;
 		out << _position_px.x << ";" << _position_px.y << ";" << _degAngle << ";" << _radAngle;
 	else
-		//out << _position_cm.x << "," << _position_cm.y << "," << _degAngle << "," << _radAngle;
 		out << _position_cm.x << ";" << _position_cm.y << ";" << _degAngle << ";" << _radAngle;
 	return out.str();
 }

BioTracker/Plugin/BackgroundSubtraction/View/TrackerParameterView.cpp

@@ -8,15 +8,6 @@ TrackerParameterView::TrackerParameterView(QWidget *parent, IController *control
     _ui(new Ui::TrackerParameterView)
 {
     _ui->setupUi(this);
-
-    //For the spinboxes we don't need this
-	/*ui->lineEdit_2_binThresh->setValidator(new QIntValidator(this));
-	ui->lineEdit_3_SizeErode->setValidator(new QIntValidator(this));
-	ui->lineEdit_4_SizeDilate->setValidator(new QIntValidator(this));
-	ui->lineEdit_8_MinBlob->setValidator(new QIntValidator(this));
-	ui->lineEdit_9MaxBlob->setValidator(new QIntValidator(this));
-	ui->lineEdit_7_MogBack->setValidator(new QDoubleValidator(this));	
-    */
     getNotified();
 
 
@@ -46,23 +37,6 @@ void TrackerParameterView::on_comboBoxSendImage_currentIndexChanged(int v) {
 	parameter->setNewSelection(_ui->comboBoxSendImage->currentText().toStdString());
 }
 
-//void TrackerParameterView::on_checkBoxNetwork_stateChanged(int v) {
-//	TrackerParameter *parameter = qobject_cast<TrackerParameter *>(getModel());
-//	parameter->setDoNetwork(v);
-//}
-//
-//void TrackerParameterView::on_checkBoxBackground_stateChanged(int v) {
-//	TrackerParameter *parameter = qobject_cast<TrackerParameter *>(getModel());
-//	parameter->setDoBackground(v);
-//}
-//
-//void TrackerParameterView::on_pushButtonNoFish_clicked() {
-//}
-//
-//
-//void TrackerParameterView::on_checkBoxTrackingArea_stateChanged(int v) {
-//	Q_EMIT trackingAreaType(v);
-//}
 
 void TrackerParameterView::on_pushButton_clicked()
 {