patch_for_bug_1805.txt

Patch for this minor issue. - gcarrillo -, 2009-07-25 01:56 PM

Download (1.94 KB)

 
1
Index: src/app/qgssinglesymboldialog.h
2
===================================================================
3
--- src/app/qgssinglesymboldialog.h	(revision: 11107)
4
+++ src/app/qgssinglesymboldialog.h	(copia de trabajo)
5
@@ -74,6 +74,7 @@
6
     /** Default constructor is private, do not use this */
7
     QgsSingleSymbolDialog();
8
     QString mTexturePath;
9
+    bool isEqual( double x, double y );
10

    
11
   signals:
12
     void settingsChanged();
13
Index: src/app/qgssinglesymboldialog.cpp
14
===================================================================
15
--- src/app/qgssinglesymboldialog.cpp	(revision: 11107)
16
+++ src/app/qgssinglesymboldialog.cpp	(copia de trabajo)
17
@@ -31,6 +31,8 @@
18
 #include <QImage>
19
 #include <QFileDialog>
20
 #include <QListWidgetItem>
21
+#include <cmath>
22

    
23
 #define DO_NOT_USE_STR "<off>"
24

    
25
@@ -439,7 +441,7 @@
26
   if ( lstSymbols->isEnabled() && lstSymbols->currentItem()->data( Qt::UserRole ).toString() != sy->pointSymbolName() )
27
     lstSymbols->setEnabled( false );
28

    
29
-  if ( mPointSizeSpinBox->isEnabled() && mPointSizeSpinBox->value() != sy->pointSize() )
30
+  if ( mPointSizeSpinBox->isEnabled() && !isEqual( mPointSizeSpinBox->value(), sy->pointSize() ) )
31
     mPointSizeSpinBox->setEnabled( false );
32

    
33
   if ( mRotationClassificationComboBox->isEnabled() &&
34
@@ -450,7 +452,7 @@
35
        mScaleClassificationComboBox->itemData( mScaleClassificationComboBox->currentIndex() ).toInt() != sy->scaleClassificationField() )
36
     mScaleClassificationComboBox->setEnabled( false );
37

    
38
-  if ( outlinewidthspinbox->isEnabled() && outlinewidthspinbox->value() != sy->pen().widthF() )
39
+  if ( outlinewidthspinbox->isEnabled() && !isEqual( outlinewidthspinbox->value(), sy->pen().widthF() ) )
40
     outlinewidthspinbox->setEnabled( false );
41

    
42
   if ( btnFillColor->isEnabled() &&  btnFillColor->color() != sy->brush().color() )
43
@@ -591,3 +593,7 @@
44

    
45
 }
46

    
47
+bool QgsSingleSymbolDialog::isEqual( double x, double y )
48
+{
49
+    return std::fabs( x - y ) <= 0.0001;
50
+}
51
\ No newline at end of file