Mercurial > octave

diff libgui/graphics/ButtonControl.cc @ 31648:29d734430e5f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Re-indent code after switch to using namespace macros.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:53:00 -0500
parents c6d54dd31a7e
children deb553ac2c54 597f3ee61a48
line wrap: on
line diff
--- a/libgui/graphics/ButtonControl.cc	Tue Dec 06 14:37:51 2022 -0500
+++ b/libgui/graphics/ButtonControl.cc	Tue Dec 06 14:53:00 2022 -0500
@@ -39,117 +39,117 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  ButtonControl::ButtonControl (octave::base_qobject& oct_qobj,
-                                octave::interpreter& interp,
-                                const graphics_object& go,
-                                QAbstractButton *btn)
-    : BaseControl (oct_qobj, interp, go, btn), m_blockCallback (false)
-  {
-    uicontrol::properties& up = properties<uicontrol> ();
+ButtonControl::ButtonControl (octave::base_qobject& oct_qobj,
+                              octave::interpreter& interp,
+                              const graphics_object& go,
+                              QAbstractButton *btn)
+: BaseControl (oct_qobj, interp, go, btn), m_blockCallback (false)
+{
+  uicontrol::properties& up = properties<uicontrol> ();
+
+  QString str = Utils::fromStdString (up.get_string_string ());
+  str.replace ("&", "&&");
+  btn->setText (str);
+  if (btn->isCheckable () || up.style_is ("togglebutton"))
+    {
+      btn->setCheckable (true);
+
+      Matrix value = up.get_value ().matrix_value ();
+
+      if (value.numel () > 0 && value(0) == up.get_max ())
+        btn->setChecked (true);
+    }
 
-    QString str = Utils::fromStdString (up.get_string_string ());
-    str.replace ("&", "&&");
-    btn->setText (str);
-    if (btn->isCheckable () || up.style_is ("togglebutton"))
+  connect (btn, &QAbstractButton::clicked, this, &ButtonControl::clicked);
+  connect (btn, &QAbstractButton::toggled, this, &ButtonControl::toggled);
+}
+
+ButtonControl::~ButtonControl (void)
+{ }
+
+void
+ButtonControl::update (int pId)
+{
+  uicontrol::properties& up = properties<uicontrol> ();
+  QAbstractButton *btn = qWidget<QAbstractButton> ();
+
+  switch (pId)
+    {
+    case uicontrol::properties::ID_STRING:
       {
-        btn->setCheckable (true);
-
-        Matrix value = up.get_value ().matrix_value ();
-
-        if (value.numel () > 0 && value(0) == up.get_max ())
-          btn->setChecked (true);
+        QString str = Utils::fromStdString (up.get_string_string ());
+        str.replace ("&", "&&");
+        btn->setText (str);
+        break;
       }
 
-    connect (btn, &QAbstractButton::clicked, this, &ButtonControl::clicked);
-    connect (btn, &QAbstractButton::toggled, this, &ButtonControl::toggled);
-  }
-
-  ButtonControl::~ButtonControl (void)
-  { }
-
-  void
-  ButtonControl::update (int pId)
-  {
-    uicontrol::properties& up = properties<uicontrol> ();
-    QAbstractButton *btn = qWidget<QAbstractButton> ();
-
-    switch (pId)
-      {
-      case uicontrol::properties::ID_STRING:
+    case uicontrol::properties::ID_VALUE:
+      m_blockCallback = true;
+      if (btn->isCheckable ())
         {
-          QString str = Utils::fromStdString (up.get_string_string ());
-          str.replace ("&", "&&");
-          btn->setText (str);
-          break;
-        }
+          Matrix value = up.get_value ().matrix_value ();
 
-      case uicontrol::properties::ID_VALUE:
-        m_blockCallback = true;
-        if (btn->isCheckable ())
-          {
-            Matrix value = up.get_value ().matrix_value ();
+          if (value.numel () > 0)
+            {
+              double dValue = value(0);
 
-            if (value.numel () > 0)
-              {
-                double dValue = value(0);
+              if (dValue != 0.0 && dValue != 1.0)
+                warning ("button value not within valid display range");
+              else if (dValue == up.get_min () && btn->isChecked ())
+                {
+                  btn->setChecked (false);
+                  if (up.style_is ("radiobutton") || up.style_is ("togglebutton"))
+                    {
+                      gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
 
-                if (dValue != 0.0 && dValue != 1.0)
-                  warning ("button value not within valid display range");
-                else if (dValue == up.get_min () && btn->isChecked ())
-                  {
-                    btn->setChecked (false);
-                    if (up.style_is ("radiobutton") || up.style_is ("togglebutton"))
-                      {
-                        gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
+                      Object *parent = Object::parentObject (m_interpreter, gh_mgr.get_object (up.get___myhandle__ ()));
+                      ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent);
+                      if (btnGroup)
+                        btnGroup->selectNothing ();
+                    }
+                }
+              else if (dValue == up.get_max () && ! btn->isChecked ())
+                btn->setChecked (true);
+            }
+        }
+      m_blockCallback = false;
+      break;
 
-                        Object *parent = Object::parentObject (m_interpreter, gh_mgr.get_object (up.get___myhandle__ ()));
-                        ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent);
-                        if (btnGroup)
-                          btnGroup->selectNothing ();
-                      }
-                  }
-                else if (dValue == up.get_max () && ! btn->isChecked ())
-                  btn->setChecked (true);
-              }
-          }
-        m_blockCallback = false;
-        break;
+    default:
+      BaseControl::update (pId);
+      break;
+    }
+}
 
-      default:
-        BaseControl::update (pId);
-        break;
-      }
-  }
+void
+ButtonControl::toggled (bool checked)
+{
+  QAbstractButton *btn = qWidget<QAbstractButton> ();
 
-  void
-  ButtonControl::toggled (bool checked)
-  {
-    QAbstractButton *btn = qWidget<QAbstractButton> ();
+  if (! m_blockCallback && btn->isCheckable ())
+    {
+      gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
+
+      octave::autolock guard (gh_mgr.graphics_lock ());
 
-    if (! m_blockCallback && btn->isCheckable ())
-      {
-        gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
+      uicontrol::properties& up = properties<uicontrol> ();
 
-        octave::autolock guard (gh_mgr.graphics_lock ());
-
-        uicontrol::properties& up = properties<uicontrol> ();
-
-        Matrix oldValue = up.get_value ().matrix_value ();
-        double newValue = (checked ? up.get_max () : up.get_min ());
+      Matrix oldValue = up.get_value ().matrix_value ();
+      double newValue = (checked ? up.get_max () : up.get_min ());
 
-        if (oldValue.numel () != 1 || (newValue != oldValue(0)))
-          emit gh_set_event (m_handle, "value", newValue, false);
-        emit gh_callback_event (m_handle, "callback");
-      }
-  }
+      if (oldValue.numel () != 1 || (newValue != oldValue(0)))
+        emit gh_set_event (m_handle, "value", newValue, false);
+      emit gh_callback_event (m_handle, "callback");
+    }
+}
 
-  void
-  ButtonControl::clicked (void)
-  {
-    QAbstractButton *btn = qWidget<QAbstractButton> ();
+void
+ButtonControl::clicked (void)
+{
+  QAbstractButton *btn = qWidget<QAbstractButton> ();
 
-    if (! btn->isCheckable ())
-      emit gh_callback_event (m_handle, "callback");
-  }
+  if (! btn->isCheckable ())
+    emit gh_callback_event (m_handle, "callback");
+}
 
 OCTAVE_END_NAMESPACE(octave);