summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--clients/tde/src/app/views/instrumentview.cpp1
-rw-r--r--clients/tde/src/part/scope/part.cpp46
-rw-r--r--clients/tde/src/widgets/tracewidget.cpp6
-rw-r--r--lib/libtdekrb/src/tdekrbclientsocket.cpp2
-rw-r--r--lib/libtdekrb/src/tdekrbserversocket.cpp2
-rw-r--r--lib/libtqtrla/src/tqtrla.cpp36
-rw-r--r--lib/libtqtrla/src/tqtrla.h1
-rw-r--r--servers/gpib_server_lin/src/scope_functions.cpp18
8 files changed, 87 insertions, 25 deletions
diff --git a/clients/tde/src/app/views/instrumentview.cpp b/clients/tde/src/app/views/instrumentview.cpp
index 4cad117..429f670 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -48,6 +48,7 @@ void InstrumentView::init() {
m_instrumentPart = (InstrumentPart *)factory->create(TQT_TQOBJECT(this), "part", "KParts::RemoteInstrumentPart");
connect(m_instrumentPart, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(setStatusMessage(const TQString&)));
connect(m_instrumentPart, SIGNAL(usingFixedSizeChanged(bool)), this, SLOT(setUsingFixedSize(bool)));
+ connect(m_instrumentPart, SIGNAL(resizeToHintRequested()), this, SLOT(setChildSizeToHint()));
}
}
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index 387c901..d12fd32 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -127,7 +127,12 @@ bool ScopePart::closeURL() {
void ScopePart::processLockouts() {
if (m_connectionActiveAndValid) {
- m_base->setEnabled(true);
+ if ((m_commHandlerMode < 2) && (m_commHandlerState < 50)) {
+ m_base->setEnabled(false);
+ }
+ else {
+ m_base->setEnabled(true);
+ }
}
else {
m_base->setEnabled(false);
@@ -211,8 +216,10 @@ void ScopePart::setTickerMessage(TQString message) {
} \
else { \
m_commHandlerState = 255; \
- } \
- printf("[RAJA DEBUG 640.0] Entering state %d\n\r", m_commHandlerState); fflush(stdout);
+ } \
+ if (m_commHandlerState < 50) { \
+ setTickerMessage(i18n("Loading")); \
+ }
#define EXEC_NEXT_STATE_IMMEDIATELY m_forcedUpdateTimer->start(0, TRUE);
@@ -573,6 +580,9 @@ void ScopePart::mainEventLoop() {
if (result == "ACK") {
// Update display widget(s)
updateGraticule();
+ // HACK
+ // Force resize of parent frame
+ emit(usingFixedSizeChanged(false));
}
if (result == "ACK") {
@@ -624,8 +634,8 @@ void ScopePart::mainEventLoop() {
if (result == "ACK") {
// Update display widget(s)
m_traceWidget->setSamples(m_currentOpChannel-1, trace);
- m_base->traceZoomWidget->setSamples(m_currentOpChannel-1, trace);
m_traceWidget->setPositions(m_currentOpChannel-1, positions);
+ m_base->traceZoomWidget->setSamples(m_currentOpChannel-1, trace);
m_base->traceZoomWidget->setPositions(m_currentOpChannel-1, positions);
postProcessTrace();
m_traceWidget->repaint(true);
@@ -718,13 +728,15 @@ void ScopePart::postProcessTrace() {
}
void ScopePart::updateZoomWidgetLimits(const TQRectF& zoomRect) {
- TQRectF fullZoomRect = m_traceWidget->displayLimits(0);
- double widthSpan = fullZoomRect.width()-fullZoomRect.x();
- double heightSpan = fullZoomRect.height()-fullZoomRect.y();
+ for (int traceno=1; traceno<=m_maxNumberOfTraces; traceno++) {
+ TQRectF fullZoomRect = m_traceWidget->displayLimits(traceno);
+ double widthSpan = fullZoomRect.width()-fullZoomRect.x();
+ double heightSpan = fullZoomRect.height()-fullZoomRect.y();
- TQRectF zoomLimitsRect((fullZoomRect.x()+(widthSpan*(zoomRect.x()/100.0))), (fullZoomRect.y()+(heightSpan*(zoomRect.y()/100.0))), (fullZoomRect.x()+(widthSpan*((zoomRect.x()/100.0)+(zoomRect.width()/100.0)))), (fullZoomRect.y()+(heightSpan*((zoomRect.y()/100.0)+(zoomRect.height()/100.0)))));
+ TQRectF zoomLimitsRect((fullZoomRect.x()+(widthSpan*(zoomRect.x()/100.0))), (fullZoomRect.y()+(heightSpan*(zoomRect.y()/100.0))), (fullZoomRect.x()+(widthSpan*((zoomRect.x()/100.0)+(zoomRect.width()/100.0)))), (fullZoomRect.y()+(heightSpan*((zoomRect.y()/100.0)+(zoomRect.height()/100.0)))));
- m_base->traceZoomWidget->setDisplayLimits(0, zoomLimitsRect);
+ m_base->traceZoomWidget->setDisplayLimits(traceno, zoomLimitsRect);
+ }
}
void ScopePart::updateGraticule() {
@@ -734,9 +746,14 @@ void ScopePart::updateGraticule() {
m_base->traceZoomWidget->setNumberOfVerticalDivisions(m_vdivs);
m_traceWidget->setTraceColor(0, TQColor(255, 255, 255));
- m_traceWidget->setTraceColor(1, TQColor(0, 255, 0));
- m_traceWidget->setTraceColor(2, TQColor(255, 255, 0));
- m_traceWidget->setTraceColor(3, TQColor(64, 64, 255));
+ m_traceWidget->setTraceColor(1, TQColor(128, 255, 128));
+ m_traceWidget->setTraceColor(2, TQColor(255, 255, 128));
+ m_traceWidget->setTraceColor(3, TQColor(128, 128, 255));
+
+ m_base->traceZoomWidget->setTraceColor(0, TQColor(255, 255, 255));
+ m_base->traceZoomWidget->setTraceColor(1, TQColor(128, 255, 128));
+ m_base->traceZoomWidget->setTraceColor(2, TQColor(255, 255, 128));
+ m_base->traceZoomWidget->setTraceColor(3, TQColor(128, 128, 255));
for (int traceno=1; traceno<=m_maxNumberOfTraces; traceno++) {
m_traceWidget->setTraceEnabled(traceno-1, m_channelActive[traceno]);
@@ -744,6 +761,11 @@ void ScopePart::updateGraticule() {
m_traceWidget->setTraceHorizontalUnits(traceno-1, "s");
m_traceWidget->setTraceVerticalUnits(traceno-1, "V");
+ m_base->traceZoomWidget->setTraceEnabled(traceno-1, m_channelActive[traceno], false);
+ m_base->traceZoomWidget->setTraceName(traceno-1, TQString("Channel %1").arg(traceno));
+ m_base->traceZoomWidget->setTraceHorizontalUnits(traceno-1, "s");
+ m_base->traceZoomWidget->setTraceVerticalUnits(traceno-1, "V");
+
m_traceWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno]);
m_base->traceZoomWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno]);
diff --git a/clients/tde/src/widgets/tracewidget.cpp b/clients/tde/src/widgets/tracewidget.cpp
index b814e43..2d44afc 100644
--- a/clients/tde/src/widgets/tracewidget.cpp
+++ b/clients/tde/src/widgets/tracewidget.cpp
@@ -379,6 +379,7 @@ GraticuleWidget::GraticuleWidget(TraceWidget* parent, const char* name) : TQWidg
setPaletteBackgroundColor(TQt::black);
setPaletteForegroundColor(TQColor(0,128,0));
setMouseTracking(true);
+ setCursor(tqcrossCursor);
}
GraticuleWidget::~GraticuleWidget() {
@@ -530,7 +531,11 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) {
double vertical_range = (m_base->m_traceArray[trace]->bottomEdge-m_base->m_traceArray[trace]->topEdge);
double realCursorYPosition = (m_base->m_traceArray[trace]->topEdge+((scaledYPos/100.0)*vertical_range));
double realCursorXPosition = (m_base->m_traceArray[trace]->leftEdge+((scaledXPos/100.0)*horizontal_range));
+#if 0
m_base->m_traceArray[trace]->graphStatusLabel->setText(TQString("<qt><nobr>%1<br>@%2,%3</qt>").arg(m_base->m_traceArray[trace]->traceName).arg(TraceWidget::prettyFormat(realCursorXPosition, horizontal_range, m_base->m_traceArray[trace]->horizontalUnits)).arg(TraceWidget::prettyFormat(realCursorYPosition, vertical_range, m_base->m_traceArray[trace]->verticalUnits)));
+#else
+ m_base->m_traceArray[trace]->graphStatusLabel->setText(TQString("<qt><nobr>@%2,%3</qt>").arg(TraceWidget::prettyFormat(realCursorXPosition, horizontal_range, m_base->m_traceArray[trace]->horizontalUnits)).arg(TraceWidget::prettyFormat(realCursorYPosition, vertical_range, m_base->m_traceArray[trace]->verticalUnits)));
+#endif
m_base->m_traceArray[trace]->graphStatusLabelInner->setText(m_base->m_traceArray[trace]->graphStatusLabel->text());
}
}
@@ -598,6 +603,7 @@ TraceWidget::TraceWidget(TQWidget* parent, const char* name) : TQWidget(parent,
m_traceLabelLayout->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum), 0, 255);
m_rightPaneLayout->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 255, 0);
m_primaryLayout->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum), 1, 128);
+ m_statusLabelLayout->setSpacing(0);
setPaletteBackgroundColor(TQt::black);
setPaletteForegroundColor(TQColor(0,128,0));
diff --git a/lib/libtdekrb/src/tdekrbclientsocket.cpp b/lib/libtdekrb/src/tdekrbclientsocket.cpp
index 64929cb..3705889 100644
--- a/lib/libtdekrb/src/tdekrbclientsocket.cpp
+++ b/lib/libtdekrb/src/tdekrbclientsocket.cpp
@@ -283,7 +283,7 @@ TQ_ULONG TDEKerberosClientSocket::bytesAvailable() const {
int TDEKerberosClientSocket::processPendingData() {
if (kerberosStatus() == KerberosInUse) {
- while (TQSocket::canReadLine()) {
+ while (TQSocket::canReadLine() && (TQSocket::state() == TQSocket::Connected)) {
int reclen;
int wrlen;
char* buf = (char*)malloc(m_negotiatedMaxBufferSize);
diff --git a/lib/libtdekrb/src/tdekrbserversocket.cpp b/lib/libtdekrb/src/tdekrbserversocket.cpp
index 26e49f7..b2e735c 100644
--- a/lib/libtdekrb/src/tdekrbserversocket.cpp
+++ b/lib/libtdekrb/src/tdekrbserversocket.cpp
@@ -284,7 +284,7 @@ TQ_ULONG TDEKerberosServerSocket::bytesAvailable() const {
int TDEKerberosServerSocket::processPendingData() {
if (kerberosStatus() == KerberosInUse) {
- while (TQSocket::canReadLine()) {
+ while (TQSocket::canReadLine() && (TQSocket::state() == TQSocket::Connected)) {
int reclen;
int wrlen;
char* buf = (char*)malloc(m_negotiatedMaxBufferSize);
diff --git a/lib/libtqtrla/src/tqtrla.cpp b/lib/libtqtrla/src/tqtrla.cpp
index cf26012..3fdea05 100644
--- a/lib/libtqtrla/src/tqtrla.cpp
+++ b/lib/libtqtrla/src/tqtrla.cpp
@@ -191,6 +191,8 @@ namespace KParts
connToServerConnecting = false;
disconnectFromServer();
KMessageBox::error(0, i18n("<qt>Unable to establish connection to remote server</qt>"), i18n("Connection Failed"));
+ close();
+ return;
}
}
else {
@@ -199,12 +201,16 @@ namespace KParts
m_socket->setDataTimeout(SERVER_TIMEOUT_MS);
m_socket->setUsingKerberos(true);
connToServerState = 1;
+ connToServerTimeoutTimer->stop();
+ connToServerTimeoutTimer->start(SERVER_TIMEOUT_MS, TRUE);
}
else {
connToServerState = -1;
connToServerConnecting = false;
disconnectFromServer();
KMessageBox::error(0, i18n("<qt>Unable to establish connection to remote server</qt>"), i18n("Connection Failed"));
+ close();
+ return;
}
}
break;
@@ -218,16 +224,19 @@ namespace KParts
connToServerConnecting = false;
disconnectFromServer();
KMessageBox::error(0, i18n("<qt>Unable to establish Kerberos protocol with remote server<p>Please verify that you currently hold a valid Kerberos ticket</qt>"), i18n("Connection Failed"));
+ close();
+ return;
}
else {
connToServerState = 2;
+ connToServerTimeoutTimer->stop();
+ connToServerTimeoutTimer->start(SERVER_TIMEOUT_MS, TRUE);
}
}
break;
case 2:
// Connection established!
// Read magic number and proto version from server
- m_socket->processPendingData();
if (m_socket->canReadFrame()) {
TQDataStream ds(m_socket);
ds.setPrintableData(true);
@@ -244,12 +253,23 @@ namespace KParts
ds << m_clientLibraryName;
m_socket->writeEndOfFrame();
connToServerState = 3;
+ connToServerTimeoutTimer->stop();
+ connToServerTimeoutTimer->start(SERVER_TIMEOUT_MS, TRUE);
+ }
+ else {
+ if ((!connToServerTimeoutTimer->isActive()) || (m_socket->state() != TQSocket::Connected)) {
+ connToServerState = -1;
+ connToServerConnecting = false;
+ disconnectFromServer();
+ KMessageBox::error(0, i18n("<qt>Connection with remote server terminated<p>This may indicate that the requested service is not functional</qt>"), i18n("Connection Failed"));
+ close();
+ return;
+ }
}
break;
case 3:
// Read response from server
- m_socket->processPendingData();
- if (m_socket->bytesAvailable() > 0) {
+ if (m_socket->canReadFrame()) {
TQDataStream ds(m_socket);
ds.setPrintableData(true);
TQString response;
@@ -271,6 +291,16 @@ namespace KParts
return;
}
}
+ else {
+ if ((!connToServerTimeoutTimer->isActive()) || (m_socket->state() != TQSocket::Connected)) {
+ connToServerState = -1;
+ connToServerConnecting = false;
+ disconnectFromServer();
+ KMessageBox::error(0, i18n("<qt>Connection with remote server terminated<p>This may indicate that the requested service is not functional</qt>"), i18n("Connection Failed"));
+ close();
+ return;
+ }
+ }
break;
}
diff --git a/lib/libtqtrla/src/tqtrla.h b/lib/libtqtrla/src/tqtrla.h
index fcc1285..129eac9 100644
--- a/lib/libtqtrla/src/tqtrla.h
+++ b/lib/libtqtrla/src/tqtrla.h
@@ -76,6 +76,7 @@ namespace KParts
signals:
void statusMessageSet(const TQString&);
void usingFixedSizeChanged(bool);
+ void resizeToHintRequested();
protected:
KURL m_url;
diff --git a/servers/gpib_server_lin/src/scope_functions.cpp b/servers/gpib_server_lin/src/scope_functions.cpp
index b0571d6..deda671 100644
--- a/servers/gpib_server_lin/src/scope_functions.cpp
+++ b/servers/gpib_server_lin/src/scope_functions.cpp
@@ -662,7 +662,7 @@ printf("[PROFILE] %f s\n\r", ((tp3.tv_nsec+(tp3.tv_sec*1e9))-(tp2.tv_nsec+(tp2.t
clock_gettime(CLOCK_REALTIME, &tp4);
printf("[PROFILE] %f s\n\r", ((tp4.tv_nsec+(tp4.tv_sec*1e9))-(tp3.tv_nsec+(tp3.tv_sec*1e9)))/1e9);
#endif
- TQString preamble(segarray);
+ TQString preamble(segarray); // RAJA UNCOMMENT ME
TQStringList resultPairs = TQStringList::split(";", preamble, FALSE);
// Find/initialize critical data values
double ymult;
@@ -673,13 +673,15 @@ printf("[PROFILE] %f s\n\r", ((tp4.tv_nsec+(tp4.tv_sec*1e9))-(tp3.tv_nsec+(tp3.t
double xposition;
const char* xunits;
- ymult = resultPairs[13].toDouble();
- yoffset = resultPairs[14].toDouble()*ymult;
- yposition = resultPairs[15].toDouble()*ymult;
- yunits = strdup(resultPairs[12]);
- xincr = resultPairs[9].toDouble();
- xposition = resultPairs[10].toDouble();
- xunits = strdup(resultPairs[8]);
+ if (resultPairs.count() > 15) {
+ ymult = resultPairs[13].toDouble();
+ yoffset = resultPairs[14].toDouble()*ymult;
+ yposition = resultPairs[15].toDouble()*ymult;
+ yunits = strdup(resultPairs[12]);
+ xincr = resultPairs[9].toDouble();
+ xposition = resultPairs[10].toDouble();
+ xunits = strdup(resultPairs[8]);
+ }
// Get the curve data now
sprintf(falpha,"CURVE?");
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-30 23:15:41 +0000