Hello community, here is the log from the commit of package inspectrum for openSUSE:Factory checked in at 2020-12-01 14:22:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inspectrum (Old) and /work/SRC/openSUSE:Factory/.inspectrum.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "inspectrum" Tue Dec 1 14:22:03 2020 rev:5 rq:851777 version:0.2.2+git.20201123 Changes: -------- --- /work/SRC/openSUSE:Factory/inspectrum/inspectrum.changes 2020-06-09 00:06:06.865599363 +0200 +++ /work/SRC/openSUSE:Factory/.inspectrum.new.5913/inspectrum.changes 2020-12-01 14:22:06.521549314 +0100 @@ -1,0 +2,10 @@ +Sun Nov 29 10:56:11 UTC 2020 - mardnh@gmx.de + +- Update to version 0.2.2+git.20201123: + * fix(plotview): Implement showEvent() as an empty stub + * Maintain the current scroll position when zooming + * Fix build with Qt 5.15+ +- Drop patch: + * inspectrum-fix-with-qt-5.15.patch + +------------------------------------------------------------------- Old: ---- inspectrum-0.2.2+git.20200527.tar.xz inspectrum-fix-with-qt-5.15.patch New: ---- inspectrum-0.2.2+git.20201123.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inspectrum.spec ++++++ --- /var/tmp/diff_new_pack.DZ8Gtc/_old 2020-12-01 14:22:07.229550080 +0100 +++ /var/tmp/diff_new_pack.DZ8Gtc/_new 2020-12-01 14:22:07.229550080 +0100 @@ -2,7 +2,7 @@ # spec file for package inspectrum # # Copyright (c) 2020 SUSE LLC -# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de> +# Copyright (c) 2015-2020, Martin Hauke <mardnh@gmx.de> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,13 @@ Name: inspectrum -Version: 0.2.2+git.20200527 +Version: 0.2.2+git.20201123 Release: 0 Summary: A tool for analysing captured signals from SDRs License: GPL-3.0-or-later Group: Productivity/Hamradio/Other URL: https://github.com/miek/inspectrum Source: %{name}-%{version}.tar.xz -Patch0: inspectrum-fix-with-qt-5.15.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ @@ -46,11 +45,10 @@ %prep %setup -q -%patch0 -p1 %build %cmake -make %{?_smp_mflags} +%make_build %install %cmake_install ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.DZ8Gtc/_old 2020-12-01 14:22:07.265550119 +0100 +++ /var/tmp/diff_new_pack.DZ8Gtc/_new 2020-12-01 14:22:07.265550119 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/miek/inspectrum</param> - <param name="changesrevision">13843b4aeb0cff8b7787cdac466e7485437f851d</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">68f1d1b4bcdd3ea6d9ab1b3769fda03bafa1dd44</param></service></servicedata> \ No newline at end of file ++++++ inspectrum-0.2.2+git.20200527.tar.xz -> inspectrum-0.2.2+git.20201123.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inspectrum-0.2.2+git.20200527/.travis.yml new/inspectrum-0.2.2+git.20201123/.travis.yml --- old/inspectrum-0.2.2+git.20200527/.travis.yml 2020-05-27 19:08:54.000000000 +0200 +++ new/inspectrum-0.2.2+git.20201123/.travis.yml 2020-11-23 17:21:57.000000000 +0100 @@ -8,7 +8,9 @@ os: - linux - osx - +arch: + - amd64 + - ppc64le compiler: - gcc - clang @@ -18,6 +20,8 @@ # /usr/bin/gcc on OS X is clang, so it's not meaningful to build against both. - os: osx compiler: gcc + - os: osx + arch: ppc64le addons: apt: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inspectrum-0.2.2+git.20200527/plotview.cpp new/inspectrum-0.2.2+git.20201123/plotview.cpp --- old/inspectrum-0.2.2+git.20200527/plotview.cpp 2020-05-27 19:08:54.000000000 +0200 +++ new/inspectrum-0.2.2+git.20201123/plotview.cpp 2020-11-23 17:21:57.000000000 +0100 @@ -330,7 +330,7 @@ if (dialog.exec()) { QStringList fileNames = dialog.selectedFiles(); - + size_t start, end; if (cursorSelection.isChecked()) { start = selectedSamples.minimum; @@ -350,7 +350,7 @@ size_t step = viewRange.length(); for (index = start; index < end; index += step) { - size_t length = std::min(step, end - index); + size_t length = std::min(step, end - index); auto samples = sampleSrc->getSamples(index, length); if (samples != nullptr) { for (auto i = 0; i < length; i += decimation.value()) { @@ -387,6 +387,8 @@ void PlotView::setFFTAndZoom(int size, int zoom) { + auto oldSamplesPerColumn = samplesPerColumn(); + // Set new FFT size fftSize = size; if (spectrogramPlot != nullptr) @@ -401,7 +403,7 @@ horizontalScrollBar()->setSingleStep(10); horizontalScrollBar()->setPageStep(100); - updateView(true); + updateView(true, samplesPerColumn() < oldSamplesPerColumn); } void PlotView::setPowerMin(int power) @@ -530,6 +532,11 @@ updateView(); } +void PlotView::showEvent(QShowEvent *event) +{ + // Intentionally left blank. See #171 +} + void PlotView::updateViewRange(bool reCenter) { // Update current view @@ -542,15 +549,20 @@ sampleToColumn(zoomSample) - zoomPos ); } - // zoomSample = viewRange.minimum + viewRange.length() / 2; - // zoomPos = width() / 2; + zoomSample = viewRange.minimum + viewRange.length() / 2; + zoomPos = width() / 2; } -void PlotView::updateView(bool reCenter) +void PlotView::updateView(bool reCenter, bool expanding) { + if (!expanding) { + updateViewRange(reCenter); + } horizontalScrollBar()->setMaximum(std::max(0, sampleToColumn(mainSampleSource->count()) - width())); verticalScrollBar()->setMaximum(std::max(0, plotsHeight() - viewport()->height())); - updateViewRange(reCenter); + if (expanding) { + updateViewRange(reCenter); + } // Update cursors range_t<int> newSelection = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inspectrum-0.2.2+git.20200527/plotview.h new/inspectrum-0.2.2+git.20201123/plotview.h --- old/inspectrum-0.2.2+git.20200527/plotview.h 2020-05-27 19:08:54.000000000 +0200 +++ new/inspectrum-0.2.2+git.20201123/plotview.h 2020-11-23 17:21:57.000000000 +0100 @@ -59,6 +59,7 @@ void resizeEvent(QResizeEvent * event) override; void scrollContentsBy(int dx, int dy) override; bool viewportEvent(QEvent *event) override; + void showEvent(QShowEvent *event) override; private: Cursors cursors; @@ -71,7 +72,7 @@ size_t zoomSample; int fftSize = 1024; - int zoomLevel = 0; + int zoomLevel = 1; int powerMin; int powerMax; bool cursorsEnabled; @@ -87,7 +88,7 @@ int plotsHeight(); size_t samplesPerColumn(); void updateViewRange(bool reCenter); - void updateView(bool reCenter = false); + void updateView(bool reCenter = false, bool expanding = false); void paintTimeScale(QPainter &painter, QRect &rect, range_t<size_t> sampleRange); int sampleToColumn(size_t sample); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inspectrum-0.2.2+git.20200527/traceplot.cpp new/inspectrum-0.2.2+git.20201123/traceplot.cpp --- old/inspectrum-0.2.2+git.20200527/traceplot.cpp 2020-05-27 19:08:54.000000000 +0200 +++ new/inspectrum-0.2.2+git.20201123/traceplot.cpp 2020-11-23 17:21:57.000000000 +0100 @@ -20,6 +20,7 @@ #include <QPixmapCache> #include <QTextStream> #include <QtConcurrent> +#include <QPainterPath> #include "samplesource.h" #include "traceplot.h"