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); diff --git a/clients/tde/src/widgets/floatspinbox.cpp b/clients/tde/src/widgets/floatspinbox.cpp index 5e135eb..caf0d31 100644 --- a/clients/tde/src/widgets/floatspinbox.cpp +++ b/clients/tde/src/widgets/floatspinbox.cpp @@ -1,10 +1,28 @@ -// Copyright: See COPYING file that comes with this distribution -// -// Original Author: Ewald R. de Wit -// From Qt-Interest mailing list -// http://lists.trolltech.com/qt-interest/1999-07/thread00400-0.html -// -// (c) 2012 Timothy Pearson +/* + * Floating-point SpinBox Widget + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (c) 2012 Timothy Pearson + * Raptor Engineering + * http://www.raptorengineeringinc.com + * + * Original Author: Ewald R. de Wit + * From Qt-Interest mailing list + * http://lists.trolltech.com/qt-interest/1999-07/thread00400-0.html + */ #include #include diff --git a/clients/tde/src/widgets/floatspinbox.h b/clients/tde/src/widgets/floatspinbox.h index 3d5c1d1..a577649 100644 --- a/clients/tde/src/widgets/floatspinbox.h +++ b/clients/tde/src/widgets/floatspinbox.h @@ -1,10 +1,28 @@ -// Copyright: See COPYING file that comes with this distribution -// -// Original Author: Ewald R. de Wit -// From Qt-Interest mailing list -// http://lists.trolltech.com/qt-interest/1999-07/thread00400-0.html -// -// (c) 2012 Timothy Pearson +/* + * Floating-point SpinBox Widget + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (c) 2012 Timothy Pearson + * Raptor Engineering + * http://www.raptorengineeringinc.com + * + * Original Author: Ewald R. de Wit + * From Qt-Interest mailing list + * http://lists.trolltech.com/qt-interest/1999-07/thread00400-0.html + */ #ifndef FLOATSPINBOX_H #define FLOATSPINBOX_H diff --git a/clients/tde/src/widgets/tracewidget.cpp b/clients/tde/src/widgets/tracewidget.cpp index c0527c4..8de3d52 100644 --- a/clients/tde/src/widgets/tracewidget.cpp +++ b/clients/tde/src/widgets/tracewidget.cpp @@ -1,5 +1,24 @@ -//Author: Timothy Pearson , (C) 2012-2014 -//Copyright: See COPYING file that comes with this distribution +/* + * Analog and Digital Trace Viewing Widget + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (c) 2012-2014 Timothy Pearson + * Raptor Engineering + * http://www.raptorengineeringinc.com + */ #include "tracewidget.h" @@ -2205,7 +2224,7 @@ void TraceWidget::setZoomCursorBox(const TQRectF rect) { else { if (k<2) { horiz[k] = m_cursorArray[i]; - horizIndex[j] = i; + horizIndex[k] = i; k++; } } @@ -2576,4 +2595,4 @@ void TraceScrollWidget::setVScrollBarMode(TQScrollView::ScrollBarMode sm) { TraceWidget* TraceScrollWidget::traceWidget() { return m_traceScrollView->m_traceWidget; -} \ No newline at end of file +} diff --git a/clients/tde/src/widgets/tracewidget.h b/clients/tde/src/widgets/tracewidget.h index dd750f0..cda2188 100644 --- a/clients/tde/src/widgets/tracewidget.h +++ b/clients/tde/src/widgets/tracewidget.h @@ -1,5 +1,24 @@ -//Author: Timothy Pearson , (C) 2012-2014 -//Copyright: See COPYING file that comes with this distribution +/* + * Analog and Digital Trace Viewing Widget + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (c) 2012-2014 Timothy Pearson + * Raptor Engineering + * http://www.raptorengineeringinc.com + */ #include #include