# HG changeset patch
# User admin@pc-p-leroy3.LAB-LPP.LOCAL
# Date 2013-07-04 10:15:26
# Node ID 74a76c9f112cf87baade519609ddbe27cd1153a0
# Parent  0ca1c62d808793a992300a7144bce9953af8123d
# Parent  66e3fbb189eb775df3a7fe3997f2b66efabb99a2

Merge

diff --git a/PAULs_LPPMON_PLUGINS.pro.user.orig b/PAULs_LPPMON_PLUGINS.pro.user.orig
--- a/PAULs_LPPMON_PLUGINS.pro.user.orig
+++ b/PAULs_LPPMON_PLUGINS.pro.user.orig
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2013-04-11T17:17:11. -->
+<!-- Written by Qt Creator 2.4.1, 2013-07-03T17:10:59. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/rmapplugin/rmapplugin.cpp b/rmapplugin/rmapplugin.cpp
--- a/rmapplugin/rmapplugin.cpp
+++ b/rmapplugin/rmapplugin.cpp
@@ -245,7 +245,7 @@ void rmapplugin::receivePacketFromBridge
     preProcessPacket(packet);
 
     // Send the packet to the TM echo bridge for processing
-    this->UI->tmEchoBridge->sendTMPacket_v2(packet);
+    this->UI->tmEchoBridge->sendTMPacket(packet);
     //this->UI->tmEchoBridge->sendTMPacket_alternative(packet);
 
     this->generalCCSDSPacketStore.append(packet);
diff --git a/rmapplugin/tmechobridge.cpp b/rmapplugin/tmechobridge.cpp
--- a/rmapplugin/tmechobridge.cpp
+++ b/rmapplugin/tmechobridge.cpp
@@ -157,52 +157,6 @@ void TMEchoBridge::sendXML_GSE_HK()
 
 void TMEchoBridge::sendTMPacket(TMPacketToRead *tmPacketToRead)
 {
-    if (tmEchoBridgeSocket->state() == QAbstractSocket::ConnectedState)
-    {
-        // START DOCUMENT
-        //xmlWriter->writeStartDocument();
-
-        // <Event>
-        xmlWriter->writeStartElement("Event");
-
-        // <EventDate>
-        xmlWriter->writeStartElement("EventDate");
-        xmlWriter->writeEndElement();
-
-        // <Event Time>
-        xmlWriter->writeStartElement("EventTime");
-        xmlWriter->writeEndElement();
-
-        // <EventBinary>
-        xmlWriter->writeStartElement("EventBinary");
-        xmlWriter->writeCharacters(
-                    QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size).toHex()
-                    );
-        //tmEchoBridgeSocket->write(QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size));
-        xmlWriter->writeEndElement();
-
-        // </Event>
-        xmlWriter->writeEndElement();
-
-        // END DOCUMENT
-        xmlWriter->writeEndDocument();
-
-        tmEchoBridgeSocket->flush();
-
-        totalOfBytes = totalOfBytes + tmPacketToRead->size;
-        totalOfPackets = totalOfPackets + 1;
-        label_totalOfBytes->setText("Number of TM bytes sent: " + QString::number(totalOfBytes));
-        label_totalOfPackets->setText("Number of TM packets sent: " + QString::number(totalOfPackets));
-    }
-    else
-    {
-        totalOfPacketsDropped = totalOfPacketsDropped + 1;
-        label_totalOfPacketsDropped->setText("Number of TM packets dropped: " + QString::number(totalOfPacketsDropped));
-    }
-}
-
-void TMEchoBridge::sendTMPacket_v2(TMPacketToRead *tmPacketToRead)
-{
     QByteArray ccsdsArray;
     QTime echoBridgeTimeout;
 
diff --git a/rmapplugin/tmechobridge.h b/rmapplugin/tmechobridge.h
--- a/rmapplugin/tmechobridge.h
+++ b/rmapplugin/tmechobridge.h
@@ -32,7 +32,6 @@ public slots:
     void newConnectionOnTCServer();
     void sendXML_GSE_HK();
     void sendTMPacket(TMPacketToRead *tmPacketToRead);
-    void sendTMPacket_v2(TMPacketToRead *tmPacketToRead);
     void clearConsole();
     void resetTMStatistics();