diff options
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/tde/src/part/fpgaview/layout.ui | 24 | ||||
| -rw-r--r-- | clients/tde/src/part/fpgaview/part.cpp | 33 | ||||
| -rw-r--r-- | clients/tde/src/part/fpgaview/part.h | 1 |
3 files changed, 46 insertions, 12 deletions
diff --git a/clients/tde/src/part/fpgaview/layout.ui b/clients/tde/src/part/fpgaview/layout.ui index 32cfc90..b2b62a4 100644 --- a/clients/tde/src/part/fpgaview/layout.ui +++ b/clients/tde/src/part/fpgaview/layout.ui @@ -257,8 +257,8 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>0</width> + <height>0</height> </size> </property> </spacer> @@ -279,8 +279,8 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>0</width> + <height>0</height> </size> </property> </spacer> @@ -316,8 +316,8 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>0</width> + <height>0</height> </size> </property> </spacer> @@ -338,8 +338,8 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>0</width> + <height>0</height> </size> </property> </spacer> @@ -529,8 +529,8 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>0</width> + <height>0</height> </size> </property> </spacer> @@ -767,8 +767,8 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>0</width> + <height>0</height> </size> </property> </spacer> diff --git a/clients/tde/src/part/fpgaview/part.cpp b/clients/tde/src/part/fpgaview/part.cpp index 1103f1b..87ac05a 100644 --- a/clients/tde/src/part/fpgaview/part.cpp +++ b/clients/tde/src/part/fpgaview/part.cpp @@ -854,20 +854,42 @@ void FPGAViewPart::processLockouts() { } } + // Interface mode switching handlers if (m_interfaceMode == BasicInterfaceMode) { m_modeBasicEnabled->setChecked(true); m_modeIntermediateEnabled->setChecked(false); m_modeAdvancedEnabled->setChecked(false); + + m_base->groupLCDDisplay->show(); + m_base->groupLEDDisplay->hide(); + m_base->groupBatchTest->hide(); + m_base->groupDataProcessing->hide(); + m_base->groupInputImage->hide(); + m_base->groupOutputImage->hide(); } if (m_interfaceMode == IntermediateInterfaceMode) { m_modeBasicEnabled->setChecked(false); m_modeIntermediateEnabled->setChecked(true); m_modeAdvancedEnabled->setChecked(false); + + m_base->groupLCDDisplay->show(); + m_base->groupLEDDisplay->show(); + m_base->groupBatchTest->show(); + m_base->groupDataProcessing->hide(); + m_base->groupInputImage->hide(); + m_base->groupOutputImage->hide(); } if (m_interfaceMode == AdvancedInterfaceMode) { m_modeBasicEnabled->setChecked(false); m_modeIntermediateEnabled->setChecked(false); m_modeAdvancedEnabled->setChecked(true); + + m_base->groupLCDDisplay->show(); + m_base->groupLEDDisplay->show(); + m_base->groupBatchTest->show(); + m_base->groupDataProcessing->show(); + m_base->groupInputImage->show(); + m_base->groupOutputImage->show(); } if ((m_base->batchTestInputFile->url() != "") && (m_base->batchTestOutputFile->url() != "") && (m_commHandlerMode == 0) && (m_connectionActiveAndValid == true)) { @@ -918,19 +940,26 @@ void FPGAViewPart::processLockouts() { } } +void FPGAViewPart::resizeToHint() { + resize(widget()->sizeHint()); +} + void FPGAViewPart::switchToBasicMode() { m_interfaceMode = BasicInterfaceMode; processLockouts(); + TQTimer::singleShot(0, this, SLOT(resizeToHint())); } void FPGAViewPart::switchToIntermediateMode() { m_interfaceMode = IntermediateInterfaceMode; processLockouts(); + TQTimer::singleShot(0, this, SLOT(resizeToHint())); } void FPGAViewPart::switchToAdvancedMode() { m_interfaceMode = AdvancedInterfaceMode; processLockouts(); + TQTimer::singleShot(0, this, SLOT(resizeToHint())); } void FPGAViewPart::connectionClosed() { @@ -1039,8 +1068,12 @@ printf("[RAJA DEBUG 400.0] Got '%s' from the server\n\r", response.ascii()); ffl connToServerConnecting = false; connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData())); connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(updateDisplay())); + m_tickerState = 0; + m_commHandlerState = 0; + m_commHandlerMode = 0; m_updateTimer->start(FPGA_COMM_TIMEOUT_MS, FALSE); processLockouts(); + updateDisplay(); return; } else if (response == "ERRNOCONN") { diff --git a/clients/tde/src/part/fpgaview/part.h b/clients/tde/src/part/fpgaview/part.h index 8ed087f..b443aba 100644 --- a/clients/tde/src/part/fpgaview/part.h +++ b/clients/tde/src/part/fpgaview/part.h @@ -156,6 +156,7 @@ namespace RemoteLab private slots: void postInit(); + void resizeToHint(); void updateDisplay(); void processLockouts(); void connectionClosed(); |