* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
-
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#endif
+#include <cassert>
#include <algorithm>
#include <iterator>
+#include <cstdint>
+#include <cstdarg>
#include <QAction>
#include <QApplication>
#include "globalsettings.hpp"
#include "util.hpp"
#include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
#include "dialogs/settings.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
-#include <stdint.h>
-#include <stdarg.h>
#include <libsigrokcxx/libsigrokcxx.hpp>
+using std::bind;
using std::dynamic_pointer_cast;
-using std::list;
using std::make_shared;
using std::map;
+using std::placeholders::_1;
using std::shared_ptr;
using std::string;
using toolbars::MainBar;
-using std::bind;
-using std::placeholders::_1;
-
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
- action_about_(new QAction(this)),
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
+ GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
+ bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
+
setup_ui();
restore_ui_settings();
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
// ...otherwise find the dock widget the widget with focus is contained in
QObject *w = QApplication::focusWidget();
- QDockWidget *dock = 0;
+ QDockWidget *dock = nullptr;
while (w) {
- dock = qobject_cast<QDockWidget*>(w);
- if (dock)
- break;
- w = w->parent();
+ dock = qobject_cast<QDockWidget*>(w);
+ if (dock)
+ break;
+ w = w->parent();
}
// Get the view contained in the dock widget
views::TraceView::View *tv =
qobject_cast<views::TraceView::View*>(v.get());
- tv->enable_sticky_scrolling(true);
tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+ tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
if (!main_bar) {
/* Initial view, create the main bar */
// call deleteLater() on it, which causes a double free
// since the shared_ptr in view_docks_ doesn't know
// that Qt keeps a pointer to the view around
- view->setParent(0);
+ view->setParent(nullptr);
// Delete the view's dock widget and all widgets inside it
entry.first->deleteLater();
view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
view_sticky_scrolling_shortcut_->setAutoRepeat(false);
+ view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
+ view_show_sampling_points_shortcut_->setAutoRepeat(false);
+
view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
view_coloured_bg_shortcut_->setAutoRepeat(false);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setToolTip(tr("&About..."));
-
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
}
}
-std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
+shared_ptr<Session> MainWindow::get_tab_session(int index) const
{
// Find the session that belongs to the tab's main window
for (auto entry : session_windows_)
Session *session)
{
// We get a pointer and need a reference
- for (std::shared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(title, type, *s);
}
void MainWindow::on_settings_clicked()
{
- dialogs::Settings dlg;
+ dialogs::Settings dlg(device_manager_);
dlg.exec();
}
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
- for (std::shared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}
{
// Find the dock widget that contains the close button that was clicked
QObject *w = QObject::sender();
- QDockWidget *dock = 0;
+ QDockWidget *dock = nullptr;
while (w) {
dock = qobject_cast<QDockWidget*>(w);
remove_session(session);
}
+void MainWindow::on_view_coloured_bg_shortcut()
+{
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+ settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+}
+
void MainWindow::on_view_sticky_scrolling_shortcut()
{
- shared_ptr<views::ViewBase> viewbase = get_active_view();
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
- if (view)
- view->toggle_sticky_scrolling();
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+ settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
}
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_view_show_sampling_points_shortcut()
{
GlobalSettings settings;
- bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
- settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+ bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+ settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
}
void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
}
}
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ bool state = new_value.toBool();
+
+ for (auto entry : view_docks_) {
+ shared_ptr<views::ViewBase> viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(viewbase.get());
+ if (view)
+ view->enable_show_sampling_points(state);
+ }
}
void MainWindow::on_close_current_tab()
projects / pulseview.git / blobdiff