uLab
/
remotelaboratory
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/remotelaboratory
0
0
Fork 0
Code Issues Releases Wiki Activity

Stabilize clients and complete basic view layout/widgets

Browse Source
master
Timothy Pearson 13 years ago
parent 963501ff41
commit 623cde93fd
10 changed files with 399 additions and 59 deletions
Show Stats Download Patch File Download Diff File

19
clients/tde/misc/remotelabui.rc
Unescape Escape View File

@ -6,38 +6,19 @@
<Action name="connect_server"/> <Action name="connect_server"/>
<Action name="disconnect_server"/> <Action name="disconnect_server"/>
</Menu> </Menu>
<Menu name="selectedInstrumentMenu">
<text>Current Instrument</text>
<ActionList name="selectedInstrument_actionlist"/> <ActionList name="selectedInstrument_actionlist"/>
</Menu>
<Menu name="dutMenu">
<text>Device Under Test</text>
<ActionList name="dutMenu_actionlist"/>
</Menu>
<Menu name="instrumentMenu"> <Menu name="instrumentMenu">
<text>Instrumentation</text> <text>Instrumentation</text>
<ActionList name="instrumentMenu_actionlist"/> <ActionList name="instrumentMenu_actionlist"/>
</Menu> </Menu>
<Menu name="serviceMenu">
<text>Services</text>
<ActionList name="serviceMenu_actionlist"/>
</Menu>
</MenuBar> </MenuBar>
<ToolBar name="connectionToolBar" fullWidth="true" noMerge="1"> <ToolBar name="connectionToolBar" fullWidth="true" noMerge="1">
<text>Connection</text> <text>Connection</text>
<Action name="connect_server"/> <Action name="connect_server"/>
<Action name="disconnect_server"/> <Action name="disconnect_server"/>
</ToolBar> </ToolBar>
<ToolBar name="dutToolBar" fullWidth="true" noMerge="1">
<text>Device Under Test</text>
<ActionList name="dutToolBar_actionlist"/>
</ToolBar>
<ToolBar name="instrumentToolBar" fullWidth="true" noMerge="1"> <ToolBar name="instrumentToolBar" fullWidth="true" noMerge="1">
<text>Instrumentation</text> <text>Instrumentation</text>
<ActionList name="instrumentToolBar_actionlist"/> <ActionList name="instrumentToolBar_actionlist"/>
</ToolBar> </ToolBar>
<ToolBar name="serviceToolBar" fullWidth="true" noMerge="1">
<text>Services</text>
<ActionList name="serviceToolBar_actionlist"/>
</ToolBar>
</kpartgui> </kpartgui>

55
clients/tde/src/app/remotemdi.cpp
Unescape Escape View File

