Add toolbar icons for zooming amplitude (#158)

* Add toolbar icons for zooming amplitude

* Add PR link

Author: cbrnr

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## [UNRELEASED] · YYYY-MM-DD
 ### ✨ Added
 - Add DMG background and Applications shortcut for macOS installer
+- Add new toolbar icons for zooming in/out all channels' amplitudes ([#158](https://github.com/cbrnr/sigviewer/pull/158) by [Clemens Brunner](https://github.com/cbrnr))
 
 ### 🔧 Fixed
 - Show error message when loading EDF files containing only annotations instead of hanging in the loading dialog

src/gui/commands/zoom_gui_command.cpp

@@ -35,14 +35,14 @@ QString const ZoomGuiCommand::GOTO_()
 
 QString const ZoomGuiCommand::ZOOM_IN_VERTICAL_()
 {
-    static QString value = tr("Zoom In Channels");
+    static QString value = tr("Show Fewer Channels");
 
     return value;
 }
 
 QString const ZoomGuiCommand::ZOOM_OUT_VERTICAL_()
 {
-    static QString value = tr("Zoom Out Channels");
+    static QString value = tr("Show More Channels");
 
     return value;
 }
@@ -82,6 +82,20 @@ QString const ZoomGuiCommand::AUTO_ZOOM_VERTICAL_()
     return value;
 }
 
+QString const ZoomGuiCommand::ZOOM_IN_ALL_CHANNELS_()
+{
+    static QString value = tr("Zoom In Amplitude");
+
+    return value;
+}
+
+QString const ZoomGuiCommand::ZOOM_OUT_ALL_CHANNELS_()
+{
+    static QString value = tr("Zoom Out Amplitude");
+
+    return value;
+}
+
 QStringList const ZoomGuiCommand::ACTIONS_()
 {
     static QStringList result = {
@@ -92,6 +106,8 @@ QStringList const ZoomGuiCommand::ACTIONS_()
         ZoomGuiCommand::GOTO_(),
         ZoomGuiCommand::SCALE_X_AXIS_(),
         ZoomGuiCommand::CHANNEL_PER_PAGE_(),
+        ZoomGuiCommand::ZOOM_IN_ALL_CHANNELS_(),
+        ZoomGuiCommand::ZOOM_OUT_ALL_CHANNELS_(),
     };
 
     return result;
@@ -115,10 +131,12 @@ ZoomGuiCommand::ZoomGuiCommand ()
 void ZoomGuiCommand::init ()
 {
     getQAction (GOTO_())->setIcon (QIcon::fromTheme("directions_walk"));
-    getQAction (ZOOM_IN_VERTICAL_())->setIcon (QIcon::fromTheme("zoom_in_vertical"));
-    getQAction (ZOOM_OUT_VERTICAL_())->setIcon (QIcon::fromTheme("zoom_out_vertical"));
+    getQAction (ZOOM_IN_VERTICAL_())->setIcon (QIcon::fromTheme("playlist_remove"));
+    getQAction (ZOOM_OUT_VERTICAL_())->setIcon (QIcon::fromTheme("playlist_add"));
     getQAction (ZOOM_IN_HORIZONTAL_())->setIcon (QIcon::fromTheme("zoom_in_horizontal"));
     getQAction (ZOOM_OUT_HORIZONTAL_())->setIcon (QIcon::fromTheme("zoom_out_horizontal"));
+    getQAction (ZOOM_IN_ALL_CHANNELS_())->setIcon (QIcon::fromTheme("zoom_in_vertical"));
+    getQAction (ZOOM_OUT_ALL_CHANNELS_())->setIcon (QIcon::fromTheme("zoom_out_vertical"));
 
 
     QList<QKeySequence> zoomInVertical;
@@ -139,6 +157,8 @@ void ZoomGuiCommand::init ()
     resetActionTriggerSlot (ZOOM_OUT_HORIZONTAL_(), SLOT(zoomOutHorizontal()));
     resetActionTriggerSlot (SCALE_X_AXIS_(), SLOT(scaleXAxis()));
     resetActionTriggerSlot (CHANNEL_PER_PAGE_(), SLOT(setChannelsPerPage()));
+    resetActionTriggerSlot (ZOOM_IN_ALL_CHANNELS_(), SLOT(zoomInAllChannels()));
+    resetActionTriggerSlot (ZOOM_OUT_ALL_CHANNELS_(), SLOT(zoomOutAllChannels()));
 }
 
 //-------------------------------------------------------------------------
@@ -167,6 +187,8 @@ void ZoomGuiCommand::evaluateEnabledness ()
     getQAction (ZOOM_IN_VERTICAL_())->setEnabled (zoom_in_vertical_possible);
     getQAction (ZOOM_OUT_HORIZONTAL_())->setEnabled (zoom_out_horizontal_possible);
     getQAction (ZOOM_IN_HORIZONTAL_())->setEnabled (zoom_in_horizontal_possible);
+    getQAction (ZOOM_IN_ALL_CHANNELS_())->setEnabled (true);
+    getQAction (ZOOM_OUT_ALL_CHANNELS_())->setEnabled (true);
     disableIfNoFileIsOpened (QStringList() << GOTO_() << SCALE_X_AXIS_() << CHANNEL_PER_PAGE_());
 }
 
