[Kst] kdeextragear-2/kst/kst

[Barth Netterfield]

CVS commit by netterfield: 

BUG: 
Data wizard layout cleanup was broken for new windows.  This fixes it.
Temp. get rid of debug statements.


  M +7 -1      datawizard.ui.h   1.102
  M +1 -1      kst2dplot.cpp   1.333
  M +1 -1      kstplotgroup.cpp   1.25
  M +1 -1      ksttoplevelview.cpp   1.85
  M +2 -2      kstviewobject.cpp   1.106
  M +1 -1      kstviewwidget.cpp   1.61


--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.101:1.102
@@ -547,4 +547,5 @@ void DataWizard::finished()
             }
             if (_newWindows->isChecked()) {
+                w->view()->cleanup(signed(sqrt(plots.count())));
                 newName += "-PSD";
                 QString n = app->newWindow(newName);
@@ -574,4 +575,5 @@ void DataWizard::finished()
             }
             if (_newWindows->isChecked()) {
+                w->view()->cleanup(signed(sqrt(plots.count())));
                 QString n = app->newWindow(newName + "-PSD");
                 w = static_cast<KstViewWindow*>(app->findWindow(n));
@@ -754,5 +756,9 @@ void DataWizard::finished()
 
     if (relayout) {
-        w->view()->cleanup(QMAX(w->view()->columns(), signed(sqrt(plots.count()))));
+      if (_radioButtonPlotDataPSD->isChecked()) {
+        w->view()->cleanup(signed(sqrt(plots.count()/2)));
+      } else {
+        w->view()->cleanup(signed(sqrt(plots.count())));
+      }
     }
     w->view()->paint(P_DATA);

--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.332:1.333
@@ -50,5 +50,5 @@
 
 // if defined, print wallclock benchmarking info about plot drawing...
-#define PLOTBENCH
+//#define PLOTBENCH
 
 #define JD1900                  2415020.5

--- kdeextragear-2/kst/kst/kstplotgroup.cpp  #1.24:1.25
@@ -118,5 +118,5 @@ void KstPlotGroup::saveTag(QTextStream& 
 
 
-#define PAINTTIMER
+//#define PAINTTIMER
 void KstPlotGroup::paint(KstPaintType type, QPainter& p) {
   QRegion clipRegion(geometry());

--- kdeextragear-2/kst/kst/ksttoplevelview.cpp  #1.84:1.85
@@ -80,5 +80,5 @@ void KstTopLevelView::save(QTextStream& 
 
 
-#define PAINTTIMER
+//#define PAINTTIMER
 void KstTopLevelView::paint(KstPaintType type, QPainter& p) {
 #ifdef PAINTTIMER

--- kdeextragear-2/kst/kst/kstviewobject.cpp  #1.105:1.106
@@ -44,5 +44,5 @@ KstViewObject::KstViewObject(const QStri
   _maximized = false;
   updateAspect();
-  _onGrid = true;
+  _onGrid = false;
   _columns = 0;
   _focus = false;
@@ -191,5 +191,5 @@ void KstViewObject::writeUnlock() const 
 
 
-#define PAINTTIMER
+//#define PAINTTIMER
 void KstViewObject::paint(KstPaintType type, QPainter& p) {
   bool hadClipping = p.hasClipping();

--- kdeextragear-2/kst/kst/kstviewwidget.cpp  #1.60:1.61
@@ -265,5 +265,5 @@ void KstViewWidget::paint() {
 
 
-#define PAINTTIMER
+//#define PAINTTIMER
 // Note: e can be null
 void KstViewWidget::paintEvent(QPaintEvent *e) {