[Kst] branches/work/kst/1.6/kst/src/libkstapp

[Andrew Walker]

SVN commit 763232 by arwalker:

BUG:129489 Correctly handle auto-labelling of axes and title.

 M  +0 -1      kst.cpp  
 M  +3 -3      kst2dplot.cpp  
 M  +3 -1      kstmatrixtable.cpp  
 M  +2 -0      kstviewmatricesdialog_i.cpp  
 M  +1 -1      kstviewvectorsdialog_i.cpp  


--- branches/work/kst/1.6/kst/src/libkstapp/kst.cpp #763231:763232
@@ -2084,7 +2084,6 @@
 
 
 void KstApp::updateDataDialogs(bool dm, bool vm) {
-
   ViewScalarsDialogAction->setEnabled(viewScalarsDialog->hasContent());
   ViewStringsDialogAction->setEnabled(viewStringsDialog->hasContent());
   ViewVectorsDialogAction->setEnabled(viewVectorsDialog->hasContent());
--- branches/work/kst/1.6/kst/src/libkstapp/kst2dplot.cpp #763231:763232
@@ -3218,13 +3218,13 @@
   EscapeSpecialChars(ylabel);
   EscapeSpecialChars(toplabel);
 
-  if (xl || _autoLabelX) {
+  if (xl && _autoLabelX) {
     _xLabel->setText(xlabel);
   }
-  if (yl || _autoLabelY) {
+  if (yl && _autoLabelY) {
     _yLabel->setText(ylabel);
   }
-  if (tl || _autoLabelTop) {
+  if (tl && _autoLabelTop) {
     _topLabel->setText(toplabel);
   }
 }
--- branches/work/kst/1.6/kst/src/libkstapp/kstmatrixtable.cpp #763231:763232
@@ -35,7 +35,7 @@
   KstMatrixPtr matrix = *KST::matrixList.findTag(_strMatrix);
   QString str;
   double value;
-  
+
   painter->eraseRect( 0, 0, cr.width(), cr.height() );
   if (selected) {
     painter->fillRect( 0, 0, cr.width(), cr.height(), cg.highlight() );
@@ -50,6 +50,8 @@
     value = matrix->valueRaw(col, row, &ok);
     if (ok) {
       str.setNum(value, 'g', 16);
+    } else {
+      str = "-";
     }
   }
 
--- branches/work/kst/1.6/kst/src/libkstapp/kstviewmatricesdialog_i.cpp #763231:763232
@@ -101,6 +101,8 @@
 void KstViewMatricesDialogI::matrixChanged(const QString& matrix) {
   updateViewMatricesDialog(matrix);
   _tableMatrices->setMatrix(matrix);
+  _tableMatrices->hide();
+  _tableMatrices->show();
   _tableMatrices->update();
 }
 
--- branches/work/kst/1.6/kst/src/libkstapp/kstviewvectorsdialog_i.cpp #763231:763232
@@ -42,7 +42,7 @@
   layout2->insertWidget(1, tableVectors);
 
   connect(Cancel, SIGNAL(clicked()), this, SLOT(close()));
-  connect(vectorSelector, SIGNAL(selectionChanged(const QString&)), this, SLOT( vectorChanged(const QString&)));
+  connect(vectorSelector, SIGNAL(selectionChanged(const QString&)), this, SLOT(vectorChanged(const QString&)));
   connect(vectorSelector, SIGNAL(newVectorCreated(const QString&)), this, SLOT(vectorChanged(const QString&)));
 
   if (tableVectors->numCols() != 2) {