fixed bug: using mouse wheel on spinbox with dial could cause program…

… crash
buddhi1980 · Apr 7, 2018 · 7d50dc8 · 7d50dc8
1 parent f999b50
commit 7d50dc8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 61 deletions.
diff --git a/mandelbulber2/deploy/NEWS b/mandelbulber2/deploy/NEWS
@@ -1,8 +1,11 @@
 Version history
 
+v2.13-2
+- UI: fixed bug: using mouse wheel on spinbox with dial could cause program crash
+
 v2.13-1 (April 2018)
-- Mesh Export: Fixed bug: Mesh Export disn't provide cMaterial data. It caused crash when fractal color was calculated
-- OpenCL: SSAO used double precission constants and variables
+- Mesh Export: Fixed bug: Mesh Export didn't provide cMaterial data. It caused crash when fractal color was calculated
+- OpenCL: SSAO used double precision constants and variables
 
 v2.13 (March 2018)
 - Fractals: renamed all fabs() to abs() in all formula UI

diff --git a/mandelbulber2/deploy/README b/mandelbulber2/deploy/README
@@ -1,5 +1,5 @@
 
-                              MANDELBULBER 2.13-1
+                              MANDELBULBER 2.13-2
 
 1. What is Mandelbulber
 -----------------------

diff --git a/mandelbulber2/deploy/README-osx.txt b/mandelbulber2/deploy/README-osx.txt
@@ -1,5 +1,5 @@
 
-                              MANDELBULBER 2.11
+                              MANDELBULBER 2.13-2
 
 1. What is Mandelbulber
 -----------------------

diff --git a/mandelbulber2/deploy/README-win32.txt b/mandelbulber2/deploy/README-win32.txt
@@ -1,5 +1,5 @@
 
-                                 MANDELBULBER 2.13-1
+                                 MANDELBULBER 2.13-2
 
 1. What is Mandelbulber
 -----------------------

diff --git a/mandelbulber2/formula/ui/fractal_amazing_surf_mod2.ui b/mandelbulber2/formula/ui/fractal_amazing_surf_mod2.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>amazing_surf_mod2</class>
+ <class>Form</class>
  <widget class="QWidget" name="Form">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>1321</width>
-    <height>6977</height>
+    <height>4095</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -466,7 +466,7 @@
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cpixel is CVector3 c = ( c.x, c.y, c.z). It is each original point (pixel) in 3D space where the iteration starts from, ( c = original z for each point .) It is commonly found in formula structures z = f(z) + c.&lt;/p&gt;&lt;p&gt;The Cpixel multiplier effectively scales this point &amp;quot;c&amp;quot;.&lt;/p&gt;&lt;p&gt;This transform allows the swapping of the order of the &amp;quot;CVector3 c&amp;quot; components before being multiplied by &amp;quot;CVector3 z&amp;quot; components.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="title">
-      <string>Invert C co&amp;nstant</string>
+      <string>&amp;Invert C constant</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -659,7 +659,7 @@
         </font>
        </property>
        <property name="title">
-        <string>&amp;Fold Tweak</string>
+        <string>Fo&amp;ld Tweak</string>
        </property>
        <property name="checkable">
         <bool>true</bool>
@@ -1731,7 +1731,7 @@
    <item>
     <widget class="MyGroupBox" name="groupCheck_transf_function_enabledAy">
      <property name="title">
-      <string>Standard &amp;Functions Enabled</string>
+      <string>Standard Functions Ena&amp;bled</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -2298,19 +2298,6 @@ offset:</string>
          </item>
          <item>
           <layout class="QGridLayout" name="gridLayout_10">
-           <item row="1" column="0">
-            <widget class="QDial" name="dial3_mandelbox_rotation_main_x">
-             <property name="minimum">
-              <number>-18000</number>
-             </property>
-             <property name="maximum">
-              <number>18000</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
            <item row="0" column="2">
             <widget class="QLabel" name="label_18">
              <property name="text">