@@ -247,6 +269,18 @@ void ZoomGuiCommand::autoZoomVertical ()
 {
 }
 
+//-----------------------------------------------------------------------------
+void ZoomGuiCommand::zoomInAllChannels ()
+{
+    currentVisModel()->zoomInAll();
+}
+
+//-----------------------------------------------------------------------------
+void ZoomGuiCommand::zoomOutAllChannels ()
+{
+    currentVisModel()->zoomOutAll();
+}
+
 
 //-------------------------------------------------------------------------
 void ZoomGuiCommand::scaleXAxis ()

src/gui/commands/zoom_gui_command.h

@@ -43,6 +43,12 @@ private slots:
     //-------------------------------------------------------------------------
     void autoZoomVertical ();
 
+    //-------------------------------------------------------------------------
+    void zoomInAllChannels ();
+
+    //-------------------------------------------------------------------------
+    void zoomOutAllChannels ();
+
     //-------------------------------------------------------------------------
     void scaleXAxis ();
 
@@ -73,6 +79,8 @@ private slots:
     static QString const SCALE_X_AXIS_();
     static QString const CHANNEL_PER_PAGE_();
     static QString const AUTO_ZOOM_VERTICAL_();
+    static QString const ZOOM_IN_ALL_CHANNELS_();
+    static QString const ZOOM_OUT_ALL_CHANNELS_();
     static QStringList const ACTIONS_();
 
     static GuiActionFactoryRegistrator registrator_;

src/gui/main_window.cpp

@@ -132,8 +132,10 @@ void MainWindow::initToolBars()
     file_toolbar_->addSeparator();
     file_toolbar_->addAction(action(tr("Channels...")));
     file_toolbar_->addAction(action(tr("Scale...")));
-    file_toolbar_->addAction(action(tr("Zoom In Channels")));
-    file_toolbar_->addAction(action(tr("Zoom Out Channels")));
+    file_toolbar_->addAction(action(tr("Show More Channels")));
+    file_toolbar_->addAction(action(tr("Show Fewer Channels")));
+    file_toolbar_->addAction(action(tr("Zoom In Amplitude")));
+    file_toolbar_->addAction(action(tr("Zoom Out Amplitude")));
     file_toolbar_->addAction(action(tr("Zoom In Time")));
     file_toolbar_->addAction(action(tr("Zoom Out Time")));
     file_toolbar_->addSeparator();
@@ -252,8 +254,10 @@ void MainWindow::initMenus (QSharedPointer<ApplicationContext> application_conte
     view_menu_->addAction(action(tr("Channels...")));
     view_menu_->addAction(action(tr("Scale...")));
     view_menu_->addSeparator();
-    view_menu_->addAction(action(tr("Zoom In Channels")));
-    view_menu_->addAction(action(tr("Zoom Out Channels")));
+    view_menu_->addAction(action(tr("Show More Channels")));
+    view_menu_->addAction(action(tr("Show Fewer Channels")));
+    view_menu_->addAction(action(tr("Zoom In Amplitude")));
+    view_menu_->addAction(action(tr("Zoom Out Amplitude")));
     view_menu_->addAction(action(tr("Zoom In Time")));
     view_menu_->addAction(action(tr("Zoom Out Time")));
     view_menu_->addSeparator();

src/gui/signal_visualisation_model.h

@@ -100,6 +100,12 @@ class SignalVisualisationModel : public QObject, public EventView
     //-------------------------------------------------------------------------
     virtual SignalVisualisationView const* view () const = 0;
 
+    //-------------------------------------------------------------------------
+    virtual void zoomInAll () {}
+
+    //-------------------------------------------------------------------------
+    virtual void zoomOutAll () {}
+
     //-------------------------------------------------------------------------
     QWidget* infoWidget ();
 public slots:

src/icons/dark/actions/playlist_add.svg

@@ -27,6 +27,8 @@
         <file>icons/light/actions/undo.svg</file>
         <file>icons/light/actions/zoom_in_horizontal.svg</file>
         <file>icons/light/actions/menu.svg</file>
+        <file>icons/light/actions/playlist_add.svg</file>
+        <file>icons/light/actions/playlist_remove.svg</file>
         <file>icons/light/actions/zoom_in_vertical.svg</file>
         <file>icons/light/actions/zoom_out_horizontal.svg</file>
         <file>icons/light/actions/zoom_out_vertical.svg</file>
@@ -58,6 +60,8 @@
         <file>icons/dark/actions/undo.svg</file>
         <file>icons/dark/actions/zoom_in_horizontal.svg</file>
         <file>icons/dark/actions/menu.svg</file>
+        <file>icons/dark/actions/playlist_add.svg</file>
+        <file>icons/dark/actions/playlist_remove.svg</file>
         <file>icons/dark/actions/zoom_in_vertical.svg</file>
         <file>icons/dark/actions/zoom_out_horizontal.svg</file>
         <file>icons/dark/actions/zoom_out_vertical.svg</file>