| 3b2621f9 | 2014-09-14 16:04:55 | Timothy Pearson |
Fix a number of memory initialization glitches Fix math waveform offset saving Fix insane memory usage during SASL negotiation |
||
|
M clients/tde/src/part/scope/part.cpp M clients/tde/src/part/scope/part.h M clients/tde/src/widgets/tracewidget.cpp M lib/libtdekrb/src/tdekrbclientsocket.cpp M lib/libtdekrb/src/tdekrbserversocket.cpp M servers/gpib_server_lin/src/gpib_conn.cpp |
||
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index cb38e07..274480a 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -455,7 +455,7 @@
ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& )
: RemoteInstrumentPart( parent, name ), m_traceWidget(0), m_commHandlerState(-1), m_commHandlerMode(0), m_commHandlerCommandState(0), m_connectionActiveAndValid(false),
- m_triggerChannel(-1), m_settingsChanged(false), m_base(0), stopTraceUpdate(false)
+ m_tickerState(0), m_triggerChannel(-1), m_running(false), m_triggerLevel(0), m_settingsChanged(false), m_base(0), m_stopTraceUpdate(false)
{
// Initialize important base class variables
m_clientLibraryName = CLIENT_LIBRARY;
@@ -619,7 +619,7 @@
}
// Middle area
- if (((m_commHandlerMode < 2) && (m_commHandlerState < 50)) || (stopTraceUpdate)) {
+ if (((m_commHandlerMode < 2) && (m_commHandlerState < 50)) || (m_stopTraceUpdate)) {
m_base->groupOscilloscopeCaptureControls->setEnabled(false);
}
else {
@@ -627,7 +627,7 @@
}
// Least area
- if (stopTraceUpdate) {
+ if (m_stopTraceUpdate) {
m_base->acqStop->setEnabled(false);
m_base->acqStart->setEnabled(true);
m_base->waveformSave->setEnabled(true);
@@ -793,7 +793,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -803,7 +803,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -836,7 +836,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -846,7 +846,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -882,7 +882,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -892,7 +892,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -928,7 +928,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -938,7 +938,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -950,7 +950,6 @@
else if (m_commHandlerState == ScopeState_PermittedSecondsDivRequest) {
// Get permitted seconds/div settings, step 1
ds << TQString("GETPERMITTEDSDIVS");
- ds << m_currentOpChannel;
m_socket->writeEndOfFrame();
SET_NEXT_STATE_DATA_WAITING(ScopeState_PermittedSecondsDivRequest+1)
@@ -977,7 +976,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -987,7 +986,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1028,7 +1027,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1038,7 +1037,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1090,7 +1089,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1100,7 +1099,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1144,7 +1143,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1154,7 +1153,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1201,7 +1200,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1211,7 +1210,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1255,7 +1254,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1265,7 +1264,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1308,7 +1307,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1318,7 +1317,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
UPDATEDISPLAY_TIMEOUT
}
else {
@@ -1356,7 +1355,7 @@
EXEC_NEXT_STATE_IMMEDIATELY
}
else {
- if (stopTraceUpdate == false) {
+ if (m_stopTraceUpdate == false) {
COMMUNICATIONS_FAILED
}
else {
@@ -1366,7 +1365,7 @@
}
else {
if (!m_updateTimeoutTimer->isActive()) {
** Diff limit reached (max: 250 lines) **
|
||