r15557@tres: ted | 2007-06-08 08:58:12 -0700

 Tying in integer and float types along with removing some bugs that they
 showed.

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index 6ae9eae50277086d0212ee2e8bc45fd4ec02ee5f..f2f1a0295827e9837d0943b4abc8e9746bcec957 100644 (file)
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -17,6 +17,7 @@
 #include "prefdialog.h"
 #include "implementation/implementation.h"
 #include "effect.h"
+#include "timer.h"
 #include "ui/view/view.h"
 
 #include "gtkmm/messagedialog.h"
@@ -213,6 +214,7 @@ private:
     bool _finished;
     bool _humanWait;
     bool _canceled;
+    bool _prefsChanged;
     Glib::RefPtr<Glib::MainLoop> _mainloop;
     Inkscape::UI::View::View * _doc;
     std::list<Glib::ustring> _selected;
@@ -227,6 +229,7 @@ public:
         _finished(false),
         _humanWait(false),
         _canceled(false),
+        _prefsChanged(false),
         _doc(doc) {
 
         SPDesktop *desktop = (SPDesktop *)_doc;
@@ -239,7 +242,7 @@ public:
                 Glib::ustring selected_id;
                 selected_id = SP_OBJECT_ID(*selected);
                 _selected.insert(_selected.end(), selected_id);
-                std::cout << "Selected: " << selected_id << std::endl;
+                //std::cout << "Selected: " << selected_id << std::endl;
                 ++selected;
             }
         }
@@ -263,7 +266,8 @@ public:
     }
 
     void preferencesChange (void) {
-        std::cout << "Preferences are a changin'" << std::endl;
+        //std::cout << "Preferences are a changin'" << std::endl;
+        _prefsChanged = true;
         if (_humanWait) {
             _mainloop->quit();
             documentCancel();
@@ -337,6 +341,8 @@ private:
     }
 
     void processingComplete(void) {
+        //std::cout << "Processing Complete" << std::endl;
+        if (_prefsChanged) { return; } // do it all again
         if (_prefsVisible) {
             _humanWait = true;
         } else {
@@ -387,6 +393,7 @@ ExecutionEnv::run (void) {
         if (_humanWait) {
             _mainloop->run();
         } else {
+            _prefsChanged = false;
             _effect->get_imp()->effect(_effect, _doc);
             processingComplete();
         }
@@ -416,7 +423,10 @@ Effect::prefs (Inkscape::UI::View::View * doc)
 
     ExecutionEnv executionEnv(this, doc, controls);
     changeSignal.connect(sigc::mem_fun(executionEnv, &ExecutionEnv::preferencesChange));
+
+    timer->lock();
     executionEnv.run();
+    timer->unlock();
 
     return true;
 }

diff --git a/src/extension/parameter.cpp b/src/extension/parameter.cpp
index 4d66192366107f3ad1f763ce8c61f809883ecf84..b786a0416719ff8dd6cca82178897e65cb07efbf 100644 (file)
--- a/src/extension/parameter.cpp
+++ b/src/extension/parameter.cpp
@@ -662,7 +662,7 @@ public:
 void
 ParamFloatAdjustment::val_changed (void)
 {
-    std::cout << "Value Changed to: " << this->get_value() << std::endl;
+    //std::cout << "Value Changed to: " << this->get_value() << std::endl;
     _pref->set(this->get_value(), _doc, _node);
     if (_changeSignal != NULL) {
         _changeSignal->emit();
@@ -701,7 +701,7 @@ public:
 void
 ParamIntAdjustment::val_changed (void)
 {
-    std::cout << "Value Changed to: " << this->get_value() << std::endl;
+    //std::cout << "Value Changed to: " << this->get_value() << std::endl;
     _pref->set((int)this->get_value(), _doc, _node);
     if (_changeSignal != NULL) {
         _changeSignal->emit();