[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

die P_DATA die!!


  M +3 -1      datawizard.ui.h   1.126
  M +1 -15     kst.cpp   1.294
  M +1 -1      kstfilterdialog_i.cpp   1.31
  M +1 -1      kstfitdialog_i.cpp   1.55
  M +4 -2      kstviewobject.h   1.95


--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.125:1.126
@@ -763,4 +763,5 @@ void DataWizard::finished()
                 KST::dataObjectList.lock().writeUnlock();
                 plot->addCurve(c.data());
+                plot->setDirty();
                 plot->setLog(_psdLogX->isChecked(),_psdLogY->isChecked());
                 if (!_onePlot->isChecked()) { // change plots if we are not onePlot
@@ -790,4 +791,5 @@ void DataWizard::finished()
             continue;
         }
+        pp->setDirty();
         pp->GenerateDefaultLabels();
         if (!xl) {
@@ -826,5 +828,5 @@ void DataWizard::finished()
         w->view()->cleanup(-1);
     }
-    w->view()->paint(P_DATA);
+    w->view()->paint(P_PAINT);
     app->slotUpdateProgress(0, 0, QString::null);
     if (!wasPaused) {

--- kdeextragear-2/kst/kst/kst.cpp  #1.293:1.294
@@ -1414,20 +1414,6 @@ void KstApp::paintAll(KstPaintType pt) {
   t.start();
 #endif
-  if (mdiMode() == KMdi::TabPageMode) { // Optimization
+  if (mdiMode() == KMdi::TabPageMode || mdiMode() == KMdi::IDEAlMode) { // Optimization
     KstViewWindow *view = dynamic_cast<KstViewWindow*>(activeWindow());
-    if (pt == P_DATA) { // what about P_PLOT?  I think it's not needed anyway
-      KMdiIterator<KMdiChildView*> *it = createIterator();
-      if (it) {
-        while (it->currentItem()) {
-          KstViewWindow *v = dynamic_cast<KstViewWindow*>(it->currentItem());
-          if (v && v != view) {
-            v->view()->widget()->nextUpdateDo(pt);
-          }
-          it->next();
-        }
-        deleteIterator(it);
-      }
-    }
-
     if (view) {
       view->view()->paint(pt);

--- kdeextragear-2/kst/kst/kstfilterdialog_i.cpp  #1.30:1.31
@@ -365,5 +365,5 @@ bool KstFilterDialogI::createCurve(KstPl
       if (plot) {
         plot->addCurve(fit.data());
-        w->view()->paint(P_DATA);
+        w->view()->paint(P_PAINT);
       }
     }

--- kdeextragear-2/kst/kst/kstfitdialog_i.cpp  #1.54:1.55
@@ -435,5 +435,5 @@ bool KstFitDialogI::createCurve(KstPlugi
           plot->addLabel(label);
           plot->addCurve(fit.data());
-          w->view()->paint(P_DATA);
+          w->view()->paint(P_PAINT);
         }
       }

--- kdeextragear-2/kst/kst/kstviewobject.h  #1.94:1.95
@@ -40,6 +40,8 @@ typedef KstViewObjectPtr (*KstViewObject
 // P_PAINT: Neither 'data' nor 'plot' needs to change
 // P_PLOT: data didn't change
-// P_DATA: data changed
-enum KstPaintType { P_PAINT, P_DATA, P_PLOT, P_ZOOM, P_PRINT, P_EXPORT };
+/* FIXME: Define P_PLOT better, and do we even need P_ZOOM, P_PLOT and P_PAINT? 
+          They should all do the same thing.
+*/
+enum KstPaintType { P_PAINT, P_PLOT, P_ZOOM, P_PRINT, P_EXPORT };
 
 struct KstAspectRatio {