Changeset 88 in pacpussensors for trunk

Timestamp:

06/25/15 18:09:40 (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

add output of 2D ENU position

Location:

trunk/SpanCPTComponent

Files:

• CPTComponent.cpp (modified) (4 diffs)
• CPTComponent.h (modified) (3 diffs)
• test_display_novatel_gps.xml (added)

trunk/SpanCPTComponent/CPTComponent.cpp

@@ -15 +15 @@
 #include <iostream>
 
-#include "Pacpus/kernel/ComponentFactory.h"
-#include "Pacpus/kernel/DbiteFileTypes.h"
-#include "Pacpus/kernel/Log.h"
-#include "Pacpus/PacpusTools/geodesie.h"
-#include "Pacpus/PacpusTools/ShMem.h"
+#include <Pacpus/kernel/ComponentFactory.h>
+#include <Pacpus/kernel/DbiteFileTypes.h>
+#include <Pacpus/kernel/Log.h>
+#include <Pacpus/PacpusTools/geodesie.h>
+#include <Pacpus/PacpusTools/ShMem.h>
+
 
 namespace pacpus {
@@ -106 +107 @@
     return ComponentBase::CONFIGURED_OK;
 }
+
+
+
+void CPTComponent::addOutputs()
+{
+    // must inherit from QObject to use addOutput
+  addOutput<QPointF, CPTComponent>("position2DENU");
+}
+
 
 void CPTComponent::setPortCOM(const char * port)
@@ -222 +232 @@
                     }
                     mShMem->write(allFramesBuffer, AllFramesSize);
+
+                                        if (position2DENUOutput_ && position2DENUOutput_->hasConnection()) 
+                                        {
+                                                // send ENU 2D position 
+                                                QPointF pt( bestgpsposaFrame_.e, bestgpsposaFrame_.n);
+                                                position2DENUOutput_->send(pt);
+                                        }
                     break;
 
@@ -411 +428 @@
         LOG_WARN("cannot connect SIGNAL(newDataAvailable(int)) with SLOT(unlockProcessing(int)");
     }
-    LOG_INFO("started component '" << name() << "'");
+    LOG_INFO("started component '" << name() << "'"); 
+
+        position2DENUOutput_ = getTypedOutput<QPointF, CPTComponent>("position2DENU");
+
 
     serialPort->THREAD_ALIVE = true;

trunk/SpanCPTComponent/CPTComponent.h

@@ +1 @@
+
 /*********************************************************************
 //  created:    2011/06/28 - 18:18
@@ -19 +20 @@
 
 #include "../NMEA0183/include/nmea0183.h"
-#include "Pacpus/kernel/ComponentBase.h"
-#include "Pacpus/kernel/DbiteFile.h"
-#include "Pacpus/kernel/pacpus.h"
+#include <Pacpus/kernel/ComponentBase.h>
+#include <Pacpus/kernel/DbiteFile.h>
+#include <Pacpus/kernel/pacpus.h>
+#include <Pacpus/kernel/InputOutputInterface.h>
 #include "../Gps/structure_gps.h"
+
 
 #ifdef WIN32
@@ -158 +161 @@
                      TimestampedInspvaaFrame*,
                      TimestampedInscovFrame*);
+
+        // component ouputs
+        void addOutputs();
+        OutputInterface<QPointF, CPTComponent>* position2DENUOutput_;
 };