diff --git a/spwplugin/stardundeespw_usb.cpp b/spwplugin/stardundeespw_usb.cpp --- a/spwplugin/stardundeespw_usb.cpp +++ b/spwplugin/stardundeespw_usb.cpp @@ -28,13 +28,8 @@ stardundeeSPW_USB::stardundeeSPW_USB(soc abstractSpwBridge(parent) { Q_UNUSED(parent) - this->p_GUI = new QWidget(parent); - this->mainLayout = new QGridLayout(this->p_GUI); - this->p_GUI->setLayout(mainLayout); - this->connectBridgeButton = new QPushButton("Connect"); - this->mainLayout->addWidget(this->connectBridgeButton,1,0,1,1); - connect(this->connectBridgeButton,SIGNAL(clicked()),this,SLOT(toggleBridgeConnection())); this->manager = new stardundeeSPW_USB_Manager(parent,this); + makeGUI(socexplorerplugin *parent); this->manager->start(); } @@ -195,6 +190,16 @@ unsigned int stardundeeSPW_USB::Read(uns return read; } +void stardundeeSPW_USB::makeGUI(socexplorerplugin *parent) +{ + this->p_GUI = new QWidget(parent); + this->mainLayout = new QGridLayout(this->p_GUI); + this->p_GUI->setLayout(mainLayout); + this->connectBridgeButton = new QPushButton("Connect"); + this->mainLayout->addWidget(this->connectBridgeButton,1,0,1,1); + connect(this->connectBridgeButton,SIGNAL(clicked()),this,SLOT(toggleBridgeConnection())); +} + stardundeeSPW_USB_Manager::stardundeeSPW_USB_Manager(socexplorerplugin *plugin, QObject *parent) :QThread((QObject*)parent) { diff --git a/spwplugin/stardundeespw_usb.h b/spwplugin/stardundeespw_usb.h --- a/spwplugin/stardundeespw_usb.h +++ b/spwplugin/stardundeespw_usb.h @@ -69,6 +69,7 @@ private: char* SPWPacketBuff; QList RMAP_Answers; QList RMAP_pending_transaction_IDs; + int linkNumber; }; class stardundeeSPW_USB : public abstractSpwBridge @@ -89,6 +90,7 @@ public slots: unsigned int Read(unsigned int *Value,unsigned int count, unsigned int address=0); private: + void makeGUI(socexplorerplugin *parent); stardundeeSPW_USB_Manager* manager; QGridLayout* mainLayout; QPushButton* connectBridgeButton;