Mercurial > octave

diff libgui/graphics/SliderControl.cc @ 19967:3cc0734283dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes in Qt graphics code * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc: Follow a few more Octave coding conventions.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Mar 2015 12:27:54 -0400
parents fe0e34be5576
children f0e61a67ad9f
line wrap: on
line diff
--- a/libgui/graphics/SliderControl.cc	Thu Mar 19 12:25:28 2015 -0400
+++ b/libgui/graphics/SliderControl.cc	Thu Mar 19 12:27:54 2015 -0400
@@ -35,7 +35,8 @@
 namespace QtHandles
 {
 
-SliderControl* SliderControl::create (const graphics_object& go)
+SliderControl*
+SliderControl::create (const graphics_object& go)
 {
   Object* parent = Object::parentObject (go);
 
@@ -52,7 +53,7 @@
 
 SliderControl::SliderControl (const graphics_object& go,
                               QAbstractSlider* slider)
-    : BaseControl (go, slider), m_blockUpdates (false)
+  : BaseControl (go, slider), m_blockUpdates (false)
 {
   uicontrol::properties& up = properties<uicontrol> ();
 
@@ -80,7 +81,8 @@
 {
 }
 
-void SliderControl::update (int pId)
+void
+SliderControl::update (int pId)
 {
   uicontrol::properties& up = properties<uicontrol> ();
   QScrollBar* slider = qWidget<QScrollBar> ();
@@ -88,36 +90,39 @@
   switch (pId)
     {
     case uicontrol::properties::ID_SLIDERSTEP:
-        {
-          Matrix steps = up.get_sliderstep ().matrix_value ();
+      {
+        Matrix steps = up.get_sliderstep ().matrix_value ();
 
-          slider->setSingleStep (xround (steps(0) * RANGE_INT_MAX));
-          slider->setPageStep (xround (steps(1) * RANGE_INT_MAX));
-        }
+        slider->setSingleStep (xround (steps(0) * RANGE_INT_MAX));
+        slider->setPageStep (xround (steps(1) * RANGE_INT_MAX));
+      }
       break;
+
     case uicontrol::properties::ID_VALUE:
-        {
-          Matrix value = up.get_value ().matrix_value ();
-          double dmax = up.get_max (), dmin = up.get_min ();
+      {
+        Matrix value = up.get_value ().matrix_value ();
+        double dmax = up.get_max (), dmin = up.get_min ();
 
-          if (value.numel () > 0)
-            {
-              int ival = xround (((value(0) - dmin) / (dmax - dmin))
-                                 * RANGE_INT_MAX);
+        if (value.numel () > 0)
+          {
+            int ival = xround (((value(0) - dmin) / (dmax - dmin))
+                               * RANGE_INT_MAX);
 
-              m_blockUpdates = true;
-              slider->setValue (ival);
-              m_blockUpdates = false;
-            }
-        }
+            m_blockUpdates = true;
+            slider->setValue (ival);
+            m_blockUpdates = false;
+          }
+      }
       break;
+
     default:
       BaseControl::update (pId);
       break;
     }
 }
 
-void SliderControl::valueChanged (int ival)
+void
+SliderControl::valueChanged (int ival)
 {
   if (! m_blockUpdates)
     {