Fixed minors.

master
Hannes Matuschek 11 years ago
parent d7a130ec2b
commit f7251fe983

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

@ -32,7 +32,7 @@ set_target_properties(libsdr PROPERTIES DEPENDS libsdr_hdrs)
set_target_properties(libsdr PROPERTIES VERSION set_target_properties(libsdr PROPERTIES VERSION
"${libsdr_VERSION_MAJOR}.${libsdr_VERSION_MINOR}.${libsdr_VERSION_PATCH}") "${libsdr_VERSION_MAJOR}.${libsdr_VERSION_MINOR}.${libsdr_VERSION_PATCH}")
set_target_properties(libsdr PROPERTIES SOVERION "${libsdr_VERSION_MAJOR}") 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}) set_target_properties(libsdr PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
target_link_libraries(libsdr ${LIBS}) 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}") "${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 SOVERION "${libsdr_VERSION_MAJOR}")
set_target_properties(libsdr-gui PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}) 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}) target_link_libraries(libsdr-gui libsdr ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
install(TARGETS libsdr-gui DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS libsdr-gui DESTINATION ${CMAKE_INSTALL_LIBDIR})

@ -99,7 +99,7 @@ WaterFallView::WaterFallView(SpectrumProvider *spectrum, size_t hist, Direction
// Get notified once a new spectrum is available: // Get notified once a new spectrum is available:
QObject::connect(_spectrum, SIGNAL(spectrumUpdated()), this, SLOT(_onSpectrumUpdated())); 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 void
@ -130,6 +130,20 @@ WaterFallView::_onSpectrumUpdated() {
this->update(); this->update();
} }
void
WaterFallView::_onSpectrumConfigure() {
std::cerr << "Reset waterfall pixmap..." << std::endl;
// 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 void
WaterFallView::mouseReleaseEvent(QMouseEvent *evt) { WaterFallView::mouseReleaseEvent(QMouseEvent *evt) {
// If event is accepted -> determine frequency // If event is accepted -> determine frequency

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

Loading…
Cancel
Save