[Kst] extragear/graphics/kst/kst

[Rick Chern]

SVN commit 436517 by rchern:

Return correct update type for static matrices

 M  +1 -1      kstimage.cpp  
 M  +4 -1      kstmatrix.cpp  
 M  +2 -3      updatethread.cpp  


--- trunk/extragear/graphics/kst/kst/kstimage.cpp #436516:436517
@@ -196,7 +196,7 @@
   }
   
   bool updated = UPDATE == _inputMatrices[THEMATRIX]->update(update_counter);
-    
+  
   if (updated || force) {
     NS = _inputMatrices[THEMATRIX]->sampleCount();
     
--- trunk/extragear/graphics/kst/kst/kstmatrix.cpp #436516:436517
@@ -173,6 +173,7 @@
 KstObject::UpdateType KstMatrix::update(int update_counter) {
   
   bool force = dirty();
+  
   setDirty(false);
   
   if (KstObject::checkUpdateCounter(update_counter) && !force) {
@@ -188,7 +189,9 @@
       if (!force && providerUpdateType == KstObject::NO_CHANGE) {
         return setLastUpdateResult(providerUpdateType);  
       }  
-    }  
+    } else if (force) {
+      providerUpdateType = UPDATE;  
+    }
   }
   
   // do the update if necessary
--- trunk/extragear/graphics/kst/kst/updatethread.cpp #436516:436517
@@ -29,7 +29,7 @@
 #include "threadevents.h"
 
 // 0 - none, 1 - some, 2 - lots, 3 - too much
-#define UPDATEDEBUG 1
+#define UPDATEDEBUG 2
 
 UpdateThread::UpdateThread(KstDoc *doc)
 : QThread(), _paused(false), _done(false), _statusMutex(false), _doc(doc) {
@@ -136,7 +136,7 @@
   if (gotData) {
     *gotData = false;
   }
-
+  
 #if UPDATEDEBUG > 0
   if (force) {
     kdDebug() << "Forced update!" << endl;
@@ -223,7 +223,6 @@
         return U == KstObject::UPDATE;
       }
     }
-    
 
     // Update all data objects
     for (uint i = 0; i < dol.count(); ++i) {