diff --git a/App/Loader.cpp b/App/Loader.cpp index 6a98267..74860c6 100644 --- a/App/Loader.cpp +++ b/App/Loader.cpp @@ -41,6 +41,8 @@ InitThread::run() QString verString; try { + emit change("Generating FFT wisdom (this may take a while)"); + su_lib_gen_wisdom(); emit change("Loading signal sources"); sing->init_sources(); emit change("Loading spectrum sources"); diff --git a/Suscan/Library.cpp b/Suscan/Library.cpp index 57a1263..a5f0394 100644 --- a/Suscan/Library.cpp +++ b/Suscan/Library.cpp @@ -57,7 +57,7 @@ Location::deserialize(Suscan::Object const &conf) } Suscan::Object && -Location::serialize(void) +Location::serialize() { Suscan::Object obj(SUSCAN_OBJECT_TYPE_OBJECT); @@ -80,7 +80,7 @@ TLESource::deserialize(Suscan::Object const &conf) } Suscan::Object && -TLESource::serialize(void) +TLESource::serialize() { Suscan::Object obj(SUSCAN_OBJECT_TYPE_OBJECT); @@ -137,7 +137,7 @@ Singleton::~Singleton() } Singleton * -Singleton::get_instance(void) +Singleton::get_instance() { if (Singleton::instance == nullptr) { try { @@ -151,14 +151,14 @@ Singleton::get_instance(void) } std::string -Singleton::sigutilsVersion(void) +Singleton::sigutilsVersion() { return std::string(sigutils_api_version()) + " (" + std::string(sigutils_pkgversion()) + ")"; } std::string -Singleton::suscanVersion(void) +Singleton::suscanVersion() { return std::string(suscan_api_version()) + " (" + std::string(suscan_pkgversion()) + ")"; @@ -199,7 +199,7 @@ walk_all_remote_devices( } void -Singleton::init_sources(void) +Singleton::init_sources() { if (!this->sources_initd) { SU_ATTEMPT(suscan_init_sources()); @@ -210,7 +210,7 @@ Singleton::init_sources(void) } void -Singleton::init_estimators(void) +Singleton::init_estimators() { if (!this->estimators_initd) { SU_ATTEMPT(suscan_init_estimators()); @@ -219,7 +219,7 @@ Singleton::init_estimators(void) } void -Singleton::init_spectrum_sources(void) +Singleton::init_spectrum_sources() { if (!this->spectrum_sources_initd) { SU_ATTEMPT(suscan_init_spectsrcs()); @@ -228,7 +228,7 @@ Singleton::init_spectrum_sources(void) } void -Singleton::init_inspectors(void) +Singleton::init_inspectors() { if (!this->inspectors_initd) { SU_ATTEMPT(suscan_init_inspectors()); @@ -288,7 +288,7 @@ Singleton::havePalette(std::string const &name) } void -Singleton::init_palettes(void) +Singleton::init_palettes() { unsigned int i, count; ConfigContext ctx("palettes"); @@ -307,7 +307,7 @@ Singleton::init_palettes(void) } void -Singleton::init_autogains(void) +Singleton::init_autogains() { unsigned int i, count; ConfigContext ctx("autogains"); @@ -326,7 +326,7 @@ Singleton::init_autogains(void) } void -Singleton::init_fats(void) +Singleton::init_fats() { unsigned int i, count; ConfigContext ctx("frequency_allocations"); @@ -345,7 +345,7 @@ Singleton::init_fats(void) } void -Singleton::init_bookmarks(void) +Singleton::init_bookmarks() { unsigned int i, count; ConfigContext ctx("bookmarks"); @@ -404,7 +404,7 @@ Singleton::initLocationsFromContext(ConfigContext &ctx, bool user) } void -Singleton::init_locations(void) +Singleton::init_locations() { ConfigContext globalCtx("locations"); ConfigContext userCtx("user_locations"); @@ -445,7 +445,7 @@ Singleton::initTLESourcesFromContext(ConfigContext &ctx, bool user) } void -Singleton::init_tle_sources(void) +Singleton::init_tle_sources() { ConfigContext globalCtx("tle"); ConfigContext userCtx("user_tle"); @@ -459,7 +459,7 @@ Singleton::init_tle_sources(void) void -Singleton::init_tle(void) +Singleton::init_tle() { const char *userTLEDir; @@ -480,7 +480,7 @@ Singleton::init_tle(void) } void -Singleton::init_plugins(void) +Singleton::init_plugins() { Plugin *defPlug = Plugin::getDefaultPlugin(); QStringList plugins; @@ -520,14 +520,14 @@ Singleton::init_plugins(void) } void -Singleton::refreshDevices(void) +Singleton::refreshDevices() { this->devices.clear(); suscan_source_device_walk(walk_all_devices, static_cast(this)); } void -Singleton::refreshNetworkProfiles(void) +Singleton::refreshNetworkProfiles() { this->networkProfiles.clear(); suscan_discovered_remote_device_walk( @@ -542,7 +542,7 @@ Singleton::haveQth() const } Location -Singleton::getQth(void) const +Singleton::getQth() const { return this->qth; } @@ -556,21 +556,21 @@ Singleton::setQth(Location const &loc) } void -Singleton::detect_devices(void) +Singleton::detect_devices() { suscan_source_detect_devices(); this->refreshDevices(); } void -Singleton::trigger_delayed(void) +Singleton::trigger_delayed() { for (auto p : pluginCallbacks) (p.first)(p.second); } void -Singleton::init_ui_config(void) +Singleton::init_ui_config() { unsigned int i, count; ConfigContext ctx("uiconfig"); @@ -587,7 +587,7 @@ Singleton::init_ui_config(void) } void -Singleton::init_recent_list(void) +Singleton::init_recent_list() { unsigned int i, count; ConfigContext ctx("recent"); @@ -606,7 +606,7 @@ Singleton::init_recent_list(void) } void -Singleton::syncRecent(void) +Singleton::syncRecent() { ConfigContext ctx("recent"); Object list = ctx.listObject(); @@ -623,7 +623,7 @@ Singleton::syncRecent(void) } void -Singleton::syncLocations(void) +Singleton::syncLocations() { ConfigContext ctx("user_locations"); Object list = ctx.listObject(); @@ -650,7 +650,7 @@ Singleton::syncLocations(void) } void -Singleton::syncTLESources(void) +Singleton::syncTLESources() { ConfigContext ctx("user_tle"); Object list = ctx.listObject(); @@ -669,7 +669,7 @@ Singleton::syncTLESources(void) } void -Singleton::syncUI(void) +Singleton::syncUI() { unsigned int i, count; ConfigContext ctx("uiconfig"); @@ -690,7 +690,7 @@ Singleton::syncUI(void) } void -Singleton::syncBookmarks(void) +Singleton::syncBookmarks() { ConfigContext ctx("bookmarks"); Object list = ctx.listObject(); @@ -716,7 +716,7 @@ Singleton::syncBookmarks(void) } void -Singleton::killBackgroundTaskController(void) +Singleton::killBackgroundTaskController() { if (this->backgroundTaskController != nullptr) { delete this->backgroundTaskController; @@ -725,7 +725,7 @@ Singleton::killBackgroundTaskController(void) } void -Singleton::sync(void) +Singleton::sync() { this->syncRecent(); this->syncUI(); @@ -762,19 +762,19 @@ Singleton::registerNetworkProfile(const suscan_source_config_t *config) } MultitaskController * -Singleton::getBackgroundTaskController(void) const +Singleton::getBackgroundTaskController() const { return this->backgroundTaskController; } ConfigMap::const_iterator -Singleton::getFirstProfile(void) const +Singleton::getFirstProfile() const { return this->profiles.begin(); } ConfigMap::const_iterator -Singleton::getLastProfile(void) const +Singleton::getLastProfile() const { return this->profiles.end(); } @@ -985,61 +985,61 @@ Singleton::registerSourceDevice(const suscan_source_device_t *dev) } std::vector::const_iterator -Singleton::getFirstDevice(void) const +Singleton::getFirstDevice() const { return this->devices.begin(); } std::vector::const_iterator -Singleton::getLastDevice(void) const +Singleton::getLastDevice() const { return this->devices.end(); } std::vector::const_iterator -Singleton::getFirstPalette(void) const +Singleton::getFirstPalette() const { return this->palettes.begin(); } std::vector::const_iterator -Singleton::getLastPalette(void) const +Singleton::getLastPalette() const { return this->palettes.end(); } std::vector::const_iterator -Singleton::getFirstAutoGain(void) const +Singleton::getFirstAutoGain() const { return this->autoGains.begin(); } std::vector::const_iterator -Singleton::getLastAutoGain(void) const +Singleton::getLastAutoGain() const { return this->autoGains.end(); } std::vector::iterator -Singleton::getFirstUIConfig(void) +Singleton::getFirstUIConfig() { return this->uiConfig.begin(); } std::vector::iterator -Singleton::getLastUIConfig(void) +Singleton::getLastUIConfig() { return this->uiConfig.end(); } std::vector::const_iterator -Singleton::getFirstFAT(void) const +Singleton::getFirstFAT() const { return this->FATs.begin(); } std::vector::const_iterator -Singleton::getLastFAT(void) const +Singleton::getLastFAT() const { return this->FATs.end(); } @@ -1063,31 +1063,31 @@ Singleton::getDeviceAt(unsigned int index) const } std::list::const_iterator -Singleton::getFirstRecent(void) const +Singleton::getFirstRecent() const { return this->recentProfiles.cbegin(); } std::list::const_iterator -Singleton::getLastRecent(void) const +Singleton::getLastRecent() const { return this->recentProfiles.cend(); } QMap const & -Singleton::getBookmarkMap(void) const +Singleton::getBookmarkMap() const { return this->bookmarks; } QMap::const_iterator -Singleton::getFirstBookmark(void) const +Singleton::getFirstBookmark() const { return this->bookmarks.cbegin(); } QMap::const_iterator -Singleton::getLastBookmark(void) const +Singleton::getLastBookmark() const { return this->bookmarks.cend(); } @@ -1099,74 +1099,74 @@ Singleton::getBookmarkFrom(qint64 freq) const } QMap const & -Singleton::getLocationMap(void) const +Singleton::getLocationMap() const { return this->locations; } QMap::const_iterator -Singleton::getFirstLocation(void) const +Singleton::getFirstLocation() const { return this->locations.cbegin(); } QMap::const_iterator -Singleton::getLastLocation(void) const +Singleton::getLastLocation() const { return this->locations.cend(); } QMap const & -Singleton::getSatelliteMap(void) const +Singleton::getSatelliteMap() const { return this->satellites; } QMap::const_iterator -Singleton::getFirstSatellite(void) const +Singleton::getFirstSatellite() const { return this->satellites.cbegin(); } QMap::const_iterator -Singleton::getLastSatellite(void) const +Singleton::getLastSatellite() const { return this->satellites.cend(); } QMap const & -Singleton::getTLESourceMap(void) const +Singleton::getTLESourceMap() const { return this->tleSources; } QMap::const_iterator -Singleton::getFirstTLESource(void) const +Singleton::getFirstTLESource() const { return this->tleSources.cbegin(); } QMap::const_iterator -Singleton::getLastTLESource(void) const +Singleton::getLastTLESource() const { return this->tleSources.cend(); } QMap const & -Singleton::getSpectrumUnitMap(void) const +Singleton::getSpectrumUnitMap() const { return this->spectrumUnits; } QMap::const_iterator -Singleton::getFirstSpectrumUnit(void) const +Singleton::getFirstSpectrumUnit() const { return this->spectrumUnits.cbegin(); } QMap::const_iterator -Singleton::getLastSpectrumUnit(void) const +Singleton::getLastSpectrumUnit() const { return this->spectrumUnits.cend(); } @@ -1179,19 +1179,19 @@ Singleton::getSpectrumUnitFrom(std::string const &name) const QHash const & -Singleton::getNetworkProfileMap(void) const +Singleton::getNetworkProfileMap() const { return this->networkProfiles; } QHash::const_iterator -Singleton::getFirstNetworkProfile(void) const +Singleton::getFirstNetworkProfile() const { return this->networkProfiles.cbegin(); } QHash::const_iterator -Singleton::getLastNetworkProfile(void) const +Singleton::getLastNetworkProfile() const { return this->networkProfiles.cend(); } @@ -1455,7 +1455,7 @@ Singleton::removeRecent(std::string const &name) } void -Singleton::clearRecent(void) +Singleton::clearRecent() { this->recentProfiles.clear(); } diff --git a/include/Suscan/Library.h b/include/Suscan/Library.h index 41a0d33..ca5c25b 100644 --- a/include/Suscan/Library.h +++ b/include/Suscan/Library.h @@ -71,7 +71,7 @@ namespace Suscan { bool user = false; void deserialize(Suscan::Object const &conf) override; - Suscan::Object &&serialize(void) override; + Suscan::Object &&serialize() override; }; struct SpectrumUnit { @@ -149,7 +149,7 @@ namespace Suscan { // Overriden methods void deserialize(Suscan::Object const &conf) override; - Suscan::Object &&serialize(void) override; + Suscan::Object &&serialize() override; }; struct Orbit { @@ -236,18 +236,18 @@ namespace Suscan { } orbit_t const & - getCOrbit(void) const + getCOrbit() const { return *this->c_info; } QString - nameToQString(void) const + nameToQString() const { return this->c_info->name; } - void debug(void) const; + void debug() const; }; typedef void (*DelayedPluginCallback) (Suscan::Plugin *); @@ -303,47 +303,47 @@ namespace Suscan { bool havePalette(std::string const &name); bool haveAutoGain(std::string const &name); bool haveFAT(std::string const &name); - void syncUI(void); - void syncRecent(void); - void syncLocations(void); - void syncTLESources(void); - void syncBookmarks(void); + void syncUI(); + void syncRecent(); + void syncLocations(); + void syncTLESources(); + void syncBookmarks(); void initLocationsFromContext(ConfigContext &ctx, bool user); void initTLESourcesFromContext(ConfigContext &ctx, bool user); static QString normalizeTLEName(QString const &); public: - void init_sources(void); - void init_estimators(void); - void init_spectrum_sources(void); - void init_inspectors(void); - void init_palettes(void); - void init_fats(void); - void init_autogains(void); - void init_ui_config(void); - void init_recent_list(void); - void init_locations(void); - void init_bookmarks(void); - void init_tle_sources(void); - void init_tle(void); - void init_plugins(void); - void detect_devices(void); - void trigger_delayed(void); - - void sync(void); - - void killBackgroundTaskController(void); + void init_sources(); + void init_estimators(); + void init_spectrum_sources(); + void init_inspectors(); + void init_palettes(); + void init_fats(); + void init_autogains(); + void init_ui_config(); + void init_recent_list(); + void init_locations(); + void init_bookmarks(); + void init_tle_sources(); + void init_tle(); + void init_plugins(); + void detect_devices(); + void trigger_delayed(); + + void sync(); + + void killBackgroundTaskController(); void registerDelayedCallback(DelayedPluginCallback, Plugin *); void registerSourceConfig(suscan_source_config_t *config); void registerNetworkProfile(const suscan_source_config_t *config); void registerSourceDevice(const suscan_source_device_t *dev); - MultitaskController *getBackgroundTaskController(void) const; + MultitaskController *getBackgroundTaskController() const; - ConfigMap::const_iterator getFirstProfile(void) const; - ConfigMap::const_iterator getLastProfile(void) const; + ConfigMap::const_iterator getFirstProfile() const; + ConfigMap::const_iterator getLastProfile() const; Suscan::Source::Config *getProfile(std::string const &name); void saveProfile(Suscan::Source::Config const &name); @@ -359,58 +359,58 @@ namespace Suscan { void replaceSpectrumUnit(std::string const &, float, float); void removeSpectrumUnit(std::string const &); - void refreshDevices(void); - void refreshNetworkProfiles(void); + void refreshDevices(); + void refreshNetworkProfiles(); bool registerTLE(std::string const &); bool haveQth() const; - Location getQth(void) const; + Location getQth() const; void setQth(Location const &); - std::vector::const_iterator getFirstDevice(void) const; - std::vector::const_iterator getLastDevice(void) const; + std::vector::const_iterator getFirstDevice() const; + std::vector::const_iterator getLastDevice() const; - std::vector::const_iterator getFirstPalette(void) const; - std::vector::const_iterator getLastPalette(void) const; + std::vector::const_iterator getFirstPalette() const; + std::vector::const_iterator getLastPalette() const; - std::vector::const_iterator getFirstAutoGain(void) const; - std::vector::const_iterator getLastAutoGain(void) const; + std::vector::const_iterator getFirstAutoGain() const; + std::vector::const_iterator getLastAutoGain() const; - std::vector::const_iterator getFirstFAT(void) const; - std::vector::const_iterator getLastFAT(void) const; + std::vector::const_iterator getFirstFAT() const; + std::vector::const_iterator getLastFAT() const; - std::vector::iterator getFirstUIConfig(void); - std::vector::iterator getLastUIConfig(void); + std::vector::iterator getFirstUIConfig(); + std::vector::iterator getLastUIConfig(); - std::list::const_iterator getFirstRecent(void) const; - std::list::const_iterator getLastRecent(void) const; + std::list::const_iterator getFirstRecent() const; + std::list::const_iterator getLastRecent() const; - QMap const &getBookmarkMap(void) const; - QMap::const_iterator getFirstBookmark(void) const; - QMap::const_iterator getLastBookmark(void) const; + QMap const &getBookmarkMap() const; + QMap::const_iterator getFirstBookmark() const; + QMap::const_iterator getLastBookmark() const; QMap::const_iterator getBookmarkFrom(qint64 bm) const; - QMap const &getLocationMap(void) const; - QMap::const_iterator getFirstLocation(void) const; - QMap::const_iterator getLastLocation(void) const; + QMap const &getLocationMap() const; + QMap::const_iterator getFirstLocation() const; + QMap::const_iterator getLastLocation() const; - QMap const &getSatelliteMap(void) const; - QMap::const_iterator getFirstSatellite(void) const; - QMap::const_iterator getLastSatellite(void) const; + QMap const &getSatelliteMap() const; + QMap::const_iterator getFirstSatellite() const; + QMap::const_iterator getLastSatellite() const; - QMap const &getTLESourceMap(void) const; - QMap::const_iterator getFirstTLESource(void) const; - QMap::const_iterator getLastTLESource(void) const; + QMap const &getTLESourceMap() const; + QMap::const_iterator getFirstTLESource() const; + QMap::const_iterator getLastTLESource() const; - QMap const &getSpectrumUnitMap(void) const; - QMap::const_iterator getFirstSpectrumUnit(void) const; - QMap::const_iterator getLastSpectrumUnit(void) const; + QMap const &getSpectrumUnitMap() const; + QMap::const_iterator getFirstSpectrumUnit() const; + QMap::const_iterator getLastSpectrumUnit() const; QMap::const_iterator getSpectrumUnitFrom(std::string const &) const; - QHash const &getNetworkProfileMap(void) const; - QHash::const_iterator getFirstNetworkProfile(void) const; - QHash::const_iterator getLastNetworkProfile(void) const; + QHash const &getNetworkProfileMap() const; + QHash::const_iterator getFirstNetworkProfile() const; + QHash::const_iterator getLastNetworkProfile() const; QHash::const_iterator getNetworkProfileFrom(QString const &) const; bool registerToolWidgetFactory(SigDigger::ToolWidgetFactory *); @@ -443,16 +443,16 @@ namespace Suscan { bool notifyRecent(std::string const &name); bool removeRecent(std::string const &name); - void clearRecent(void); + void clearRecent(); void putUIConfig(unsigned int where, Object &&rv); const Source::Device *getDeviceAt(unsigned int index) const; - static Singleton *get_instance(void); + static Singleton *get_instance(); - static std::string sigutilsVersion(void); - static std::string suscanVersion(void); + static std::string sigutilsVersion(); + static std::string suscanVersion(); }; };