@ -30,7 +30,7 @@ using namespace std;
#include "dialogs/selectserverdlg.h" #include "dialogs/selectserverdlg.h"
RemoteMDI::RemoteMDI() RemoteMDI::RemoteMDI()
: KMdiMainFrm(0, "RemoteMDI", KMdi::ChildframeMode), m_instrumentActionListPlugged(false), m_children(0), m_rsvSvrSocket(NULL), connToServerConnecting(false), connToServerState(-1), connToServerTimeoutTimer(NULL) : KMdiMainFrm(0, "RemoteMDI", KMdi::ChildframeMode), m_children(0), m_rsvSvrSocket(NULL), connToServerConnecting(false), connToServerState(-1), connToServerTimeoutTimer(NULL)
{ {
setXMLFile("remotelabui.rc"); setXMLFile("remotelabui.rc");
@ -108,43 +108,29 @@ void RemoteMDI::resizeEvent(TQResizeEvent *e) {
void RemoteMDI::processActions() { void RemoteMDI::processActions() {
// Add dynamic actions // Add dynamic actions
// RAJA FIXME
KActionCollection *const ac = actionCollection(); KActionCollection *const ac = actionCollection();
TQPtrList<KAction> dut_actions; KAction* action;
inst_fpgaviewer_menu = new KAction(i18n("Launch FPGA Viewer"), "remote", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, "libremotelab_fpgaviewer"); ServiceType st;
dut_actions.append(inst_fpgaviewer_menu); for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
unplugActionList("dutMenu_actionlist"); st = *it;
unplugActionList("dutToolBar_actionlist"); action = new KAction(i18n("Launch")+" "+st.name, st.clientLibrary, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
plugActionList("dutMenu_actionlist", dut_actions); m_instrumentActionList.append(action);
plugActionList("dutToolBar_actionlist", dut_actions); }
plugActionList("instrumentMenu_actionlist", m_instrumentActionList);
TQPtrList<KAction> instrument_actions; plugActionList("instrumentToolBar_actionlist", m_instrumentActionList);
inst_sa_menu = new KAction(i18n("Launch Spectrum Analyzer"), "remote", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, "libremotelab_commanalyzer");
instrument_actions.append(inst_sa_menu);
unplugActionList("instrumentMenu_actionlist");
unplugActionList("instrumentToolBar_actionlist");
plugActionList("instrumentMenu_actionlist", instrument_actions);
plugActionList("instrumentToolBar_actionlist", instrument_actions);
TQPtrList<KAction> service_actions;
// Nothing here yet!
unplugActionList("serviceMenu_actionlist");
unplugActionList("serviceToolBar_actionlist");
plugActionList("serviceMenu_actionlist", service_actions);
plugActionList("serviceToolBar_actionlist", service_actions);
} }
void RemoteMDI::startModule() { void RemoteMDI::startModule() {
const KAction* sendingAction = dynamic_cast<const KAction*>(sender()); const KAction* sendingAction = dynamic_cast<const KAction*>(sender());
if (sendingAction) { if (sendingAction) {
// RAJA FIXME
bool serviceFound = false; bool serviceFound = false;
ServiceType st; ServiceType st;
for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) { for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
st = *it; st = *it;
if (st.clientLibrary == sendingAction->name()) { if (st.clientLibrary == sendingAction->name()) {
serviceFound = true; serviceFound = true;
break;
} }
} }
@ -153,7 +139,7 @@ void RemoteMDI::startModule() {
return; return;
} }
RemoteLab::InstrumentView* view = new RemoteLab::InstrumentView(sendingAction->name(), st.name, (mdiMode() == KMdi::ToplevelMode) ? 0 : this); RemoteLab::InstrumentView* view = new RemoteLab::InstrumentView(st.clientLibrary, st.name, (mdiMode() == KMdi::ToplevelMode) ? 0 : this);
connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&))); connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&)));
openNewWindow(view); openNewWindow(view);
if (m_serverHost != "") { if (m_serverHost != "") {
@ -301,6 +287,7 @@ printf("[RAJA DEBUG 100.0] '%s'\n\r", result.ascii()); fflush(stdout);
if (result == "OK") { if (result == "OK") {
// Success! // Success!
m_activeStation = select.m_selectedStation; m_activeStation = select.m_selectedStation;
processActions();
} }
else if (result == "ERRUNAVAL") { else if (result == "ERRUNAVAL") {
KMessageBox::error(this, i18n("<qt>No stations of the specified type are currently available<p>Please try again later</qt>"), i18n("Insufficient Laboratory Resources")); KMessageBox::error(this, i18n("<qt>No stations of the specified type are currently available<p>Please try again later</qt>"), i18n("Insufficient Laboratory Resources"));
@ -361,8 +348,9 @@ printf("[RAJA DEBUG 600.0] connected: %d\n\r", connected); fflush(stdout);
connect_action->setEnabled(!connected); connect_action->setEnabled(!connected);
disconnect_action->setEnabled(connected); disconnect_action->setEnabled(connected);
inst_fpgaviewer_menu->setEnabled(connected); for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
inst_sa_menu->setEnabled(connected); (*it)->setEnabled(connected);
}
} }
void RemoteMDI::configToolbars() { void RemoteMDI::configToolbars() {
@ -419,14 +407,10 @@ void RemoteMDI::childWindowCloseRequest(KMdiChildView *pWnd) {
void RemoteMDI::currentChanged(KMdiChildView *current) { void RemoteMDI::currentChanged(KMdiChildView *current) {
RemoteLab::InstrumentView* view = dynamic_cast<RemoteLab::InstrumentView*>(current); RemoteLab::InstrumentView* view = dynamic_cast<RemoteLab::InstrumentView*>(current);
// Plug/unpug menus // Plug/unplug menus
if (m_instrumentActionListPlugged) {
unplugActionList("selectedInstrument_actionlist");
m_instrumentActionListPlugged = false;
}
if (view) { if (view) {
unplugActionList("selectedInstrument_actionlist");
plugActionList("selectedInstrument_actionlist", view->menuActionList()); plugActionList("selectedInstrument_actionlist", view->menuActionList());
m_instrumentActionListPlugged = true;
} }
// Update status bar and list box // Update status bar and list box
@ -464,6 +448,9 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
w->activate(); w->activate();
assert(w == m_pCurrentWindow); assert(w == m_pCurrentWindow);
// Unplug menus
unplugActionList("selectedInstrument_actionlist");
// Notify the status bar of the removal of the window // Notify the status bar of the removal of the window
updateStatusBarWindowMessage(TQString::null); updateStatusBarWindowMessage(TQString::null);
updateStatusBarMainMessage(i18n("Instrument %1 removed").arg(w->tabCaption())); updateStatusBarMainMessage(i18n("Instrument %1 removed").arg(w->tabCaption()));

4
clients/tde/src/app/remotemdi.h
Unescape Escape View File

@ -77,7 +77,6 @@ class RemoteMDI : public KMdiMainFrm
private: private:
TQString m_mainStatusBarMessage; TQString m_mainStatusBarMessage;
TQString m_windowStatusBarMessage; TQString m_windowStatusBarMessage;
bool m_instrumentActionListPlugged;
unsigned m_children; unsigned m_children;
TQString m_serverHost; TQString m_serverHost;
@ -90,8 +89,7 @@ class RemoteMDI : public KMdiMainFrm
KAction *connect_action; KAction *connect_action;
KAction *disconnect_action; KAction *disconnect_action;
KAction *inst_sa_menu; TQPtrList<KAction> m_instrumentActionList;
KAction *inst_fpgaviewer_menu;
StationType m_activeStation; StationType m_activeStation;
}; };

7
clients/tde/src/app/views/instrumentview.cpp
Unescape Escape View File

@ -48,6 +48,13 @@ void InstrumentView::init() {
} }
} }
void InstrumentView::resizeEvent(TQResizeEvent *) {
TQWidget *childPartWidget = m_instrumentPart->widget();
if (childPartWidget) {
setFixedSize(childPartWidget->sizeHint());
}
}
TQPtrList<KAction> InstrumentView::menuActionList() { TQPtrList<KAction> InstrumentView::menuActionList() {
return m_instrumentPart->menuActionList(); return m_instrumentPart->menuActionList();
} }

1
clients/tde/src/app/views/instrumentview.h
Unescape Escape View File

@ -33,6 +33,7 @@ class InstrumentView : public KMdiChildView
virtual void saveProperties(KConfig *); virtual void saveProperties(KConfig *);
virtual void readProperties(KConfig *); virtual void readProperties(KConfig *);
virtual bool queryExit(); virtual bool queryExit();
virtual void resizeEvent(TQResizeEvent *);
private slots: private slots:
void setStatusMessage(const TQString& message); void setStatusMessage(const TQString& message);

216
clients/tde/src/part/fpgaview/layout.ui
Unescape Escape View File

@ -218,6 +218,222 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="TQGroupBox" row="0" column="1" rowspan="3">
<property name="name">
<cstring>group4BitInput</cstring>
</property>
<property name="title">
<string>Buttons:</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQLayoutWidget" row="0" column="1" colspan="2">
<property name="name">
<cstring>unnamed</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer row="0" column="0">
<property name="name">
<cstring>unnamed_spacer</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="FPGAPushButton" row="0" column="1">
<property name="name">
<cstring>group4BitInputLED0</cstring>
</property>
</widget>
<spacer row="0" column="2">
<property name="name">
<cstring>unnamed_spacer</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</grid>
</widget>
<widget class="FPGAPushButton" row="1" column="0" rowspan="2">
<property name="name">
<cstring>group4BitInputLED3</cstring>
</property>
</widget>
<widget class="FPGAPushButton" row="1" column="3" rowspan="2">
<property name="name">
<cstring>group4BitInputLED1</cstring>
</property>
</widget>
<widget class="TQLayoutWidget" row="3" column="1" colspan="2">
<property name="name">
<cstring>unnamed</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer row="0" column="0">
<property name="name">
<cstring>unnamed_spacer</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="FPGAPushButton" row="0" column="1">
<property name="name">
<cstring>group4BitInputLED2</cstring>
</property>
</widget>
<spacer row="0" column="2">
<property name="name">
<cstring>unnamed_spacer</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</grid>
</widget>
<widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>group4BitInputValueLabel</cstring>
</property>
<property name="text">
<cstring>In:</cstring>
</property>
<property name="alignment">
<set>AlignBottom|AlignLeft</set>
</property>
</widget>
<widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>group4BitOutputValueLabel</cstring>
</property>
<property name="text">
<cstring>Out:</cstring>
</property>
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
</widget>
<widget class="TQLabel" row="1" column="2">
<property name="name">
<cstring>group4BitInputValueText</cstring>
</property>
<property name="alignment">
<set>AlignBottom|AlignRight</set>
</property>
</widget>
<widget class="TQLabel" row="2" column="2">
<property name="name">
<cstring>group4BitOutputValueText</cstring>
</property>
<property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
</widget>
</grid>
</widget>
<widget class="TQLayoutWidget" row="0" column="2" rowspan="3">
<property name="name">
<cstring>unnamed</cstring>
</property>
<grid>
<widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupLCDDisplay</cstring>
</property>
<property name="title">
<string>LCD Display:</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>LCDOutputLabel</cstring>
</property>
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
<family>monospace</family>
</font>
</property>
<property name="text">
<cstring> \n </cstring>
</property>
</widget>
</grid>
</widget>
<spacer row="2" column="0">
<property name="name">
<cstring>unnamed_spacer</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</grid>
</widget>
</grid> </grid>
</widget> </widget>
</grid> </grid>

112
clients/tde/src/part/fpgaview/part.cpp
Unescape Escape View File

@ -30,6 +30,7 @@
#include <kparts/genericfactory.h> #include <kparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <knuminput.h>
#include <tqfile.h> //encodeName() #include <tqfile.h> //encodeName()
#include <tqtimer.h> //postInit() hack #include <tqtimer.h> //postInit() hack
#include <tqvbox.h> #include <tqvbox.h>
@ -72,17 +73,62 @@ void FPGALed::mouseReleaseEvent(TQMouseEvent *e) {
} }
} }
FPGAPushButton::FPGAPushButton(TQWidget *parent, const char *name)
: KLed(parent, name), mouseDown(false)
{
off();
setColor(green);
setOffColor(TQApplication::palette(this).active().base().dark(200));
}
void FPGAPushButton::mousePressEvent(TQMouseEvent *e) {
if (e->button() == TQMouseEvent::LeftButton) {
on();
mouseDown = true;
emit(buttonPressed());
emit(changed());
}
}
void FPGAPushButton::mouseReleaseEvent(TQMouseEvent *e) {
if (e->button() == TQMouseEvent::LeftButton) {
off();
mouseDown = false;
emit(buttonReleased());
emit(changed());
}
}
void FPGAPushButton::enterEvent(TQEvent *e) {
Q_UNUSED(e);
if (mouseDown) {
on();
emit(buttonPressed());
emit(changed());
}
}
void FPGAPushButton::leaveEvent(TQEvent *e) {
Q_UNUSED(e);
if (mouseDown) {
off();
emit(buttonReleased());
emit(changed());
}
}
namespace RemoteLab { namespace RemoteLab {
typedef KParts::GenericFactory<RemoteLab::FPGAViewPart> Factory; typedef KParts::GenericFactory<RemoteLab::FPGAViewPart> Factory;
#define CLIENT_LIBRARY "libremotelab_fpgaviewer" #define CLIENT_LIBRARY "libremotelab_fpgaviewer"
K_EXPORT_COMPONENT_FACTORY(libremotelab_fpgaviewer, RemoteLab::Factory) K_EXPORT_COMPONENT_FACTORY(libremotelab_fpgaviewer, RemoteLab::Factory)
#define LED_SIZE 20,20 #define LED_BASE_SIZE 20
#define LED_SIZE LED_BASE_SIZE,LED_BASE_SIZE
FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList&) FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList&)
: RemoteInstrumentPart( parent, name ), m_socket(0), m_base(0), connToServerConnecting(false), connToServerState(-1), connToServerTimeoutTimer(NULL), m_interfaceMode(BasicInterfaceMode), : RemoteInstrumentPart( parent, name ), m_socket(0), m_base(0), connToServerConnecting(false), connToServerState(-1), connToServerTimeoutTimer(NULL), m_interfaceMode(BasicInterfaceMode),
remoteInputModeEnabled(false), m_8bitInputValue(0), m_8bitOutputValue(0) remoteInputModeEnabled(false), m_4bitInputValue(0), m_4bitOutputValue(0), m_8bitInputValue(0), m_8bitOutputValue(0), m_16bitInputValue(0), m_16bitOutputValue(0)
{ {
// Initialize mutex // Initialize mutex
m_connectionMutex = new TQMutex(false); m_connectionMutex = new TQMutex(false);
@ -111,6 +157,15 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
m_modeSubMenu->insert(m_modeAdvancedEnabled); m_modeSubMenu->insert(m_modeAdvancedEnabled);
// Initialize widgets // Initialize widgets
m_base->group4BitInputValueLabel->setFixedSize(LED_BASE_SIZE*2, LED_BASE_SIZE*2);
m_base->group4BitOutputValueLabel->setFixedSize(LED_BASE_SIZE*2, LED_BASE_SIZE*2);
m_base->group4BitInputValueText->setFixedSize(LED_BASE_SIZE*2, LED_BASE_SIZE*2);
m_base->group4BitOutputValueText->setFixedSize(LED_BASE_SIZE*2, LED_BASE_SIZE*2);
m_base->group4BitInputLED3->setFixedSize(LED_SIZE);
m_base->group4BitInputLED2->setFixedSize(LED_SIZE);
m_base->group4BitInputLED1->setFixedSize(LED_SIZE);
m_base->group4BitInputLED0->setFixedSize(LED_SIZE);
m_base->group8BitInputLED7->setFixedSize(LED_SIZE); m_base->group8BitInputLED7->setFixedSize(LED_SIZE);
m_base->group8BitInputLED6->setFixedSize(LED_SIZE); m_base->group8BitInputLED6->setFixedSize(LED_SIZE);
m_base->group8BitInputLED5->setFixedSize(LED_SIZE); m_base->group8BitInputLED5->setFixedSize(LED_SIZE);
@ -128,6 +183,10 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
m_base->group8BitOutputLED1->setFixedSize(LED_SIZE); m_base->group8BitOutputLED1->setFixedSize(LED_SIZE);
m_base->group8BitOutputLED0->setFixedSize(LED_SIZE); m_base->group8BitOutputLED0->setFixedSize(LED_SIZE);
m_base->group4BitInputLED3->setState(KLed::Off);
m_base->group4BitInputLED2->setState(KLed::Off);
m_base->group4BitInputLED1->setState(KLed::Off);
m_base->group4BitInputLED0->setState(KLed::Off);
m_base->group8BitInputLED7->setState(KLed::Off); m_base->group8BitInputLED7->setState(KLed::Off);
m_base->group8BitInputLED6->setState(KLed::Off); m_base->group8BitInputLED6->setState(KLed::Off);
m_base->group8BitInputLED5->setState(KLed::Off); m_base->group8BitInputLED5->setState(KLed::Off);
@ -154,6 +213,11 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
m_base->group8BitOutputLED1->setClickable(false); m_base->group8BitOutputLED1->setClickable(false);
m_base->group8BitOutputLED0->setClickable(false); m_base->group8BitOutputLED0->setClickable(false);
connect(m_base->group4BitInputLED3, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
connect(m_base->group4BitInputLED2, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
connect(m_base->group4BitInputLED1, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
connect(m_base->group4BitInputLED0, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
connect(m_base->group8BitInputLED7, SIGNAL(clicked()), this, SLOT(process8BitInputChanges())); connect(m_base->group8BitInputLED7, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
connect(m_base->group8BitInputLED6, SIGNAL(clicked()), this, SLOT(process8BitInputChanges())); connect(m_base->group8BitInputLED6, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
connect(m_base->group8BitInputLED5, SIGNAL(clicked()), this, SLOT(process8BitInputChanges())); connect(m_base->group8BitInputLED5, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
@ -163,6 +227,8 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
connect(m_base->group8BitInputLED1, SIGNAL(clicked()), this, SLOT(process8BitInputChanges())); connect(m_base->group8BitInputLED1, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
connect(m_base->group8BitInputLED0, SIGNAL(clicked()), this, SLOT(process8BitInputChanges())); connect(m_base->group8BitInputLED0, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
connect(m_base->group16BitInputValue, SIGNAL(valueChanged(int)), this, SLOT(process16BitInputChanges()));
processAllGraphicsUpdates(); processAllGraphicsUpdates();
TQTimer::singleShot(0, this, TQT_SLOT(postInit())); TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
@ -181,12 +247,34 @@ void FPGAViewPart::processAllGraphicsUpdates() {
// This is an expensive operation // This is an expensive operation
// Use it sparingly! // Use it sparingly!
process4BitInputChanges();
process4BitOutputChanges();
process8BitInputChanges(); process8BitInputChanges();
process8BitOutputChanges(); process8BitOutputChanges();
process16BitInputChanges();
process16BitOutputChanges();
processLCDOutputChanges();
processLockouts(); processLockouts();
} }
void FPGAViewPart::process4BitInputChanges() {
// Read LED status into m_4bitInputValue
m_4bitInputValue = 0;
if (m_base->group4BitInputLED3->state() == KLed::On) m_4bitInputValue |= 0x08;
if (m_base->group4BitInputLED2->state() == KLed::On) m_4bitInputValue |= 0x04;
if (m_base->group4BitInputLED1->state() == KLed::On) m_4bitInputValue |= 0x02;
if (m_base->group4BitInputLED0->state() == KLed::On) m_4bitInputValue |= 0x01;
m_base->group4BitInputValueText->setText(TQString("0x%1").arg(m_4bitInputValue, 0, 16));
}
void FPGAViewPart::process4BitOutputChanges() {
// Write m_4bitOutputValue to label
m_base->group4BitOutputValueText->setText(TQString("0x%1").arg(m_16bitOutputValue, 0, 16));
}
void FPGAViewPart::process8BitInputChanges() { void FPGAViewPart::process8BitInputChanges() {
// Read LED status into m_8bitInputValue // Read LED status into m_8bitInputValue
m_8bitInputValue = 0; m_8bitInputValue = 0;
@ -223,6 +311,25 @@ void FPGAViewPart::process8BitOutputChanges() {
m_base->group8BitOutputValueText->setText(TQString("0x%1").arg(m_8bitOutputValue, 0, 16)); m_base->group8BitOutputValueText->setText(TQString("0x%1").arg(m_8bitOutputValue, 0, 16));
} }
void FPGAViewPart::process16BitInputChanges() {
// Read input into m_16bitInputValue
m_16bitInputValue = m_base->group16BitInputValue->value();
}
void FPGAViewPart::process16BitOutputChanges() {
// Write m_16bitOutputValue to label
m_base->group16BitOutputValue->setText(TQString("0x%1").arg(m_16bitOutputValue, 0, 16));
}
void FPGAViewPart::processLCDOutputChanges() {
// Write m_LCDOutputValue to label
TQString topLine = m_LCDOutputValue;
TQString bottomLine = m_LCDOutputValue;
topLine.truncate(16);
bottomLine.remove(0,8);
m_base->LCDOutputLabel->setText(topLine + "\n" + bottomLine);
}
void FPGAViewPart::processLockouts() { void FPGAViewPart::processLockouts() {
TQWidget* mainWidget = widget(); TQWidget* mainWidget = widget();
if (mainWidget) { if (mainWidget) {
@ -438,6 +545,7 @@ TQPtrList<KAction> FPGAViewPart::menuActionList() {
void FPGAViewPart::updateDisplay() { void FPGAViewPart::updateDisplay() {
// RAJA FIXME // RAJA FIXME
// setStatusMessage(i18n("Debug interface timeout, still waiting for data. Please verify that the FPGA is properly configured.")); // or setStatusMessage(i18n("Running")+"... \|/-"
} }
KAboutData* FPGAViewPart::createAboutData() { KAboutData* FPGAViewPart::createAboutData() {

34
clients/tde/src/part/fpgaview/part.h
Unescape Escape View File

@ -25,6 +25,8 @@
#include <tdekrbclientsocket.h> #include <tdekrbclientsocket.h>
#include <tqcstring.h>
#include <kparts/browserextension.h> #include <kparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <kparts/statusbarextension.h>
#include <kparts/part.h> #include <kparts/part.h>
@ -59,6 +61,28 @@ class FPGALed : public KLed
bool m_clickable; bool m_clickable;
}; };
class FPGAPushButton : public KLed
{
Q_OBJECT
public:
FPGAPushButton(TQWidget *parent=0, const char *name=0);
protected:
virtual void enterEvent(TQEvent *);
virtual void leaveEvent(TQEvent *);
virtual void mousePressEvent(TQMouseEvent *);
virtual void mouseReleaseEvent(TQMouseEvent *);
signals:
void buttonPressed();
void buttonReleased();
void changed();
private:
bool mouseDown;
};
namespace RemoteLab namespace RemoteLab
{ {
class FPGAViewPart : public KParts::RemoteInstrumentPart class FPGAViewPart : public KParts::RemoteInstrumentPart
@ -97,8 +121,13 @@ namespace RemoteLab
void switchToAdvancedMode(); void switchToAdvancedMode();
void processAllGraphicsUpdates(); void processAllGraphicsUpdates();
void process4BitInputChanges();
void process4BitOutputChanges();
void process8BitInputChanges(); void process8BitInputChanges();
void process8BitOutputChanges(); void process8BitOutputChanges();
void process16BitInputChanges();
void process16BitOutputChanges();
void processLCDOutputChanges();
private: private:
TDEKerberosClientSocket* m_socket; TDEKerberosClientSocket* m_socket;
@ -119,8 +148,13 @@ namespace RemoteLab
InterfaceMode m_interfaceMode; InterfaceMode m_interfaceMode;
bool remoteInputModeEnabled; bool remoteInputModeEnabled;
unsigned char m_4bitInputValue;
unsigned char m_4bitOutputValue;
unsigned char m_8bitInputValue; unsigned char m_8bitInputValue;
unsigned char m_8bitOutputValue; unsigned char m_8bitOutputValue;
unsigned int m_16bitInputValue;
unsigned int m_16bitOutputValue;
TQCString m_LCDOutputValue;
}; };
} }

7
lib/libtqtrla/src/tqtrla.cpp
Unescape Escape View File

@ -60,6 +60,13 @@ namespace KParts
return TQPtrList<KAction>(); return TQPtrList<KAction>();
} }
void RemoteInstrumentPart::resize(TQSize size) {
TQWidget* parentWidget = dynamic_cast<TQWidget*>(parent());
if (parentWidget) {
parentWidget->resize(size);
}
}
void RemoteInstrumentPart::close() { void RemoteInstrumentPart::close() {
TQWidget* parentWidget = dynamic_cast<TQWidget*>(parent()); TQWidget* parentWidget = dynamic_cast<TQWidget*>(parent());
if (parentWidget) { if (parentWidget) {

1
lib/libtqtrla/src/tqtrla.h
Unescape Escape View File

@ -52,6 +52,7 @@ namespace KParts
protected slots: protected slots:
void close(); void close();
void resize(TQSize size);
void setStatusMessage(const TQString& message); void setStatusMessage(const TQString& message);
signals: signals:

Write Preview
Loading…
Cancel
Save