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

[Andrew Walker]

SVN commit 739830 by arwalker:

BUG:152616 correctly escape scalar names used in setting plot axes ranges

 M  +37 -4     kst2dplotwidget_i.cpp  
 M  +4 -0      kst2dplotwidget_i.h  


--- branches/work/kst/1.6/kst/src/libkstapp/kst2dplotwidget_i.cpp #739829:739830
@@ -81,10 +81,10 @@
   connect(XExpression, SIGNAL(toggled(bool)), this, SLOT(updateButtons()));
   connect(YExpression, SIGNAL(toggled(bool)), this, SLOT(updateButtons()));
 
-  connect(scalarSelectorX1, SIGNAL(activated(const QString&)), XExpressionMin, SLOT(insert(const QString&)));
-  connect(scalarSelectorY1, SIGNAL(activated(const QString&)), YExpressionMin, SLOT(insert(const QString&)));
-  connect(scalarSelectorX2, SIGNAL(activated(const QString&)), XExpressionMax, SLOT(insert(const QString&)));
-  connect(scalarSelectorY2, SIGNAL(activated(const QString&)), YExpressionMax, SLOT(insert(const QString&)));
+  connect(scalarSelectorX1, SIGNAL(activated(const QString&)), this, SLOT(insertXExpressionMin(const QString&)));
+  connect(scalarSelectorY1, SIGNAL(activated(const QString&)), this, SLOT(insertYExpressionMin(const QString&)));
+  connect(scalarSelectorX2, SIGNAL(activated(const QString&)), this, SLOT(insertXExpressionMax(const QString&)));
+  connect(scalarSelectorY2, SIGNAL(activated(const QString&)), this, SLOT(insertYExpressionMax(const QString&)));
 
   // adding/removing curves
   connect(DisplayedCurveList, SIGNAL(clicked(QListBoxItem*)), this, SLOT(updateButtons()));
@@ -1461,4 +1461,37 @@
   ShowLegend->setChecked(true);
 }
 
+void Kst2dPlotWidget::insertXExpressionMin(const QString& strIn) {
+  QString str;
+
+  str = "["+strIn+"]";
+
+  XExpressionMin->insert(str);
+}
+
+void Kst2dPlotWidget::insertYExpressionMin(const QString& strIn) {
+  QString str;
+
+  str = "["+strIn+"]";
+
+  YExpressionMin->insert(str);
+}
+
+void Kst2dPlotWidget::insertXExpressionMax(const QString& strIn) {
+  QString str;
+
+  str = "["+strIn+"]";
+
+  XExpressionMax->insert(str);
+}
+
+void Kst2dPlotWidget::insertYExpressionMax(const QString& strIn) {
+  QString str;
+
+  str = "["+strIn+"]";
+
+  YExpressionMax->insert(str);
+}
+
+
 #include "kst2dplotwidget_i.moc"
--- branches/work/kst/1.6/kst/src/libkstapp/kst2dplotwidget_i.h #739829:739830
@@ -59,6 +59,10 @@
     void setScalarDestYLabel();
     void setScalarDestTopLabel();
     void editLegend();
+    void insertXExpressionMin(const QString&);
+    void insertYExpressionMin(const QString&);
+    void insertXExpressionMax(const QString&);
+    void insertYExpressionMax(const QString&);
 
   private:
     void populateEditMultiple(QRadioButton *radioButtonWidget);