[Kst] extragear/graphics/kst/kst

[Rick Chern]

SVN commit 434582 by rchern:

- force update on matrix before calculating auto-threshold in image dialog
- "Image: " in 2dplot context menu
- fix gradient direction

 M  +1 -1      kst2dplot.cpp  
 M  +3 -0      kstimagedialog_i.cpp  
 M  +2 -5      kstmatrixdialog_i.cpp  
 M  +2 -2      kstsmatrix.cpp  
 M  +6 -0      matrixdialog.ui  


--- trunk/extragear/graphics/kst/kst/kst2dplot.cpp #434581:434582
@@ -3575,7 +3575,7 @@
   for (i = n_curves; i < n_images + n_curves; i++) {
     const QString& tag = _images[i-n_curves]->tagName();
     _imageEditMap[i] = tag;
-    submenu->insertItem(tag, i);
+    submenu->insertItem(i18n("Type: Name", "Image: %1").arg(tag), i);
     submenu->connectItem(i, this, SLOT(editImage(int)));
     // get matrix for the image...
     KstMatrixPtr matrix = _images[i-n_curves]->matrix();
--- trunk/extragear/graphics/kst/kst/kstimagedialog_i.cpp #434581:434582
@@ -492,10 +492,13 @@
     KstMatrixPtr matrix = *matrices.findTag(_matrix->selectedMatrix());
     if (matrix) {
       // force update
+      _autoThreshold->setEnabled(false);
+      matrix->update(true);
       matrix->readLock();
       _lowerZ->setText(QString::number(matrix->minZ()));
       _upperZ->setText(QString::number(matrix->maxZ()));
       matrix->readUnlock();
+      _autoThreshold->setEnabled(true);
     }
   }
 }
--- trunk/extragear/graphics/kst/kst/kstmatrixdialog_i.cpp #434581:434582
@@ -730,7 +730,7 @@
 
 
 void KstMatrixDialogI::populateEditMultipleRMatrix() {
-  KstRMatrixList mxList = kstObjectSubList<KstDataObject,KstRMatrix>(KST::dataObjectList);
+  KstRMatrixList mxList = kstObjectSubList<KstMatrix,KstRMatrix>(KST::matrixList);
   editMultipleWidget->objectList->insertStringList(mxList.tagNames());
   
   // intermediate state for multiple edit
@@ -775,7 +775,7 @@
 
 
 void KstMatrixDialogI::populateEditMultipleSMatrix() {
-  KstSMatrixList mxList = kstObjectSubList<KstDataObject,KstSMatrix>(KST::dataObjectList);
+  KstSMatrixList mxList = kstObjectSubList<KstMatrix,KstSMatrix>(KST::matrixList);
   editMultipleWidget->objectList->insertStringList(mxList.tagNames());
   
   // intermediate state for multiple edit
@@ -1020,9 +1020,6 @@
   _inTest = false;
 }
 
-
-
     
-    
 #include "kstmatrixdialog_i.moc"
 // vim: ts=2 sw=2 et
--- trunk/extragear/graphics/kst/kst/kstsmatrix.cpp #434581:434582
@@ -137,9 +137,9 @@
   for (int i = 0; i < _nY; i++) {
     for (int j = 0; j < _nX; j++) {
       if (_xDirection) {
+        _z[i*nX + j] = _gradZMin + i*zIncrement;
+      } else {
         _z[i*nX + j] = _gradZMin + j*zIncrement;
-      } else {
-        _z[i*nX + j] = _gradZMin + i*zIncrement;
       }
     }  
   }
--- trunk/extragear/graphics/kst/kst/matrixdialog.ui #434581:434582
@@ -583,6 +583,9 @@
                             <property name="name">
                                 <cstring>_nX</cstring>
                             </property>
+                            <property name="maxValue">
+                                <number>999999999</number>
+                            </property>
                             <property name="minValue">
                                 <number>1</number>
                             </property>
@@ -591,6 +594,9 @@
                             <property name="name">
                                 <cstring>_nY</cstring>
                             </property>
+                            <property name="maxValue">
+                                <number>999999999</number>
+                            </property>
                         </widget>
                         <widget class="QLineEdit" row="0" column="1">
                             <property name="name">