electron
/
pulseview
mirror of git://sigrok.org/pulseview
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Application: Do not show unsupported device drivers in version info

This commit is contained in:
Soeren Apel 2021-12-21 22:09:51 +01:00
parent 6e8abc5e2d
commit 22dc404045
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@ -332,7 +332,7 @@ int main(int argc, char *argv[])
// Create the device manager, initialise the drivers
pv::DeviceManager device_manager(context, driver, do_scan);
a.collect_version_info(context);
a.collect_version_info(device_manager);
if (show_version) {
a.print_version_info();
} else {

13
pv/application.cpp
View File

@ -143,7 +143,7 @@ void Application::on_setting_changed(const QString &key, const QVariant &value)
switch_language(value.toString());
}
void Application::collect_version_info(shared_ptr<sigrok::Context> context)
void Application::collect_version_info(pv::DeviceManager &device_manager)
{
// Library versions and features
version_info_.emplace_back(applicationName(), applicationVersion());
@ -211,17 +211,18 @@ void Application::collect_version_info(shared_ptr<sigrok::Context> context)
#endif
// Device drivers
for (auto& entry : context->drivers())
driver_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
QString::fromUtf8(entry.second->long_name().c_str()));
for (auto& entry : device_manager.context()->drivers())
if (device_manager.driver_supported(entry.second))
driver_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
QString::fromUtf8(entry.second->long_name().c_str()));
// Input formats
for (auto& entry : context->input_formats())
for (auto& entry : device_manager.context()->input_formats())
input_format_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
QString::fromUtf8(entry.second->description().c_str()));
// Output formats
for (auto& entry : context->output_formats())
for (auto& entry : device_manager.context()->output_formats())
output_format_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
QString::fromUtf8(entry.second->description().c_str()));

3
pv/application.hpp
View File

@ -28,6 +28,7 @@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include "devicemanager.hpp"
#include "globalsettings.hpp"
using std::shared_ptr;
@ -47,7 +48,7 @@ public:
void on_setting_changed(const QString &key, const QVariant &value);
void collect_version_info(shared_ptr<sigrok::Context> context);
void collect_version_info(pv::DeviceManager &device_manager);
void print_version_info();
vector< pair<QString, QString> > get_version_info() const;