[kimageprocess-devel] kimageprocess/src kimageprocessoptions_ui.ui kttextureoptions.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17044/src

Modified Files:
	kimageprocessoptions_ui.ui kttextureoptions.cpp 
Log Message:
- Now it is possible to choose wheter to use normalization


Index: kimageprocessoptions_ui.ui
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocessoptions_ui.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kimageprocessoptions_ui.ui	27 Jun 2005 19:51:04 -0000	1.3
+++ kimageprocessoptions_ui.ui	7 Jul 2005 14:54:33 -0000	1.4
@@ -72,6 +72,17 @@
                         </sizepolicy>
                     </property>
                 </widget>
+                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>chkNormalize</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Normali&amp;ze Results</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+Z</string>
+                    </property>
+                </widget>
             </grid>
         </widget>
         <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
@@ -133,7 +144,7 @@
                         <cstring>rbnSame</cstring>
                     </property>
                     <property name="text">
-                        <string>Same as image</string>
+                        <string>Same &amp;as image</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>

Index: kttextureoptions.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/kttextureoptions.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kttextureoptions.cpp	7 Jul 2005 03:19:54 -0000	1.8
+++ kttextureoptions.cpp	7 Jul 2005 14:54:34 -0000	1.9
@@ -27,6 +27,7 @@
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qregexp.h>
+#include <qcheckbox.h>
 
 #include <kconfig.h>
 #include <klocale.h>
@@ -123,6 +124,9 @@
         if (itClassifier.current() == activeClassifier)
             m_ui->cmbClassifier->setCurrentItem(m_ui->cmbClassifier->count()-1);
     }
+
+    //normalization
+    m_ui->chkNormalize->setChecked(KTCalculation::self()->useNormalization());
 }
 
 void KTTextureOptions::save()
@@ -145,6 +149,8 @@
 
     QString classifier = m_ui->cmbClassifier->currentText();
     KTPluginManager::self()->setClassifier(classifier);
+
+    KTCalculation::self()->setUseNormalization(m_ui->chkNormalize->isChecked());
 }
 
 void KTTextureOptions::enableIterations(bool on)