From ff046cb6c42a2382ee281e83955b7ae44030b42e Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Sat, 2 Jun 2018 23:30:57 +0200 Subject: [PATCH] Fix #1198 by removing the 1:1 zoom button --- icons/zoom-original.png | Bin 766 -> 0 bytes pulseview.qrc | 1 - pv/views/trace/standardbar.cpp | 19 ------------------- pv/views/trace/standardbar.hpp | 4 ---- pv/views/trace/view.cpp | 17 ----------------- pv/views/trace/view.hpp | 2 -- 6 files changed, 43 deletions(-) delete mode 100644 icons/zoom-original.png diff --git a/icons/zoom-original.png b/icons/zoom-original.png deleted file mode 100644 index 8ae30433249f4d3473f7f2467bf43191678077c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EaHVVDt*`3308cr~r!K0sHrFMw7L( zGXsiPS{lK{rKF@pMMd}Q-?{JL?t;QRUq5djU$1=!c4uU!l~FN7tdb4dhzP@%T1d%Mnr{WGr2HMVuMboR7$_jOE} zHet&2iBqOeo;!c$yoIwCES$S^#iA9fm#*8mYSY&B+jef+wRhX0!v}BPx^e6F&Aa#R z+ykQfckkc7`{2R-M~@yne*EyslSj{eb6vuV1}>^ZL!(H*ep* ze*5;#yLazCe0cxyGPM*U%q_#`W1-2e)|SQ-@bkS_Wk?!A3whT{Q2|O zFChB$`!^8%{__Wj{`~#>_us#N|Ns9lHfys0hKP1akY6wZBNH&B&0O<@(}0Pd-!Q0Ri@os=V#D-{+TKpI@->!IfgR zsI}9IN~`$`Rz7IqIjfmrB2^?25OIuCbC&RusI{k>6c{*+{3b21T;?_D%dOx?3?J_` ztE@DfwfHfUR_`Q+lYuJ(B-}Imcs6O6`!X+CzB8vxV4>xbCxH_?7?d=hefH{jwjjn$ zNKkO%sZ>jk&98TcIm$L!P4!y)?9ho#=O*WUPF)sv{PG()>&R&jeP+A=TmEqUzs3Ix z=02any1BIcezo26ySF1_O$=o6<05Zw%6*+9eeJ2La{GD9=84aJt>&3aSxo!M7L%Sd U^~4O53{Yb9boFyt=akR{02o|~lmGw# diff --git a/pulseview.qrc b/pulseview.qrc index 3ef52852..f055f0bd 100644 --- a/pulseview.qrc +++ b/pulseview.qrc @@ -36,7 +36,6 @@ icons/window-new.png icons/zoom-fit-best.png icons/zoom-in.png - icons/zoom-original.png icons/zoom-out.png diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp index 35b87be5..22697506 100644 --- a/pv/views/trace/standardbar.cpp +++ b/pv/views/trace/standardbar.cpp @@ -41,7 +41,6 @@ StandardBar::StandardBar(Session &session, QWidget *parent, action_view_zoom_in_(new QAction(this)), action_view_zoom_out_(new QAction(this)), action_view_zoom_fit_(new QAction(this)), - action_view_zoom_one_to_one_(new QAction(this)), action_view_show_cursors_(new QAction(this)), segment_display_mode_selector_(new QToolButton(this)), action_sdm_last_(new QAction(this)), @@ -75,13 +74,6 @@ StandardBar::StandardBar(Session &session, QWidget *parent, connect(action_view_zoom_fit_, SIGNAL(triggered(bool)), this, SLOT(on_actionViewZoomFit_triggered(bool))); - action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One")); - action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original", - QIcon(":/icons/zoom-original.png"))); - action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O)); - connect(action_view_zoom_one_to_one_, SIGNAL(triggered(bool)), - this, SLOT(on_actionViewZoomOneToOne_triggered())); - action_view_show_cursors_->setCheckable(true); action_view_show_cursors_->setIcon(QIcon(":/icons/show-cursors.svg")); action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C)); @@ -151,7 +143,6 @@ void StandardBar::add_toolbar_widgets() addAction(action_view_zoom_in_); addAction(action_view_zoom_out_); addAction(action_view_zoom_fit_); - addAction(action_view_zoom_one_to_one_); addSeparator(); addAction(action_view_show_cursors_); multi_segment_actions_.push_back(addSeparator()); @@ -187,11 +178,6 @@ QAction* StandardBar::action_view_zoom_fit() const return action_view_zoom_fit_; } -QAction* StandardBar::action_view_zoom_one_to_one() const -{ - return action_view_zoom_one_to_one_; -} - QAction* StandardBar::action_view_show_cursors() const { return action_view_show_cursors_; @@ -212,11 +198,6 @@ void StandardBar::on_actionViewZoomFit_triggered(bool checked) view_->zoom_fit(checked); } -void StandardBar::on_actionViewZoomOneToOne_triggered() -{ - view_->zoom_one_to_one(); -} - void StandardBar::on_actionViewShowCursors_triggered() { const bool show = action_view_show_cursors_->isChecked(); diff --git a/pv/views/trace/standardbar.hpp b/pv/views/trace/standardbar.hpp index 6e822229..9c27f43e 100644 --- a/pv/views/trace/standardbar.hpp +++ b/pv/views/trace/standardbar.hpp @@ -59,7 +59,6 @@ public: QAction* action_view_zoom_in() const; QAction* action_view_zoom_out() const; QAction* action_view_zoom_fit() const; - QAction* action_view_zoom_one_to_one() const; QAction* action_view_show_cursors() const; protected: @@ -73,7 +72,6 @@ protected: QAction *const action_view_zoom_in_; QAction *const action_view_zoom_out_; QAction *const action_view_zoom_fit_; - QAction *const action_view_zoom_one_to_one_; QAction *const action_view_show_cursors_; QToolButton *segment_display_mode_selector_; @@ -93,8 +91,6 @@ protected Q_SLOTS: void on_actionViewZoomFit_triggered(bool checked); - void on_actionViewZoomOneToOne_triggered(); - void on_actionViewShowCursors_triggered(); void on_cursor_state_changed(bool show); diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index f634b4ae..3cb26ec4 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -700,23 +700,6 @@ void View::zoom_fit(bool gui_state) set_scale_offset(scale.convert_to(), extents.first); } -void View::zoom_one_to_one() -{ - using pv::data::SignalData; - - // Make a set of all the visible data objects - set< shared_ptr > visible_data = get_visible_data(); - if (visible_data.empty()) - return; - - assert(viewport_); - const int w = viewport_->width(); - if (w <= 0) - return; - - set_zoom(1.0 / session_.get_samplerate(), w / 2); -} - void View::set_scale_offset(double scale, const Timestamp& offset) { // Disable sticky scrolling / always zoom to fit when acquisition runs diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp index 1551bc0b..4f364404 100644 --- a/pv/views/trace/view.hpp +++ b/pv/views/trace/view.hpp @@ -234,8 +234,6 @@ public: void zoom_fit(bool gui_state); - void zoom_one_to_one(); - /** * Sets the scale and offset. * @param scale The new view scale in seconds per pixel. -- 2.30.2