Work on filters. spFilterPrimitive structure added. Blur slider updated. Fixed sp-object-repr.cpp typos

(bzr r1598)

1 files changed, 16 insertions, 25 deletions

diff --git a/src/sp-gaussian-blur.cpp b/src/sp-gaussian-blur.cpp
index 0e26fbbf4..68f22c8d4 100644
--- a/src/sp-gaussian-blur.cpp
+++ b/src/sp-gaussian-blur.cpp
@@ -25,17 +25,6 @@
 //#define SP_MACROS_SILENT
 //#include "macros.h"
 
-#define DEBUG_GAUSSIANBLUR
-#ifdef DEBUG_GAUSSIANBLUR
-# define debug(f, a...) { g_print("%s(%d) %s:", \
-                                  __FILE__,__LINE__,__FUNCTION__); \
-                          g_print(f, ## a); \
-                          g_print("\n"); \
-                        }
-#else
-# define debug(f, a...) /**/
-#endif
-
 /* GaussianBlur base class */
 
 static void sp_gaussianBlur_class_init(SPGaussianBlurClass *klass);
@@ -47,7 +36,7 @@ static void sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const
 static void sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
 
-static SPObjectClass *gaussianBlur_parent_class;
+static SPFilterPrimitiveClass *gaussianBlur_parent_class;
 
 GType
 sp_gaussianBlur_get_type()
@@ -65,7 +54,7 @@ sp_gaussianBlur_get_type()
             (GInstanceInitFunc) sp_gaussianBlur_init,
             NULL,    /* value_table */
         };
-        gaussianBlur_type = g_type_register_static(SP_TYPE_OBJECT, "SPGaussianBlur", &gaussianBlur_info, (GTypeFlags)0);
+        gaussianBlur_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPGaussianBlur", &gaussianBlur_info, (GTypeFlags)0);
     }
     return gaussianBlur_type;
 }
@@ -75,7 +64,7 @@ sp_gaussianBlur_class_init(SPGaussianBlurClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
 
-    gaussianBlur_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+    gaussianBlur_parent_class = (SPFilterPrimitiveClass *)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_gaussianBlur_build;
     sp_object_class->release = sp_gaussianBlur_release;
@@ -87,9 +76,6 @@ sp_gaussianBlur_class_init(SPGaussianBlurClass *klass)
 static void
 sp_gaussianBlur_init(SPGaussianBlur *gaussianBlur)
 {
-    debug("0x%p",gaussianBlur);
-
-//    gaussianBlur->stdDeviation = 1;
 }
 
 /**
@@ -100,7 +86,6 @@ sp_gaussianBlur_init(SPGaussianBlur *gaussianBlur)
 static void
 sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    debug("0x%p",object);
     if (((SPObjectClass *) gaussianBlur_parent_class)->build) {
         ((SPObjectClass *) gaussianBlur_parent_class)->build(object, document, repr);
     }
@@ -115,7 +100,6 @@ sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
 static void
 sp_gaussianBlur_release(SPObject *object)
 {
-    debug("0x%p",object);
 
     if (((SPObjectClass *) gaussianBlur_parent_class)->release)
         ((SPObjectClass *) gaussianBlur_parent_class)->release(object);
@@ -127,13 +111,11 @@ sp_gaussianBlur_release(SPObject *object)
 static void
 sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value)
 {
-    debug("0x%p %s(%u): '%s'",object,
-            sp_attribute_name(key),key,value);
     SPGaussianBlur *gaussianBlur = SP_GAUSSIANBLUR(object);
 
     switch(key) {
-	case SP_ATTR_STDDEVIATION:
-		gaussianBlur->stdDeviation.set(value);
+    case SP_ATTR_STDDEVIATION:
+        gaussianBlur->stdDeviation.set(value);
             break;
         default:
             if (((SPObjectClass *) gaussianBlur_parent_class)->set)
@@ -149,7 +131,6 @@ sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value)
 static void
 sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags)
 {
-    debug("0x%p",object);
 
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
                  SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
@@ -169,7 +150,6 @@ sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags)
 static Inkscape::XML::Node *
 sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
 {
-    debug("0x%p",object);
 
     // Inkscape-only object, not copied during an "plain SVG" dump:
     if (flags & SP_OBJECT_WRITE_EXT) {
@@ -189,6 +169,17 @@ sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
 }
 
 
+void  sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num)
+{
+    blur->stdDeviation.setNumber(num);
+}
+void  sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num, float optnum)
+{
+    blur->stdDeviation.setNumber(num);
+    blur->stdDeviation.setOptNumber(optnum);
+}
+
+
 /*
   Local Variables:
   mode:c++