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

[Barth Netterfield]

SVN commit 1234992 by netterfield:

BUG:
Don't treat an 'e' in strings (eg, Minutes) in axis number labels as if it were a number.



 M  +8 -1      plotitem.cpp  
 M  +2 -1      plotitem.h  
 M  +13 -5     stringtab.ui  


--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #1234991:1234992
@@ -1376,8 +1376,15 @@
   QRectF r = rec;
   QStringList base_mantisa = text.split('e');
 
-  //painter->drawRect(r);
+  if (base_mantisa.size()>1) {
+    if (base_mantisa[1][0].isLetter()) {
+      qDebug() << "base mantisa[0]" << base_mantisa[0];
+      base_mantisa.clear();
+      base_mantisa.append(text);
+    }
+  }
 
+
   if (base_mantisa.size()<=1) {
     painter->drawText(r, flags, text);
   } else {
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.h #1234991:1234992
@@ -324,7 +324,8 @@
 
     void setPlotBordersDirty(bool dirty = true);
 
-    virtual void edit(PlotClickEditRegion region=CONTENT);
+    virtual void edit(PlotClickEditRegion region);
+    virtual void edit() {edit(CONTENT);}
     void plotMaximize();
     void redrawPlot();
     void setPlotRectsDirty();
--- branches/work/kst/portto4/kst/src/libkstapp/stringtab.ui #1234991:1234992
@@ -170,16 +170,24 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
+   <class>Kst::ComboBox</class>
+   <extends>QComboBox</extends>
+   <header>combobox.h</header>
+  </customwidget>
+  <customwidget>
    <class>Kst::DataSourceSelector</class>
    <extends>QWidget</extends>
    <header>datasourceselector.h</header>
   </customwidget>
-  <customwidget>
-   <class>Kst::ComboBox</class>
-   <extends>QComboBox</extends>
-   <header>combobox.h</header>
-  </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>_generatedStringGroup</tabstop>
+  <tabstop>_stringValue</tabstop>
+  <tabstop>_dataStringGroup</tabstop>
+  <tabstop>_field</tabstop>
+  <tabstop>_connect</tabstop>
+  <tabstop>_configure</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>