[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

updates


  M +1 -1      kstcurvedialog_i.cpp   1.82
  M +2 -10     kstequation.cpp   1.28
  M +1 -1      kstfilterdialog_i.cpp   1.30
  M +1 -1      kstfitdialog_i.cpp   1.54
  M +1 -1      ksthsdialog_i.cpp   1.82
  M +2 -2      kstplugindialog_i.cpp   1.100
  M +1 -1      kstvcurve.cpp   1.63
  M +1 -1      kstviewlabeldialog_i.cpp   1.4


--- kdeextragear-2/kst/kst/kstcurvedialog_i.cpp  #1.81:1.82
@@ -373,5 +373,5 @@ bool KstCurveDialogI::edit_I() {
     DP->setPointDensity(_curveAppearance->pointDensity());
     DP->setIgnoreAutoScale(_checkBoxIgnoreAutoscale->isChecked());
-    DP->update(-1);
+    DP->setDirty();
 
     rc = true;

--- kdeextragear-2/kst/kst/kstequation.cpp  #1.27:1.28
@@ -183,24 +183,17 @@ KstObject::UpdateType KstEquation::updat
   bool usedUpdated = false;
 
-kdDebug() << "update equation......." << endl;
   if (KstObject::checkUpdateCounter(update_counter) && !force) {
-kdDebug() << "       <<<< update counter failed" << endl;
     return lastUpdateResult();
   }
 
   if (!_pe) {
-kdDebug() << "       <<<< _pe is null" << endl;
     return setLastUpdateResult(NO_CHANGE);
   }
 
-  if (update_counter <= 0) {
-    assert(update_counter == 0);
-    force = true;
-  }
+  assert(update_counter >= 0);
 
   if (_xVector == _inputVectors.end()) {
     _xVector = _inputVectors.find(XVECTOR);
     if (!*_xVector) { // This is technically sort of fatal
-kdDebug() << "       <<<< xvector ... fatal!" << endl;
       return setLastUpdateResult(NO_CHANGE);
     }
@@ -216,7 +209,6 @@ kdDebug() << "       <<<< xvector ... fa
   usedUpdated = KstObject::UPDATE == _pe->update(update_counter, &ctx);
 
-  KstObject::UpdateType rc = NO_CHANGE;
+  KstObject::UpdateType rc = NO_CHANGE; // if force, rc = UPDATE anyway.
   if (force || xUpdated || usedUpdated) {
-kdDebug() << "       <<<< doing a fill!" << endl;
     _isValid = FillY(force);
     rc = UPDATE;

--- kdeextragear-2/kst/kst/kstfilterdialog_i.cpp  #1.29:1.30
@@ -345,5 +345,5 @@ bool KstFilterDialogI::createCurve(KstPl
 
   if (xVector && yVector) {
-    plugin->update(-1);
+    plugin->setDirty();
     KstVCurvePtr fit = new KstVCurve(c_name, KstVectorPtr(xVector), KstVectorPtr(yVector), KstVectorPtr(0L), KstVectorPtr(0L), KstVectorPtr(0L), KstVectorPtr(0L), _curveAppearance->color());
 

--- kdeextragear-2/kst/kst/kstfitdialog_i.cpp  #1.53:1.54
@@ -385,5 +385,5 @@ bool KstFitDialogI::createCurve(KstPlugi
 
   if (xVector && yVector) {
-    plugin->update(-1);
+    plugin->setDirty();
     fit = new KstVCurve(c_name, KstVectorPtr(xVector), KstVectorPtr(yVector), KstVectorPtr(0L), KstVectorPtr(0L), KstVectorPtr(0L), KstVectorPtr(0L), _curveAppearance->color());
     if (fit) {

--- kdeextragear-2/kst/kst/ksthsdialog_i.cpp  #1.81:1.82
@@ -325,5 +325,5 @@ bool KstHsDialogI::edit_I() {
   }
 
-  DP->update(-1);
+  DP->setDirty();
 
   DP->writeUnlock();

--- kdeextragear-2/kst/kst/kstplugindialog_i.cpp  #1.99:1.100
@@ -528,5 +528,5 @@ bool KstPluginDialogI::new_I() {
   }
 
-  plugin->update(-1);
+  plugin->setDirty();
   KST::dataObjectList.lock().writeLock();
   KST::dataObjectList.append(plugin.data());
@@ -594,5 +594,5 @@ bool KstPluginDialogI::edit_I() {
     return false;
   }
-  DP->update(-1);
+  DP->setDirty();
   DP->writeUnlock();
 

--- kdeextragear-2/kst/kst/kstvcurve.cpp  #1.62:1.63
@@ -197,5 +197,5 @@ KstObject::UpdateType KstVCurve::update(
   }
 
-  bool depUpdated = false;
+  bool depUpdated = force;
 
   depUpdated = UPDATE == VX->update(update_counter) || depUpdated;

--- kdeextragear-2/kst/kst/kstviewlabeldialog_i.cpp  #1.3:1.4
@@ -153,5 +153,5 @@ void KstViewLabelDialogI::applyEdits() {
     _pViewLabel->setFontName(FontComboBox->currentText());
     _pViewLabel->setRotation((float)Rotation->value());
-    _pViewLabel->update() ;
+    _pViewLabel->update();
   }
 }