Updated validity policy

Also minor esthetic fixes

Author: Hauke Jürgen Mönck

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

@@ -105,15 +105,19 @@ void DataExporterCSV::setProperty(IModelTrackedComponent* comp, std::string key,
 
 void DataExporterCSV::addChildOfChild(IModelTrackedTrajectory *root, IModelTrackedComponent* child, IModelTrackedComponentFactory* factory, int idx) {
     IModelTrackedTrajectory *traj = dynamic_cast<IModelTrackedTrajectory *>(root->getChild(child->getId()));
+
     if (traj) {
         traj->add(child, idx);
     }
     else
     {
-        IModelTrackedTrajectory *ntraj = static_cast<IModelTrackedTrajectory*>(factory->getNewTrackedTrajectory("0"));
-        ntraj->add(child, idx);
-        root->add(ntraj, child->getId());
+        traj = static_cast<IModelTrackedTrajectory*>(factory->getNewTrackedTrajectory("0"));
+        traj->setValid(false);
+        traj->add(child, idx);
+        root->add(traj, child->getId());
     }
+    
+    traj->setValid(child->getValid());
 }
 
 void DataExporterCSV::loadFile(std::string file)
@@ -274,7 +278,7 @@ void DataExporterCSV::writeAll(std::string f) {
         for (int i = 0; i < _root->size(); i++) {
 
             IModelTrackedTrajectory *t = dynamic_cast<IModelTrackedTrajectory *>(_root->getChild(i));
-            if (t) {
+            if (t && t->validCount() > 0) {
                 IModelTrackedPoint *e = dynamic_cast<IModelTrackedPoint*>(t->getChild(idx));
                 if (e) {
                     std::string line = writeComponentCSV(e, trajNumber);

BioTracker/Plugin/BackgroundSubtraction/Model/BioTrackerTrackingAlgorithm.cpp

@@ -160,7 +160,6 @@ void BioTrackerTrackingAlgorithm::doTracking(std::shared_ptr<cv::Mat> p_image, u
 		if (t && t->getValid() && !t->getFixed()) {
 			TrackedElement *e = new TrackedElement(t, "n.a.", t->getId());
 
-			//does this work? trajnumber is not traj-id with new id system
 			e->setFishPose(std::get<0>(poses)[trajNumber]);
 			e->setTime(start);
 			t->add(e, framenumber);

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

@@ -49,7 +49,7 @@ void TrackedTrajectory::add(IModelTrackedComponent *comp, int pos)
 	else if (_size <= pos) {
         while (_size < pos)
         {
-            _TrackedComponents.append(0);
+            _TrackedComponents.append(nullptr);
             _size++;
         }