Fix a number of out of range warnings

4 files changed, 14 insertions, 11 deletions

diff --git a/clients/tde/src/part/logicanalyzer/Makefile.in b/clients/tde/src/part/logicanalyzer/Makefile.in
index d07efc9..e8301f4 100644
--- a/clients/tde/src/part/logicanalyzer/Makefile.in
+++ b/clients/tde/src/part/logicanalyzer/Makefile.in
@@ -789,7 +789,7 @@ clean-metasources:
 	-rm -f  part.moc
 
 #>+ 2
-KDE_DIST=hi16-action-libremotelab_logicanalyzer.png layout.ui Makefile.am Makefile.in hi64-action-libremotelab_logicanalyzer.png part.h 
+KDE_DIST=layout.ui Makefile.in hi64-action-libremotelab_logicanalyzer.png hi16-action-libremotelab_logicanalyzer.png Makefile.am part.h 
 
 #>+ 4
 clean-ui:
@@ -801,14 +801,14 @@ docs-am:
 
 #>+ 10
 install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/hi16-action-libremotelab_logicanalyzer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/libremotelab_logicanalyzer.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/actions
 	$(INSTALL_DATA) $(srcdir)/hi64-action-libremotelab_logicanalyzer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/actions/libremotelab_logicanalyzer.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
+	$(INSTALL_DATA) $(srcdir)/hi16-action-libremotelab_logicanalyzer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/libremotelab_logicanalyzer.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/libremotelab_logicanalyzer.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/actions/libremotelab_logicanalyzer.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/libremotelab_logicanalyzer.png
 
 #>+ 15
 force-reedit:
diff --git a/clients/tde/src/part/logicanalyzer/part.cpp b/clients/tde/src/part/logicanalyzer/part.cpp
index e3a9675..6ee44cc 100644
--- a/clients/tde/src/part/logicanalyzer/part.cpp
+++ b/clients/tde/src/part/logicanalyzer/part.cpp
@@ -1247,6 +1247,7 @@ void LogicAnalyzerPart::recallWaveforms() {
 					ds >> offset;
 					ds >> values;
 					ds >> positions;
+					m_traceWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno], true);
 					m_traceWidget->setSamples(traceno-1, values);
 					m_traceWidget->setPositions(traceno-1, positions);
 					m_traceWidget->setTraceOffset(traceno-1, offset);
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index 52851c0..15fc12f 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -699,9 +699,9 @@ void ScopePart::mainEventLoop() {
 						m_channelActive[m_currentOpChannel] = (active != 0);
 					}
 					m_socket->clearFrameTail();
-	
+
 					if (result == "ACK") {
-						if (m_currentOpChannel < (m_maxNumberOfTraces-1)) {
+						if (m_currentOpChannel < m_maxNumberOfTraces) {
 							m_currentOpChannel++;
 							SET_NEXT_STATE(ScopeState_ChannelActiveStateRequest)
 						}
@@ -805,7 +805,7 @@ void ScopePart::mainEventLoop() {
 				if (m_socket->canReadFrame()) {
 					PAT_WATCHDOG_TIMER
 					setTickerMessage(i18n("Loading [Received allowed V/div list for channel %1]").arg(m_currentOpChannel));
-	
+
 					// Get permitted volts/div settings, step 2
 					TQString result;
 					ds >> result;
@@ -817,9 +817,9 @@ void ScopePart::mainEventLoop() {
 						}
 					}
 					m_socket->clearFrameTail();
-	
+
 					if (result == "ACK") {
-						if (m_currentOpChannel < (m_maxNumberOfTraces-1)) {
+						if (m_currentOpChannel < m_maxNumberOfTraces) {
 							m_currentOpChannel++;
 							SET_NEXT_STATE(ScopeState_TracePermittedVoltsDivRequest)
 						}
@@ -1198,7 +1198,7 @@ void ScopePart::mainEventLoop() {
 					SET_NEXT_STATE_DATA_WAITING(ScopeState_ChannelActiveStateUpdate+1)
 				}
 				else {
-					if (m_currentOpChannel < (m_maxNumberOfTraces-1)) {
+					if (m_currentOpChannel < m_maxNumberOfTraces) {
 						m_currentOpChannel++;
 						SET_NEXT_STATE(ScopeState_ChannelActiveStateUpdate)
 					}
@@ -1219,7 +1219,7 @@ void ScopePart::mainEventLoop() {
 				if (m_socket->canReadFrame()) {
 					PAT_WATCHDOG_TIMER
 					setTickerMessage(i18n("Updating [Set channel %1 activity status]").arg(m_currentOpChannel));
-	
+
 					// Set channel active, step 2
 					TQString result;
 					ds >> result;
@@ -1594,6 +1594,7 @@ void ScopePart::recallWaveforms() {
 					ds >> offset;
 					ds >> values;
 					ds >> positions;
+					m_traceWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno], true);
 					m_traceWidget->setSamples(traceno-1, values);
 					m_traceWidget->setPositions(traceno-1, positions);
 					m_traceWidget->setTraceOffset(traceno-1, offset);
diff --git a/clients/tde/src/part/sensormonitor/part.cpp b/clients/tde/src/part/sensormonitor/part.cpp
index 4a58890..d04b653 100644
--- a/clients/tde/src/part/sensormonitor/part.cpp
+++ b/clients/tde/src/part/sensormonitor/part.cpp
@@ -953,6 +953,7 @@ void SensorMonitorPart::recallWaveforms() {
 					TQDoubleArray positions;
 					ds >> values;
 					ds >> positions;
+					m_traceWidget->setNumberOfSamples(traceno, m_samplesInTrace[traceno], true);
 					m_traceWidget->setSamples(traceno, values);
 					m_traceWidget->setPositions(traceno, positions);
 					m_base->traceZoomWidget->setSamples(traceno, values);