@@ -2322,32 +2309,6 @@ offset:</string>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QDial" name="dial3_mandelbox_rotation_main_y">
-             <property name="minimum">
-              <number>-18000</number>
-             </property>
-             <property name="maximum">
-              <number>18000</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="2">
-            <widget class="QDial" name="dial3_mandelbox_rotation_main_z">
-             <property name="minimum">
-              <number>-18000</number>
-             </property>
-             <property name="maximum">
-              <number>18000</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
             <widget class="MyDoubleSpinBox" name="spinboxd3_mandelbox_rotation_main_y">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -2395,7 +2356,7 @@ offset:</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="2">
+           <item row="1" column="2">
             <widget class="MyDoubleSpinBox" name="spinboxd3_mandelbox_rotation_main_z">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -2423,7 +2384,7 @@ offset:</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="0">
+           <item row="1" column="0">
             <widget class="MyDoubleSpinBox" name="spinboxd3_mandelbox_rotation_main_x">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -2468,7 +2429,7 @@ offset:</string>
       </font>
      </property>
      <property name="title">
-      <string>aux.color &amp;components</string>
+      <string>a&amp;ux.color components</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -3052,9 +3013,6 @@ offset:</string>
   <tabstop>groupCheck_mandelbox_main_rotation_enabled</tabstop>
   <tabstop>spinboxInt_transf_start_iterations_R</tabstop>
   <tabstop>spinboxInt_transf_stop_iterations_R</tabstop>
-  <tabstop>dial3_mandelbox_rotation_main_x</tabstop>
-  <tabstop>dial3_mandelbox_rotation_main_y</tabstop>
-  <tabstop>dial3_mandelbox_rotation_main_z</tabstop>
   <tabstop>spinboxd3_mandelbox_rotation_main_x</tabstop>
   <tabstop>spinboxd3_mandelbox_rotation_main_y</tabstop>
   <tabstop>spinboxd3_mandelbox_rotation_main_z</tabstop>

diff --git a/mandelbulber2/msvc/mandelbulber2.rc b/mandelbulber2/msvc/mandelbulber2.rc
@@ -61,8 +61,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,13,1,0
- PRODUCTVERSION 2,13,1,0
+ FILEVERSION 2,13,2,0
+ PRODUCTVERSION 2,13,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Mandelbulber Team"
             VALUE "FileDescription", "Mandelbulber generates three-dimensional fractals."
-            VALUE "FileVersion", "2.13.1.0"
+            VALUE "FileVersion", "2.13.2.0"
             VALUE "InternalName", "mandelbulber2.exe"
             VALUE "LegalCopyright", "Copyright (C) 2018 Mandelbulber Team"
             VALUE "OriginalFilename", "mandelbulber2.exe"
             VALUE "ProductName", "Mandelbulber"
-            VALUE "ProductVersion", "2.13.1.0"
+            VALUE "ProductVersion", "2.13.2.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/mandelbulber2/qt/frame_slider_popup.cpp b/mandelbulber2/qt/frame_slider_popup.cpp
@@ -93,7 +93,9 @@ void cFrameSliderPopup::sliderReleased()
 {
 	if (!integerMode)
 	{
+		blockSignals(true);
 		ui->slider->setValue(500);
+		blockSignals(false);
 	}
 }
 
@@ -143,12 +145,16 @@ void cFrameSliderPopup::SetDialMode(int scale, double val)
 
 void cFrameSliderPopup::slotUpdateValue(int val)
 {
+	blockSignals(true);
 	ui->slider->setValue(val);
+	blockSignals(false);
 }
 
 void cFrameSliderPopup::slotUpdateValue(double val)
 {
+	blockSignals(true);
 	ui->dial->setValue(val * dialScale);
+	blockSignals(false);
 }
 
 void cFrameSliderPopup::slotDialValueChanged(int val)

diff --git a/mandelbulber2/src/system.hpp b/mandelbulber2/src/system.hpp
@@ -35,8 +35,8 @@
 #ifndef MANDELBULBER2_SRC_SYSTEM_HPP_
 #define MANDELBULBER2_SRC_SYSTEM_HPP_
 
-#define MANDELBULBER_VERSION 2.131
-#define MANDELBULBER_VERSION_STRING "2.13-1"
+#define MANDELBULBER_VERSION 2.132
+#define MANDELBULBER_VERSION_STRING "2.13-2"
 #define TO_STRING(a) #a
 
 #ifdef _WIN32 /* WINDOWS */