Merge branch 'master' of https://github.com/hmatuschek/libsdr

dist/linux/debian/control

@@ -16,6 +16,6 @@ Description: libsdr
 Package: libsdr-dev
 Section: hamradio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsdr
 Description: libsdr
   A C++ library for software defined radio. Development files.

src/CMakeLists.txt

@@ -32,7 +32,7 @@ set_target_properties(libsdr PROPERTIES DEPENDS libsdr_hdrs)
 set_target_properties(libsdr PROPERTIES VERSION
   "${libsdr_VERSION_MAJOR}.${libsdr_VERSION_MINOR}.${libsdr_VERSION_PATCH}")
 set_target_properties(libsdr PROPERTIES SOVERION "${libsdr_VERSION_MAJOR}")
-set_target_properties(libsdr PROPERTIES MACOSX_RPATH ${CMAKE_INSTALL_RPATH})
+set_target_properties(libsdr PROPERTIES MACOSX_RPATH "${CMAKE_INSTALL_RPATH}")
 set_target_properties(libsdr PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
 target_link_libraries(libsdr ${LIBS})
 
@@ -53,7 +53,7 @@ if(SDR_WITH_FFTW AND SDR_WITH_QT5)
     "${libsdr_VERSION_MAJOR}.${libsdr_VERSION_MINOR}.${libsdr_VERSION_PATCH}")
   set_target_properties(libsdr-gui PROPERTIES SOVERION "${libsdr_VERSION_MAJOR}")
   set_target_properties(libsdr-gui PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
-  set_target_properties(libsdr-gui PROPERTIES MACOSX_RPATH ${CMAKE_INSTALL_RPATH})
+  set_target_properties(libsdr-gui PROPERTIES MACOSX_RPATH "${CMAKE_INSTALL_RPATH}")
   target_link_libraries(libsdr-gui libsdr ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
 
   install(TARGETS libsdr-gui DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/gui/waterfallview.cc

@@ -99,7 +99,7 @@ WaterFallView::WaterFallView(SpectrumProvider *spectrum, size_t hist, Direction
 
   // Get notified once a new spectrum is available:
   QObject::connect(_spectrum, SIGNAL(spectrumUpdated()), this, SLOT(_onSpectrumUpdated()));
-  QObject::connect(_spectrum, SIGNAL(spectrumConfigured()), this, SLOT(update()));
+  QObject::connect(_spectrum, SIGNAL(spectrumConfigured()), this, SLOT(_onSpectrumConfigure()));
 }
 
 void
@@ -130,6 +130,19 @@ WaterFallView::_onSpectrumUpdated() {
   this->update();
 }
 
+void
+WaterFallView::_onSpectrumConfigure() {
+  // Update spectrum width
+  _N = _spectrum->fftSize();
+  // Replace WaterFall pixmap
+  _waterfall = QPixmap(_N, _M);
+  // Fill waterfall pixmap
+  _waterfall.fill(Qt::black);
+
+  // Trigger update
+  this->update();
+}
+
 void
 WaterFallView::mouseReleaseEvent(QMouseEvent *evt) {
   // If event is accepted -> determine frequency

src/gui/waterfallview.hh

@@ -95,6 +95,8 @@ protected:
 protected slots:
   /** Gets called once a new PSD is available. */
   void _onSpectrumUpdated();
+  /** Gets called once the spectrum provider gets reconfigured. */
+  void _onSpectrumConfigure();
 
 protected:
   /** The spectrum sink. */