Changeset 185 in pacpusframework for trunk/include/Pacpus

Timestamp:

Oct 23, 2013, 10:32:21 AM (11 years ago)

Author:

morasjul

Message:

Fixed: dependencies.

Location:

trunk/include/Pacpus/kernel

Files:

• InputOutputBase.h (modified) (2 diffs)
• InputOutputInterface.h (modified) (4 diffs)

trunk/include/Pacpus/kernel/InputOutputBase.h

@@ -66 +66 @@
     virtual ~InputInterfaceBase();
 
-    virtual void customEvent(QEvent* e);
+    virtual void customEvent(QEvent * e);
 
     ReadingMode & readingMode();
-    const ReadingMode & readingMode() const;
+    const ReadingMode & getReadingMode() const;
     void setReadingMode(ReadingMode mode);
 
@@ -96 +96 @@
     QStringList getInputConnectedList();
 
-    // TODO for serialization prupose (not yet implemented !!!)
     void send(/*const*/ QByteArray & data);
 };
-
-namespace {
-
-bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode = InputInterfaceBase::GetLast);
-
-bool connectInterface(OutputInterfaceBase * out, InputInterfaceBase * in, int priority, InputInterfaceBase::ReadingMode mode)
-{
-    if (out->getDataType() == in->getDataType() || out->getDataType() == QString(typeid(QByteArray).name()) || in->getDataType() == QString(typeid(QByteArray).name())) {
-        // Add connection
-        out->addConnection(ConnectionBase(in, priority));  // TODO make connect function
-        in->addConnection(ConnectionBase(out, priority));
-        in->setReadingMode(mode);
-        //LOG_INFO("connection : Output " << out->getSignature() << " => Input " << in->getSignature());
-        return true;
-    } else {
-        //LOG_WARN("connecting " << out->getSignature() << ":" << out->getDataType() << " to " << in->getSignature() << ":" << in->getDataType() << " failled : DataType incompatible " <<  QString(typeid(QByteArray).name()));
-        return false;
-    }
-}
-
-} // namespace
 
 } // namespace pacpus

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -96 +96 @@
 
     // TODO for Pulling mode (not yet implemented !!!)
-    T& getData() {
+    T & getData() {
         T data;
         // TODO ask output data;
@@ -105 +105 @@
 protected:
     void (C::*method)(const T&);
-
 };
 
 template <typename T, class C>
-class OutputInterface : public OutputInterfaceBase
+class OutputInterface
+    : public OutputInterfaceBase
 {
 public:
     OutputInterface(QString name, C * component)
-        :OutputInterfaceBase(name,component,component)
+        : OutputInterfaceBase(name, component, component)
     {}
     ~OutputInterface() {}
@@ -120 +120 @@
     void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0);
     
-    void send(const T & data, road_time_t t, road_timerange_t tr)
-    {
-        // FIXME Data Shared
-        //QSharedPointer<T> sharedPointer = new T(data);
-
-        for (QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
-            QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority()); // Event is delete by the event loop handler
-            //qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";
-        }
-    }
-
     size_t getDataSize()
     {
@@ -142 +131 @@
 };
 
+template <typename T, class C>
+void OutputInterface<T, C>::send(const T & data, road_time_t t, road_timerange_t tr)
+{
+    // FIXME Data Shared
+    //QSharedPointer<T> sharedPointer = new T(data);
+
+    for (QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
+        QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority()); // Event is delete by the event loop handler
+        //qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";
+    }
+}
+
 } // namespace pacpus