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

[Mike Fenton]

SVN commit 857134 by fenton:

Fix Scene addition errors in DataWizard.  Add wait cursor while building the plots.


 M  +9 -4      datawizard.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #857133:857134
@@ -550,6 +550,8 @@
   uint n_curves = 0;
   uint n_steps = 0;
 
+  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+
   DataSourcePtr ds = _pageDataSource->dataSource();
 
   // check for sufficient memory
@@ -785,8 +787,6 @@
       if (*plotIterator) {
         PlotRenderItem *renderItem = (*plotIterator)->renderItem(PlotRenderItem::Cartesian);
         renderItem->addRelation(kst_cast<Relation>(curve));
-        (*plotIterator)->update();
-        (*plotIterator)->parentView()->appendToLayout(_pagePlot->layout(), (*plotIterator), _pagePlot->gridColumns());
       }
 
       if (_pagePlot->curvePlacement() != DataWizardPagePlot::OnePlot) { 
@@ -873,8 +873,6 @@
           (*plotIterator)->xAxis()->setAxisLog(_pagePlot->PSDLogX());
           (*plotIterator)->yAxis()->setAxisLog(_pagePlot->PSDLogY());
           renderItem->addRelation(kst_cast<Relation>(curve));
-          (*plotIterator)->update();
-          (*plotIterator)->parentView()->appendToLayout(_pagePlot->layout(), (*plotIterator), _pagePlot->gridColumns());
         }
 
         if (_pagePlot->curvePlacement() != DataWizardPagePlot::OnePlot) { 
@@ -895,6 +893,11 @@
     }
   }
 
+  foreach (PlotItem* plot, plotList) {
+    plot->update();
+    plot->parentView()->appendToLayout(_pagePlot->layout(), plot, _pagePlot->gridColumns());
+  }
+
   // legends and labels
   bool xLabels = _pagePlot->xAxisLabels();
   bool yLabels = _pagePlot->yAxisLabels();
@@ -925,6 +928,8 @@
     }
     ++plotIterator;
   }
+  QApplication::restoreOverrideCursor();
+
   accept();
 
 }