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

[Barth Netterfield]

SVN commit 911462 by netterfield:

-Select smaller fonts when creating many plots from the data wizard
-allow layout mode mouse actions to work again.
-stuck 'debug' in the .pro files - can't tell if this is necessary
  but we can take it out later.



 M  +0 -8      devel-docs/Kst2Specs/Bugs  
 M  +13 -1     devel-docs/Kst2Specs/FixedBugs  
 M  +1 -0      src/datasources/ascii/ascii.pro  
 M  +1 -0      src/datasources/dirfilesource/dirfilesource.pro  
 M  +1 -0      src/datasources/fitsimage/fitsimage.pro  
 M  +1 -0      src/datasources/lfiio/lfiio.pro  
 M  +1 -0      src/kst/kst.pro  
 M  +1 -0      src/libkst/libkst.pro  
 M  +10 -2     src/libkstapp/datawizard.cpp  
 M  +3 -0      src/libkstapp/labeltab.ui  
 M  +1 -0      src/libkstapp/libkstapp.pro  
 M  +7 -3      src/libkstapp/plotitem.cpp  
 M  +1 -0      src/libkstmath/libkstmath.pro  
 M  +1 -0      src/widgets/widgets.pro  


--- branches/work/kst/portto4/kst/devel-docs/Kst2Specs/Bugs #911461:911462
@@ -87,13 +87,7 @@
 
 ---------
 
-datawizard generated multiple plots per view have the font size for
-the lables way too big (so big that, in the case of 24 plots), the axis
-labels take up >75% of the real estate. �The wizard should chose the font
-based on the number of plots that will be in the tlv when finished.
 
---------
-
 The first pane of the data wizard should be reading directories in
 the background, instead of in the foreground where it steals X focus
 until the directory is read. �I ran into a interminable-focus-stealing
@@ -133,5 +127,3 @@
 individual plots (which is good).  But: when you un-tie one of several plots, perhaps
 the tied zoom button should become disabled, as you are no longer in all-tied zoom mode.
 
---------
-
--- branches/work/kst/portto4/kst/devel-docs/Kst2Specs/FixedBugs #911461:911462
@@ -259,4 +259,16 @@
 It rotates around an end point.
 This problem doesn't happen with boxes.
 *Mike*
---------
\ No newline at end of file
+--------
+
+datawizard generated multiple plots per view have the font size for
+the lables way too big (so big that, in the case of 24 plots), the axis
+labels take up >75% of the real estate. �The wizard should chose the font
+based on the number of plots that will be in the tlv when finished.
+
+--------
+
+Clicking in a plot when in *layout* mode brings up the plot edit dialog.
+This should only happen in *zoom* mode!  The way it is now, you can't 
+move or resize plots.
+
--- branches/work/kst/portto4/kst/src/datasources/ascii/ascii.pro #911461:911462
@@ -8,6 +8,7 @@
 MOC_DIR = tmp
 TARGET = kstdata_ascii
 DESTDIR = $$OUTPUT_DIR/plugin
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.pro #911461:911462
@@ -8,6 +8,7 @@
 MOC_DIR = tmp
 TARGET = kstdata_dirfilesource
 DESTDIR = $$OUTPUT_DIR/plugin
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/datasources/fitsimage/fitsimage.pro #911461:911462
@@ -8,6 +8,7 @@
 MOC_DIR = tmp
 TARGET = kstdata_fitsimage
 DESTDIR = $$OUTPUT_DIR/plugin
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/datasources/lfiio/lfiio.pro #911461:911462
@@ -8,6 +8,7 @@
 MOC_DIR = tmp
 TARGET = kstdata_lfiio
 DESTDIR = $$OUTPUT_DIR/plugin
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/kst/kst.pro #911461:911462
@@ -5,6 +5,7 @@
 MOC_DIR = tmp
 TARGET = kst
 DESTDIR = $$OUTPUT_DIR/bin
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #911461:911462
@@ -8,6 +8,7 @@
 TARGET = kst
 DESTDIR = $$OUTPUT_DIR/lib
 win32:CONFIG += staticlib
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #911461:911462
@@ -906,8 +906,16 @@
     Q_ASSERT(plotItem);
 
 
-//     double fontScale = ApplicationSettings::self()->referenceFontSize()/sqrt(plotList.count()) - ApplicationSettings::self()->referenceFontSize();
-// qDebug() << " proposed font scale:" << fontScale;
+    double fontScale = ApplicationSettings::self()->referenceFontSize()/sqrt(plotList.count()) - ApplicationSettings::self()->referenceFontSize()+ApplicationSettings::self()->referenceFontSize()/3;
+    if (fontScale>0) fontScale = 0;
+
+    plotItem->setGlobalFontScale(fontScale);
+    plotItem->setLeftLabelFontScale(fontScale);
+    plotItem->setTopLabelFontScale(fontScale);
+    plotItem->setRightLabelFontScale(fontScale);
+    plotItem->setBottomLabelFontScale(fontScale);
+    plotItem->setNumberLabelFontScale(fontScale);
+
     if (!xLabels) {
       plotItem->setLeftLabelOverride(QString(" "));
       plotItem->setRightLabelOverride(QString(" "));
--- branches/work/kst/portto4/kst/src/libkstapp/labeltab.ui #911461:911462
@@ -31,6 +31,9 @@
      <property name="decimals" >
       <number>1</number>
      </property>
+     <property name="minimum" >
+      <double>-25.000000000000000</double>
+     </property>
     </widget>
    </item>
    <item row="0" column="4" >
--- branches/work/kst/portto4/kst/src/libkstapp/libkstapp.pro #911461:911462
@@ -8,6 +8,7 @@
 TARGET = kstapp
 DESTDIR = $$OUTPUT_DIR/lib
 win32:CONFIG += staticlib
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #911461:911462
@@ -2214,9 +2214,13 @@
 
 void PlotItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
   if (event->button() == Qt::LeftButton) {
-    edit();
-    event->ignore();
-  }
+    if (parentView()->viewMode() == View::Data) {
+      edit();
+      event->ignore();
+    } else {
+      ViewItem::mousePressEvent(event);
+    }
+  } 
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstmath/libkstmath.pro #911461:911462
@@ -8,6 +8,7 @@
 TARGET = kstmath
 DESTDIR = $$OUTPUT_DIR/lib
 win32:CONFIG += staticlib
+CONFIG += debug
 
 INCLUDEPATH += \
     tmp \
--- branches/work/kst/portto4/kst/src/widgets/widgets.pro #911461:911462
@@ -8,6 +8,7 @@
 MOC_DIR = tmp
 TARGET = kstwidgets
 win32:CONFIG += staticlib
+CONFIG += debug
 
 
 target.path = $$[QT_INSTALL_PLUGINS]/designer