Gats::Object now has a strToGats function, it's pretty slick, it takes a string

and produces a fully formed gats tree.  Also, gatscon now can interact with
a server directly.

1 files changed, 58 insertions, 9 deletions

diff --git a/src/gatscon/clientwidget.cpp b/src/gatscon/clientwidget.cpp
index 4872d9d..6039035 100644
--- a/src/gatscon/clientwidget.cpp
+++ b/src/gatscon/clientwidget.cpp
@@ -1,24 +1,73 @@
 #include "clientwidget.h"
 #include "connectdlg.h"
+#include "clientthread.h"
+
+#include "gatstotree.h"
+
+#include <QMessageBox>
+
+#include <bu/tcpsocket.h>
+#include <bu/sio.h>
+
+using namespace Bu;
 
 ClientWidget::ClientWidget( QWidget *pParent ) :
-        QWidget( pParent ),
-        gsCli( ssCli )
+        QWidget( pParent )
 {
         setupUi( this );
 
-        ConnectDlg dlg( this );
-        dlg.exec();
+        {
+                ConnectDlg dlg( this );
+                dlg.exec();
 
-        ssCli.setStream(
-                new Bu::TcpSocket( dlg.getHost().constData(), dlg.getPort() )
-                );
+                sio << "Connect: " << dlg.getHostname().constData() << ":"
+                        << dlg.getPort() << sio.nl;
 
-        Gats::Object *pObj = gsCli.readObject();
-        gatsToTree( twHistory, pObj );
+                pCli = new ClientThread( this, dlg.getHostname(), dlg.getPort() );
+        }
+        pCli->start();
+        connect( pCli, SIGNAL(recv( Gats::Object *)),
+                this, SLOT(recv(Gats::Object *)), Qt::QueuedConnection );
 }
 
 ClientWidget::~ClientWidget()
 {
 }
 
+void ClientWidget::send()
+{
+        try
+        {
+                Gats::Object *pObj = Gats::Object::strToGats(
+                        leGats->text().toAscii().constData()
+                        );
+                sio << "Send: " << *pObj << sio.nl;
+                QTreeWidgetItem *pIt = new QTreeWidgetItem(
+                        twHistory->invisibleRootItem()
+                        );
+                pIt->setText( 0, "send" );
+                gatsToTree( pIt, pObj );
+                pCli->send( pObj );
+                delete pObj;
+
+                leGats->setText("");
+                leGats->setFocus();
+        }
+        catch( Bu::ExceptionBase &e )
+        {
+                QMessageBox::critical( this, "GatsCon - Error", e.what() );
+        }
+}
+
+void ClientWidget::recv( Gats::Object *pObj )
+{
+        sio << "Recv: " << *pObj << sio.nl;
+
+        QTreeWidgetItem *pIt = new QTreeWidgetItem(
+                twHistory->invisibleRootItem()
+                );
+        pIt->setText( 0, "recv" );
+        gatsToTree( pIt, pObj );
+        delete pObj;
+}
+