From 74dd68ad611d15abf16a65c36a7cfd3f4492930a Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 9 Nov 2012 16:25:22 +0000 Subject: Made the repo less libbu++-centric. --- c++-libbu++/src/gatscon/clientthread.cpp | 38 ++++++ c++-libbu++/src/gatscon/clientthread.h | 37 ++++++ c++-libbu++/src/gatscon/clientwidget.cpp | 82 ++++++++++++ c++-libbu++/src/gatscon/clientwidget.h | 30 +++++ c++-libbu++/src/gatscon/clientwidget.ui | 87 +++++++++++++ c++-libbu++/src/gatscon/connectdlg.cpp | 22 ++++ c++-libbu++/src/gatscon/connectdlg.h | 17 +++ c++-libbu++/src/gatscon/connectdlg.ui | 99 ++++++++++++++ c++-libbu++/src/gatscon/filewidget.cpp | 72 +++++++++++ c++-libbu++/src/gatscon/filewidget.h | 29 +++++ c++-libbu++/src/gatscon/filewidget.ui | 95 ++++++++++++++ c++-libbu++/src/gatscon/gatstotree.cpp | 91 +++++++++++++ c++-libbu++/src/gatscon/gatstotree.h | 28 ++++ c++-libbu++/src/gatscon/iobase.cpp | 1 + c++-libbu++/src/gatscon/iobase.h | 10 ++ c++-libbu++/src/gatscon/main.cpp | 13 ++ c++-libbu++/src/gatscon/mainwnd.cpp | 119 +++++++++++++++++ c++-libbu++/src/gatscon/mainwnd.h | 26 ++++ c++-libbu++/src/gatscon/mainwnd.ui | 207 ++++++++++++++++++++++++++++++ c++-libbu++/src/gatscon/proxythread.cpp | 108 ++++++++++++++++ c++-libbu++/src/gatscon/proxythread.h | 60 +++++++++ c++-libbu++/src/gatscon/proxywidget.cpp | 131 +++++++++++++++++++ c++-libbu++/src/gatscon/proxywidget.h | 33 +++++ c++-libbu++/src/gatscon/proxywidget.ui | 181 ++++++++++++++++++++++++++ c++-libbu++/src/gatscon/setupproxydlg.cpp | 27 ++++ c++-libbu++/src/gatscon/setupproxydlg.h | 18 +++ c++-libbu++/src/gatscon/setupproxydlg.ui | 112 ++++++++++++++++ c++-libbu++/src/gatscon/treetogats.cpp | 52 ++++++++ c++-libbu++/src/gatscon/treetogats.h | 13 ++ 29 files changed, 1838 insertions(+) create mode 100644 c++-libbu++/src/gatscon/clientthread.cpp create mode 100644 c++-libbu++/src/gatscon/clientthread.h create mode 100644 c++-libbu++/src/gatscon/clientwidget.cpp create mode 100644 c++-libbu++/src/gatscon/clientwidget.h create mode 100644 c++-libbu++/src/gatscon/clientwidget.ui create mode 100644 c++-libbu++/src/gatscon/connectdlg.cpp create mode 100644 c++-libbu++/src/gatscon/connectdlg.h create mode 100644 c++-libbu++/src/gatscon/connectdlg.ui create mode 100644 c++-libbu++/src/gatscon/filewidget.cpp create mode 100644 c++-libbu++/src/gatscon/filewidget.h create mode 100644 c++-libbu++/src/gatscon/filewidget.ui create mode 100644 c++-libbu++/src/gatscon/gatstotree.cpp create mode 100644 c++-libbu++/src/gatscon/gatstotree.h create mode 100644 c++-libbu++/src/gatscon/iobase.cpp create mode 100644 c++-libbu++/src/gatscon/iobase.h create mode 100644 c++-libbu++/src/gatscon/main.cpp create mode 100644 c++-libbu++/src/gatscon/mainwnd.cpp create mode 100644 c++-libbu++/src/gatscon/mainwnd.h create mode 100644 c++-libbu++/src/gatscon/mainwnd.ui create mode 100644 c++-libbu++/src/gatscon/proxythread.cpp create mode 100644 c++-libbu++/src/gatscon/proxythread.h create mode 100644 c++-libbu++/src/gatscon/proxywidget.cpp create mode 100644 c++-libbu++/src/gatscon/proxywidget.h create mode 100644 c++-libbu++/src/gatscon/proxywidget.ui create mode 100644 c++-libbu++/src/gatscon/setupproxydlg.cpp create mode 100644 c++-libbu++/src/gatscon/setupproxydlg.h create mode 100644 c++-libbu++/src/gatscon/setupproxydlg.ui create mode 100644 c++-libbu++/src/gatscon/treetogats.cpp create mode 100644 c++-libbu++/src/gatscon/treetogats.h (limited to 'c++-libbu++/src/gatscon') diff --git a/c++-libbu++/src/gatscon/clientthread.cpp b/c++-libbu++/src/gatscon/clientthread.cpp new file mode 100644 index 0000000..4c7b72a --- /dev/null +++ b/c++-libbu++/src/gatscon/clientthread.cpp @@ -0,0 +1,38 @@ +#include "clientthread.h" + +#include + +ClientThread::ClientThread( QObject *pParent, const QByteArray &baHost, + int iPort ) : + QThread( pParent ), + baHost( baHost ), + iPort( iPort ), + gsCli( ssCli ) +{ +} + +ClientThread::~ClientThread() +{ +} + +void ClientThread::send( Gats::Object *pObj ) +{ + gsCli.writeObject( pObj ); +} + +void ClientThread::run() +{ + ssCli.setStream( + new Bu::TcpSocket( baHost.constData(), iPort ) + ); + + while( !ssCli.isEos() ) + { + Gats::Object *pObj = gsCli.readObject(); + if( pObj == NULL ) + continue; + + emit recv( pObj ); + } +} + diff --git a/c++-libbu++/src/gatscon/clientthread.h b/c++-libbu++/src/gatscon/clientthread.h new file mode 100644 index 0000000..3182d37 --- /dev/null +++ b/c++-libbu++/src/gatscon/clientthread.h @@ -0,0 +1,37 @@ +#ifndef CLIENT_THREAD_H +#define CLIENT_THREAD_H + +#include +#include + +#include +#include + +namespace Gats +{ + class Object; +}; + +class ClientThread : public QThread +{ + Q_OBJECT; +public: + ClientThread( QObject *pParent, const QByteArray &baHost, int iPort ); + virtual ~ClientThread(); + + void send( Gats::Object *pObj ); + +signals: + void recv( Gats::Object *pObj ); + +protected: + virtual void run(); + +private: + QByteArray baHost; + int iPort; + Bu::StreamStack ssCli; + Gats::GatsStream gsCli; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/clientwidget.cpp b/c++-libbu++/src/gatscon/clientwidget.cpp new file mode 100644 index 0000000..941d9fa --- /dev/null +++ b/c++-libbu++/src/gatscon/clientwidget.cpp @@ -0,0 +1,82 @@ +#include "clientwidget.h" +#include "clientthread.h" + +#include "gatstotree.h" +#include "treetogats.h" + +#include + +#include +#include +#include +#include + +using namespace Bu; + +ClientWidget::ClientWidget( QWidget *pParent, const QByteArray &baHost, + int iPort ) : + QWidget( pParent ) +{ + setupUi( this ); + + pCli = new ClientThread( this, baHost, iPort ); + connect( pCli, SIGNAL(recv( Gats::Object *)), + this, SLOT(recv(Gats::Object *)), Qt::QueuedConnection ); + + pCli->start(); +} + +ClientWidget::~ClientWidget() +{ +} + +void ClientWidget::saveTo( const QString &sFile ) +{ + File fOut( sFile.toAscii().constData(), File::WriteNew ); + Gats::GatsStream gsOut( fOut ); + QTreeWidgetItem *pRoot = twHistory->invisibleRootItem(); + for( int j = 0; j < pRoot->childCount(); j++ ) + { + Gats::Object *pObj = treeToGats( pRoot->child( j ) ); + gsOut.writeObject( pObj ); + delete pObj; + } +} + +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, "Gats Console - 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; +} + diff --git a/c++-libbu++/src/gatscon/clientwidget.h b/c++-libbu++/src/gatscon/clientwidget.h new file mode 100644 index 0000000..06c154d --- /dev/null +++ b/c++-libbu++/src/gatscon/clientwidget.h @@ -0,0 +1,30 @@ +#ifndef CLIENT_WIDGET_H +#define CLIENT_WIDGET_H + +#include +#include "ui_clientwidget.h" +#include "iobase.h" + +namespace Gats +{ + class Object; +}; + +class ClientWidget : public QWidget, protected Ui::ClientWidget, public IoBase +{ + Q_OBJECT; +public: + ClientWidget( QWidget *pParent, const QByteArray &baHost, int iPort ); + virtual ~ClientWidget(); + + virtual void saveTo( const QString &sFile ); + +public slots: + void send(); + void recv( Gats::Object *pObj ); + +private: + class ClientThread *pCli; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/clientwidget.ui b/c++-libbu++/src/gatscon/clientwidget.ui new file mode 100644 index 0000000..a0cb997 --- /dev/null +++ b/c++-libbu++/src/gatscon/clientwidget.ui @@ -0,0 +1,87 @@ + + + ClientWidget + + + + 0 + 0 + 363 + 291 + + + + Form + + + + + + + Name + + + + + Type + + + + + Value + + + + + + + + + + Gats: + + + + + + + + + + Send + + + true + + + true + + + + + + + + + + + pushButton + clicked() + ClientWidget + send() + + + 332 + 276 + + + 322 + 367 + + + + + + send() + + diff --git a/c++-libbu++/src/gatscon/connectdlg.cpp b/c++-libbu++/src/gatscon/connectdlg.cpp new file mode 100644 index 0000000..589ae97 --- /dev/null +++ b/c++-libbu++/src/gatscon/connectdlg.cpp @@ -0,0 +1,22 @@ +#include "connectdlg.h" + +ConnectDlg::ConnectDlg( QWidget *pParent ) : + QDialog( pParent ) +{ + setupUi( this ); +} + +ConnectDlg::~ConnectDlg() +{ +} + +QByteArray ConnectDlg::getHostname() const +{ + return leHost->text().toAscii(); +} + +int ConnectDlg::getPort() const +{ + return sbPort->value(); +} + diff --git a/c++-libbu++/src/gatscon/connectdlg.h b/c++-libbu++/src/gatscon/connectdlg.h new file mode 100644 index 0000000..57ea6cd --- /dev/null +++ b/c++-libbu++/src/gatscon/connectdlg.h @@ -0,0 +1,17 @@ +#ifndef CONNECT_DLG_H +#define CONNECT_DLG_H + +#include "ui_connectdlg.h" + +class ConnectDlg : public QDialog, protected Ui::ConnectDlg +{ + Q_OBJECT; +public: + ConnectDlg( QWidget *pParent ); + virtual ~ConnectDlg(); + + QByteArray getHostname() const; + int getPort() const; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/connectdlg.ui b/c++-libbu++/src/gatscon/connectdlg.ui new file mode 100644 index 0000000..6875e27 --- /dev/null +++ b/c++-libbu++/src/gatscon/connectdlg.ui @@ -0,0 +1,99 @@ + + + ConnectDlg + + + + 0 + 0 + 300 + 93 + + + + Gats Console - Connect + + + + + + + + Hostname: + + + + + + + Port: + + + + + + + localhost + + + + + + + 1 + + + 32767 + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + ConnectDlg + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + ConnectDlg + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/c++-libbu++/src/gatscon/filewidget.cpp b/c++-libbu++/src/gatscon/filewidget.cpp new file mode 100644 index 0000000..dbd70fd --- /dev/null +++ b/c++-libbu++/src/gatscon/filewidget.cpp @@ -0,0 +1,72 @@ +#include "filewidget.h" + +#include "gatstotree.h" +#include "treetogats.h" + +#include +#include +#include + +#include + +using namespace Bu; + +FileWidget::FileWidget( QWidget *pParent ) : + QWidget( pParent ) +{ + setupUi( this ); +} + +FileWidget::FileWidget( QWidget *pParent, QString sFile ) : + QWidget( pParent ) +{ + setupUi( this ); + + File fIn( sFile.toAscii().constData(), File::Read ); + Gats::GatsStream gsIn( fIn ); + Gats::Object *pObj; + while( (pObj = gsIn.readObject()) ) + { + QTreeWidgetItem *pNew = new QTreeWidgetItem( + twGats->invisibleRootItem() + ); + pNew->setText( 0, "" ); + gatsToTree( pNew, pObj ); + delete pObj; + } +} + +FileWidget::~FileWidget() +{ +} + +void FileWidget::saveTo( const QString &sFile ) +{ + File fOut( sFile.toAscii().constData(), File::WriteNew ); + Gats::GatsStream gsOut( fOut ); + QTreeWidgetItem *pRoot = twGats->invisibleRootItem(); + for( int j = 0; j < pRoot->childCount(); j++ ) + { + Gats::Object *pObj = treeToGats( pRoot->child( j ) ); + gsOut.writeObject( pObj ); + delete pObj; + } +} + +void FileWidget::addRootItem() +{ + QString sText = QInputDialog::getText( this, "Gats Console - Add Root Item", + "Gats:"); + Gats::Object *pObj = Gats::Object::strToGats( sText.toAscii().constData() ); + QTreeWidgetItem *pNew = new QTreeWidgetItem( + twGats->invisibleRootItem() + ); + pNew->setText( 0, "" ); + gatsToTree( pNew, pObj ); + delete pObj; +} + +void FileWidget::delRootItem() +{ +} + diff --git a/c++-libbu++/src/gatscon/filewidget.h b/c++-libbu++/src/gatscon/filewidget.h new file mode 100644 index 0000000..9993bfe --- /dev/null +++ b/c++-libbu++/src/gatscon/filewidget.h @@ -0,0 +1,29 @@ +#ifndef FILE_WIDGET_H +#define FILE_WIDGET_H + +#include "ui_filewidget.h" +#include "iobase.h" + +namespace Gats +{ + class Object; +}; + +class FileWidget : public QWidget, protected Ui::FileWidget, public IoBase +{ + Q_OBJECT; +public: + FileWidget( QWidget *pParent=NULL ); + FileWidget( QWidget *pParent, QString sFile ); + virtual ~FileWidget(); + + virtual void saveTo( const QString &sFile ); + +public slots: + void addRootItem(); + void delRootItem(); + +private: +}; + +#endif diff --git a/c++-libbu++/src/gatscon/filewidget.ui b/c++-libbu++/src/gatscon/filewidget.ui new file mode 100644 index 0000000..d0e6ec3 --- /dev/null +++ b/c++-libbu++/src/gatscon/filewidget.ui @@ -0,0 +1,95 @@ + + + FileWidget + + + + 0 + 0 + 316 + 300 + + + + Form + + + + + + + Name + + + + + Type + + + + + Value + + + + + + + + + + Add Root Item + + + + + + + Del Root Item + + + + + + + + + + + pushButton_2 + clicked() + FileWidget + addRootItem() + + + 60 + 283 + + + 10 + 343 + + + + + pushButton + clicked() + FileWidget + delRootItem() + + + 252 + 283 + + + 258 + 324 + + + + + + addRootItem() + delRootItem() + + diff --git a/c++-libbu++/src/gatscon/gatstotree.cpp b/c++-libbu++/src/gatscon/gatstotree.cpp new file mode 100644 index 0000000..e388d5e --- /dev/null +++ b/c++-libbu++/src/gatscon/gatstotree.cpp @@ -0,0 +1,91 @@ +#include "gatstotree.h" + +#include + +#include + +void gatsToTree( QTreeWidgetItem *p, Gats::Object *pObj ) +{ + switch( pObj->getType() ) + { + case Gats::typeInteger: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + + case Gats::typeString: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + + case Gats::typeFloat: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + + case Gats::typeBoolean: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + + case Gats::typeList: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + + case Gats::typeDictionary: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + + case Gats::typeNull: + gatsToTree( p, dynamic_cast( pObj ) ); + break; + } +} + +void gatsToTree( QTreeWidgetItem *p, Gats::Integer *pObj ) +{ + p->setText( 1, "int"); + p->setText( 2, QString("%1").arg( pObj->getValue() ) ); +} + +void gatsToTree( QTreeWidgetItem *p, Gats::String *pObj ) +{ + p->setText( 1, "str"); + p->setText( 2, QString("%1").arg( pObj->getStr() ) ); +} + +void gatsToTree( QTreeWidgetItem *p, Gats::Float *pObj ) +{ + p->setText( 1, "float"); + p->setText( 2, QString("%1").arg( pObj->getValue() ) ); +} + +void gatsToTree( QTreeWidgetItem *p, Gats::Boolean *pObj ) +{ + p->setText( 1, "bool"); + p->setText( 2, pObj->getValue()?"true":"false" ); +} + +void gatsToTree( QTreeWidgetItem *p, Gats::List *pObj ) +{ + p->setText( 1, "list"); + int j = 0; + for( Gats::List::iterator i = pObj->begin(); i; i++ ) + { + QTreeWidgetItem *pIt = new QTreeWidgetItem( p ); + pIt->setText( 0, QString("%1").arg( j++ ) ); + gatsToTree( pIt, *i ); + } +} + +void gatsToTree( QTreeWidgetItem *p, Gats::Dictionary *pObj ) +{ + p->setText( 1, "dict"); + for( Gats::Dictionary::iterator i = pObj->begin(); i; i++ ) + { + QTreeWidgetItem *pIt = new QTreeWidgetItem( p ); + pIt->setText( 0, QString( i.getKey().getStr() ) ); + gatsToTree( pIt, *i ); + } +} + +void gatsToTree( QTreeWidgetItem *p, Gats::Null *pObj ) +{ + p->setText( 1, "null"); +} diff --git a/c++-libbu++/src/gatscon/gatstotree.h b/c++-libbu++/src/gatscon/gatstotree.h new file mode 100644 index 0000000..a803017 --- /dev/null +++ b/c++-libbu++/src/gatscon/gatstotree.h @@ -0,0 +1,28 @@ +#ifndef GATS_TO_TREE_H +#define GATS_TO_TREE_H + +class QTreeWidgetItem; + +namespace Gats +{ + class Integer; + class String; + class Float; + class Boolean; + class List; + class Dictionary; + class Object; +}; + +#include + +void gatsToTree( QTreeWidgetItem *p, Gats::Object *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::Integer *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::String *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::Float *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::Boolean *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::List *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::Dictionary *pObj ); +void gatsToTree( QTreeWidgetItem *p, Gats::Null *pObj ); + +#endif diff --git a/c++-libbu++/src/gatscon/iobase.cpp b/c++-libbu++/src/gatscon/iobase.cpp new file mode 100644 index 0000000..309444c --- /dev/null +++ b/c++-libbu++/src/gatscon/iobase.cpp @@ -0,0 +1 @@ +#include "iobase.h" diff --git a/c++-libbu++/src/gatscon/iobase.h b/c++-libbu++/src/gatscon/iobase.h new file mode 100644 index 0000000..5bd3843 --- /dev/null +++ b/c++-libbu++/src/gatscon/iobase.h @@ -0,0 +1,10 @@ +#ifndef IO_BASE_H +#define IO_BASE_H + +class IoBase +{ +public: + virtual void saveTo( const class QString &sFile )=0; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/main.cpp b/c++-libbu++/src/gatscon/main.cpp new file mode 100644 index 0000000..b9b2327 --- /dev/null +++ b/c++-libbu++/src/gatscon/main.cpp @@ -0,0 +1,13 @@ +#include "mainwnd.h" +#include + +int main( int argc, char *argv[] ) +{ + QApplication app( argc, argv ); + + MainWnd wnd; + wnd.show(); + + return app.exec(); +} + diff --git a/c++-libbu++/src/gatscon/mainwnd.cpp b/c++-libbu++/src/gatscon/mainwnd.cpp new file mode 100644 index 0000000..5d31019 --- /dev/null +++ b/c++-libbu++/src/gatscon/mainwnd.cpp @@ -0,0 +1,119 @@ +#include "mainwnd.h" + +#include "clientwidget.h" +#include "proxywidget.h" +#include "filewidget.h" + +#include "connectdlg.h" +#include "setupproxydlg.h" + +#include +#include + +MainWnd::MainWnd() +{ + setupUi( this ); + + pMode = new QLabel( "Idle", this ); + statusBar()->addPermanentWidget( pMode ); +} + +MainWnd::~MainWnd() +{ +} + +void MainWnd::connect() +{ + ConnectDlg dlg( this ); + if( dlg.exec() == QDialog::Accepted ) + { + sCurFile.clear(); + setCentralWidget( + new ClientWidget( + this, dlg.getHostname(), dlg.getPort() + ) + ); + pMode->setText( + QString("Client Mode: %1:%2").arg( QString(dlg.getHostname()) ). + arg( dlg.getPort() ) + ); + } +} + +void MainWnd::proxy() +{ + SetupProxyDlg dlg( this ); + + if( dlg.exec() == QDialog::Accepted ) + { + sCurFile.clear(); + setCentralWidget( + new ProxyWidget( + this, dlg.getPortIn(), dlg.getHostOut(), dlg.getPortOut() + ) + ); + pMode->setText( + QString("Proxy Mode: :%1 -> %2:%3").arg( dlg.getPortIn() ). + arg( QString(dlg.getHostOut()) ). + arg( dlg.getPortOut() ) + ); + } +} + +void MainWnd::open() +{ + QString sFile = QFileDialog::getOpenFileName( + this, "Gats Console - open gats file" + ); + if( sFile.isEmpty() ) + return; + + sCurFile = sFile; + setCentralWidget( + new FileWidget( this, sFile ) + ); + pMode->setText( QString("File mode: %1").arg( sCurFile ) ); +} + +void MainWnd::newFile() +{ + sCurFile.clear(); + setCentralWidget( + new FileWidget( this ) + ); + pMode->setText( QString("File mode: ") ); +} + +void MainWnd::save() +{ + if( sCurFile.isEmpty() ) + { + saveAs(); + } + else + { + IoBase *pIo = dynamic_cast(centralWidget()); + if( !pIo ) + return; + + pIo->saveTo( sCurFile ); + } +} + +void MainWnd::saveAs() +{ + IoBase *pIo = dynamic_cast(centralWidget()); + if( !pIo ) + return; + + QString sFile = QFileDialog::getSaveFileName( + this, "Gats Console - save gats file" + ); + if( sFile.isEmpty() ) + return; + + pIo->saveTo( sFile ); + + sCurFile = sFile; +} + diff --git a/c++-libbu++/src/gatscon/mainwnd.h b/c++-libbu++/src/gatscon/mainwnd.h new file mode 100644 index 0000000..d1ae080 --- /dev/null +++ b/c++-libbu++/src/gatscon/mainwnd.h @@ -0,0 +1,26 @@ +#ifndef MAIN_WND_H +#define MAIN_WND_H + +#include "ui_mainwnd.h" + +class MainWnd : public QMainWindow, protected Ui::MainWnd +{ + Q_OBJECT; +public: + MainWnd(); + virtual ~MainWnd(); + +public slots: + void connect(); + void proxy(); + void open(); + void newFile(); + void save(); + void saveAs(); + +private: + QString sCurFile; + class QLabel *pMode; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/mainwnd.ui b/c++-libbu++/src/gatscon/mainwnd.ui new file mode 100644 index 0000000..01f534a --- /dev/null +++ b/c++-libbu++/src/gatscon/mainwnd.ui @@ -0,0 +1,207 @@ + + + MainWnd + + + + 0 + 0 + 431 + 319 + + + + Gats Console + + + + + + 0 + 0 + 431 + 21 + + + + + &File + + + + + + + + + + + &Network + + + + + + + + + + + &Open connection... + + + + + &Start proxy... + + + + + &Open Gats File... + + + + + &New Gats File + + + + + &Save + + + + + &Save As... + + + + + E&xit + + + + + + + action_Open_connection + triggered() + MainWnd + connect() + + + -1 + -1 + + + 215 + 159 + + + + + action_Open_proxy_connection + triggered() + MainWnd + proxy() + + + -1 + -1 + + + 215 + 159 + + + + + action_Open_gats_file + triggered() + MainWnd + open() + + + -1 + -1 + + + 215 + 159 + + + + + actionE_xit + triggered() + MainWnd + close() + + + -1 + -1 + + + 215 + 159 + + + + + action_New_Gats_File + triggered() + MainWnd + newFile() + + + -1 + -1 + + + 215 + 159 + + + + + action_Save + triggered() + MainWnd + save() + + + -1 + -1 + + + 215 + 159 + + + + + action_Save_As + triggered() + MainWnd + saveAs() + + + -1 + -1 + + + 215 + 159 + + + + + + connect() + proxy() + open() + save() + saveAs() + newFile() + + diff --git a/c++-libbu++/src/gatscon/proxythread.cpp b/c++-libbu++/src/gatscon/proxythread.cpp new file mode 100644 index 0000000..574b56b --- /dev/null +++ b/c++-libbu++/src/gatscon/proxythread.cpp @@ -0,0 +1,108 @@ +#include "proxythread.h" + +#include + +#include +#include +#include +#include + +using namespace Bu; + +ProxyThread::ProxyThread( QObject *pParent, int iPortIn, + const QByteArray &baHostOut, int iPortOut ) : + QThread( pParent ), + pHost( NULL ), + iPortIn( iPortIn ), + baHostOut( baHostOut ), + iPortOut( iPortOut ), + gsCli( ssCli ) +{ + pHost = new ProxyHostThread( pParent, this ); +} + +ProxyThread::~ProxyThread() +{ +} + +void ProxyThread::send( Gats::Object *pObj ) +{ + MemBuf bg; + Gats::GatsStream gs( bg ); + gs.writeObject( pObj ); + ssCli.write( bg.getString().getStr(), bg.getString().getSize() ); +} + +void ProxyThread::run() +{ + int iSockIn; + + { + TcpServerSocket tsIn( iPortIn ); + do + { + iSockIn = tsIn.accept( 5 ); + } while( iSockIn < 0 ); + } + + emit gotConnection(); + + ssCli.setStream( new TcpSocket( iSockIn ) ); + ssCli.setBlocking( true ); + + pHost->setStream( + new TcpSocket( baHostOut.constData(), iPortOut ) + ); + + pHost->start(); + + while( !ssCli.isEos() ) + { + Gats::Object *pObj = gsCli.readObject(); + if( pObj == NULL ) + continue; + + pHost->send( pObj ); + emit recv( pObj ); + } + +} + +ProxyHostThread::ProxyHostThread( QObject *pParent, ProxyThread *pClient ) : + QThread( pParent ), + pClient( pClient ), + ssHst(), + gsHst( ssHst ) +{ +} + +ProxyHostThread::~ProxyHostThread() +{ +} + +void ProxyHostThread::send( Gats::Object *pObj ) +{ + MemBuf bg; + Gats::GatsStream gs( bg ); + gs.writeObject( pObj ); + ssHst.write( bg.getString().getStr(), bg.getString().getSize() ); +} + +void ProxyHostThread::setStream( Bu::Stream *pStr ) +{ + ssHst.setStream( pStr ); +} + +void ProxyHostThread::run() +{ + while( !ssHst.isEos() ) + { + Gats::Object *pObj = gsHst.readObject(); + if( pObj == NULL ) + continue; + + pClient->send( pObj ); + emit recv( pObj ); + } +} + diff --git a/c++-libbu++/src/gatscon/proxythread.h b/c++-libbu++/src/gatscon/proxythread.h new file mode 100644 index 0000000..df75046 --- /dev/null +++ b/c++-libbu++/src/gatscon/proxythread.h @@ -0,0 +1,60 @@ +#ifndef PROXY_THREAD_H +#define PROXY_THREAD_H + +#include + +#include +#include + +class ProxyThread : public QThread +{ + Q_OBJECT; +public: + ProxyThread( QObject *pParent, int iPortIn, const QByteArray &baHostOut, + int iPortOut ); + virtual ~ProxyThread(); + + class ProxyHostThread *pHost; + + void send( Gats::Object *pObj ); + +signals: + void recv( Gats::Object *pObj ); + void gotConnection(); + +protected: + virtual void run(); + +private: + int iPortIn; + QByteArray baHostOut; + int iPortOut; + + Bu::StreamStack ssCli; + Gats::GatsStream gsCli; +}; + +class ProxyHostThread : public QThread +{ + Q_OBJECT; +public: + ProxyHostThread( QObject *pParent, ProxyThread *pClient ); + virtual ~ProxyHostThread(); + + void send( Gats::Object *pObj ); + + void setStream( Bu::Stream *pStr ); + +signals: + void recv( Gats::Object *pObj ); + +protected: + virtual void run(); + +private: + ProxyThread *pClient; + Bu::StreamStack ssHst; + Gats::GatsStream gsHst; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/proxywidget.cpp b/c++-libbu++/src/gatscon/proxywidget.cpp new file mode 100644 index 0000000..215f95f --- /dev/null +++ b/c++-libbu++/src/gatscon/proxywidget.cpp @@ -0,0 +1,131 @@ +#include "proxywidget.h" +#include "proxythread.h" + +#include "gatstotree.h" +#include "treetogats.h" + +#include + +#include +#include +#include +#include + +using namespace Bu; + +ProxyWidget::ProxyWidget( QWidget *pParent, int iPortIn, + const QByteArray baHost, int iPortOut ) : + QWidget( pParent ), + pPrx( NULL ) +{ + setupUi( this ); + + pPrx = new ProxyThread( this, iPortIn, baHost, iPortOut ); + + connect( pPrx, SIGNAL(gotConnection()), + this, SLOT(gotConnection()), Qt::QueuedConnection ); + connect( pPrx, SIGNAL(recv( Gats::Object *)), + this, SLOT(clientRecv(Gats::Object *)), Qt::QueuedConnection ); + connect( pPrx->pHost, SIGNAL(recv( Gats::Object *)), + this, SLOT(hostRecv(Gats::Object *)), Qt::QueuedConnection ); + + pPrx->start(); +} + +ProxyWidget::~ProxyWidget() +{ +} + +void ProxyWidget::saveTo( const QString &sFile ) +{ + File fOut( sFile.toAscii().constData(), File::WriteNew ); + Gats::GatsStream gsOut( fOut ); + QTreeWidgetItem *pRoot = twHistory->invisibleRootItem(); + for( int j = 0; j < pRoot->childCount(); j++ ) + { + Gats::Object *pObj = treeToGats( pRoot->child( j ) ); + gsOut.writeObject( pObj ); + delete pObj; + } +} + +void ProxyWidget::sendToClient() +{ + 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, "proxy -> client" ); + gatsToTree( pIt, pObj ); + pPrx->send( pObj ); + delete pObj; + + leGats->setText(""); + leGats->setFocus(); + } + catch( Bu::ExceptionBase &e ) + { + QMessageBox::critical( this, "Gats Console - Error", e.what() ); + } +} + +void ProxyWidget::sendToServer() +{ + 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, "proxy -> host" ); + gatsToTree( pIt, pObj ); + pPrx->pHost->send( pObj ); + delete pObj; + + leGats->setText(""); + leGats->setFocus(); + } + catch( Bu::ExceptionBase &e ) + { + QMessageBox::critical( this, "Gats Console - Error", e.what() ); + } +} + +void ProxyWidget::clientRecv( Gats::Object *pObj ) +{ + sio << "Recv: " << *pObj << sio.nl; + + QTreeWidgetItem *pIt = new QTreeWidgetItem( + twHistory->invisibleRootItem() + ); + pIt->setText( 0, "client -> host" ); + gatsToTree( pIt, pObj ); + delete pObj; +} + +void ProxyWidget::hostRecv( Gats::Object *pObj ) +{ + sio << "Recv: " << *pObj << sio.nl; + + QTreeWidgetItem *pIt = new QTreeWidgetItem( + twHistory->invisibleRootItem() + ); + pIt->setText( 0, "host -> client" ); + gatsToTree( pIt, pObj ); + delete pObj; +} + +void ProxyWidget::gotConnection() +{ + lwConnect->stop(); + swRoot->setCurrentIndex( 1 ); +} + diff --git a/c++-libbu++/src/gatscon/proxywidget.h b/c++-libbu++/src/gatscon/proxywidget.h new file mode 100644 index 0000000..d6ebf4d --- /dev/null +++ b/c++-libbu++/src/gatscon/proxywidget.h @@ -0,0 +1,33 @@ +#ifndef PROXY_WIDGET_H +#define PROXY_WIDGET_H + +#include "ui_proxywidget.h" +#include "iobase.h" + +namespace Gats +{ + class Object; +}; + +class ProxyWidget : public QWidget, protected Ui::ProxyWidget, public IoBase +{ + Q_OBJECT; +public: + ProxyWidget( QWidget *pParent, int iPortIn, const QByteArray baHost, + int iPortOut ); + virtual ~ProxyWidget(); + + virtual void saveTo( const QString &sFile ); + +public slots: + void sendToClient(); + void sendToServer(); + void clientRecv( Gats::Object *pObj ); + void hostRecv( Gats::Object *pObj ); + void gotConnection(); + +private: + class ProxyThread *pPrx; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/proxywidget.ui b/c++-libbu++/src/gatscon/proxywidget.ui new file mode 100644 index 0000000..995fc73 --- /dev/null +++ b/c++-libbu++/src/gatscon/proxywidget.ui @@ -0,0 +1,181 @@ + + + ProxyWidget + + + + 0 + 0 + 338 + 300 + + + + Form + + + + 0 + + + + + 0 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Listening for connections... + + + Qt::AlignCenter + + + + + + + + 0 + 50 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + Name + + + + + Type + + + + + Value + + + + + + + + + + Gats: + + + + + + + + + + + + Send to Client + + + + + + + Send to Server + + + + + + + + + + + + + + + + LoadingWidget + QWidget +
loadingwidget.h
+ 1 + + + + + + pushButton + clicked() + ProxyWidget + sendToClient() + + + 280 + 258 + + + 392 + 223 + + + + + pushButton_2 + clicked() + ProxyWidget + sendToServer() + + + 306 + 284 + + + 199 + 340 + + + + + + sendToClient() + sendToServer() + + diff --git a/c++-libbu++/src/gatscon/setupproxydlg.cpp b/c++-libbu++/src/gatscon/setupproxydlg.cpp new file mode 100644 index 0000000..7c7a873 --- /dev/null +++ b/c++-libbu++/src/gatscon/setupproxydlg.cpp @@ -0,0 +1,27 @@ +#include "setupproxydlg.h" + +SetupProxyDlg::SetupProxyDlg( QWidget *pParent ) : + QDialog( pParent ) +{ + setupUi( this ); +} + +SetupProxyDlg::~SetupProxyDlg() +{ +} + +int SetupProxyDlg::getPortIn() const +{ + return sbPortIn->value(); +} + +QByteArray SetupProxyDlg::getHostOut() const +{ + return leHostOut->text().toAscii(); +} + +int SetupProxyDlg::getPortOut() const +{ + return sbPortOut->value(); +} + diff --git a/c++-libbu++/src/gatscon/setupproxydlg.h b/c++-libbu++/src/gatscon/setupproxydlg.h new file mode 100644 index 0000000..6cc31bd --- /dev/null +++ b/c++-libbu++/src/gatscon/setupproxydlg.h @@ -0,0 +1,18 @@ +#ifndef SETUP_PROXY_DLG_H +#define SETUP_PROXY_DLG_H + +#include "ui_setupproxydlg.h" + +class SetupProxyDlg : public QDialog, protected Ui::SetupProxyDlg +{ + Q_OBJECT; +public: + SetupProxyDlg( QWidget *pParent=NULL ); + virtual ~SetupProxyDlg(); + + int getPortIn() const; + QByteArray getHostOut() const; + int getPortOut() const; +}; + +#endif diff --git a/c++-libbu++/src/gatscon/setupproxydlg.ui b/c++-libbu++/src/gatscon/setupproxydlg.ui new file mode 100644 index 0000000..c713baf --- /dev/null +++ b/c++-libbu++/src/gatscon/setupproxydlg.ui @@ -0,0 +1,112 @@ + + + SetupProxyDlg + + + + 0 + 0 + 359 + 122 + + + + Gats Console - Setup Proxy + + + + + + + + Listening port: + + + + + + + 1 + + + 32767 + + + + + + + Target host: + + + + + + + + + + Target port: + + + + + + + 1 + + + 32767 + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + SetupProxyDlg + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + SetupProxyDlg + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/c++-libbu++/src/gatscon/treetogats.cpp b/c++-libbu++/src/gatscon/treetogats.cpp new file mode 100644 index 0000000..a1571d1 --- /dev/null +++ b/c++-libbu++/src/gatscon/treetogats.cpp @@ -0,0 +1,52 @@ +#include "treetogats.h" + +#include + +#include + +Gats::Object *treeToGats( QTreeWidgetItem *pRoot ) +{ + QString sType = pRoot->text( 1 ); + QByteArray baDat = pRoot->text( 2 ).toAscii(); + if( sType == "int" ) + { + return new Gats::Integer( strtoll( baDat.constData(), NULL, 10 ) ); + } + else if( sType == "str" ) + { + return new Gats::String( baDat.constData(), baDat.size() ); + } + else if( sType == "float" ) + { + return new Gats::Float( strtod( baDat.constData(), NULL ) ); + } + else if( sType == "bool" ) + { + return new Gats::Boolean( baDat == "true" ); + } + else if( sType == "list" ) + { + Gats::List *pRet = new Gats::List(); + for( int j = 0; j < pRoot->childCount(); j++ ) + { + pRet->append( treeToGats( pRoot->child( j ) ) ); + } + return pRet; + } + else if( sType == "dict" ) + { + Gats::Dictionary *pRet = new Gats::Dictionary(); + for( int j = 0; j < pRoot->childCount(); j++ ) + { + QTreeWidgetItem *pChild = pRoot->child( j ); + pRet->insert( + pChild->text( 0 ).toAscii().constData(), + treeToGats( pChild ) + ); + } + return pRet; + } + + throw Bu::ExceptionBase("Unhandled type found."); +} + diff --git a/c++-libbu++/src/gatscon/treetogats.h b/c++-libbu++/src/gatscon/treetogats.h new file mode 100644 index 0000000..931623d --- /dev/null +++ b/c++-libbu++/src/gatscon/treetogats.h @@ -0,0 +1,13 @@ +#ifndef TREE_TO_GATS_H +#define TREE_TO_GATS_H + +class QTreeWidgetItem; + +namespace Gats +{ + class Object; +}; + +Gats::Object *treeToGats( QTreeWidgetItem *pRoot ); + +#endif -- cgit v1.2.3