Fresco/Berlin/modules/Gadgets GadgetKitImpl.cc,1.17,1.18 GadgetKitImpl.hh,1.10,1.11

Update of /cvs/fresco/Fresco/Berlin/modules/Gadgets
In directory purcel:/tmp/cvs-serv5328/Berlin/modules/Gadgets

Modified Files:
	GadgetKitImpl.cc GadgetKitImpl.hh 
Log Message:
Make sure all classes defined by Kits are in the Kit's namespace. Do some
coding style fixups while touching the files anyway.


Index: GadgetKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Gadgets/GadgetKitImpl.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- GadgetKitImpl.cc	26 Feb 2003 00:19:06 -0000	1.17
+++ GadgetKitImpl.cc	27 Oct 2003 17:08:37 -0000	1.18
@@ -1,7 +1,7 @@
 /*$Id$
  *
  * This source file is a part of the Fresco Project.
- * Copyright (C) 2000 Stefan Seefeld <[email protected]> 
+ * Copyright (C) 2000 Stefan Seefeld <[email protected]>
  * http://www.fresco.org
  *
  * This library is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@
 //     color.alpha *= alpha;
 //     kit->foreground(color);
 //     MonoGraphic::traverse(traversal);
-//     kit->restoreState();    
+//     kit->restoreState();
 //   }
 //   virtual void pick(PickTraversal_ptr traversal) { MonoGraphic::traverse(traversal);}
 
@@ -59,232 +59,240 @@
 //   Coord alpha;
 // };
 
-class RGBAdjuster : public virtual ViewImpl,
-		    public MonoGraphic
+namespace Berlin
 {
- public:
-  RGBAdjuster(BoundedValue_ptr r, BoundedValue_ptr g, BoundedValue_ptr b)
-    : red(RefCount_var<BoundedValue>::increment(r)),
-      green(RefCount_var<BoundedValue>::increment(g)),
-      blue(RefCount_var<BoundedValue>::increment(b))
-    {
-      color.red = red->value();
-      color.green = green->value();
-      color.blue = blue->value();
-    } 
-  virtual void traverse(Traversal_ptr traversal) { traversal->visit(Graphic_var(_this()));}
-  virtual void draw(DrawTraversal_ptr traversal)
+  namespace GadgetKit
   {
-    DrawingKit_var drawing = traversal->drawing();
-    drawing->save();
-    Color tmp = drawing->foreground();
-    color.alpha = tmp.alpha;
-    drawing->foreground(color);
-    MonoGraphic::traverse(traversal);
-    drawing->restore();    
-  }
-  virtual void pick(PickTraversal_ptr traversal) { MonoGraphic::traverse(traversal);}
-
-  virtual void update(const CORBA::Any &)
+    class RGBAdjuster : public virtual ViewImpl, public MonoGraphic
     {
-      color.red = red->value();
-      color.green = green->value();
-      color.blue = blue->value();
-      need_redraw();
-    }
- private:
-  RefCount_var<BoundedValue> red, green, blue;
-  Color color;
-};
-
-class AlphaAdjuster : public virtual ViewImpl,
-		      public MonoGraphic
-{
- public:
-  AlphaAdjuster(BoundedValue_ptr v) : alpha(v->value()) {}
-  virtual void traverse(Traversal_ptr traversal) { traversal->visit(Graphic_var(_this()));}
-  virtual void draw(DrawTraversal_ptr traversal)
-  {
-    DrawingKit_var drawing = traversal->drawing();
-    drawing->save();
-    Color color = drawing->foreground();
-    color.alpha *= alpha;
-    drawing->foreground(color);
-    MonoGraphic::traverse(traversal);
-    drawing->restore();    
-  }
-  virtual void pick(PickTraversal_ptr traversal) { MonoGraphic::traverse(traversal);}
+      public:
+        RGBAdjuster(BoundedValue_ptr r, BoundedValue_ptr g, BoundedValue_ptr b) :
+          red(RefCount_var<BoundedValue>::increment(r)),
+          green(RefCount_var<BoundedValue>::increment(g)),
+          blue(RefCount_var<BoundedValue>::increment(b))
+        {
+            color.red = red->value();
+            color.green = green->value();
+            color.blue = blue->value();
+        }
+        virtual void traverse(Traversal_ptr traversal)
+        { traversal->visit(Graphic_var(_this())); }
+        virtual void draw(DrawTraversal_ptr traversal)
+        {
+            DrawingKit_var drawing = traversal->drawing();
+            drawing->save();
+            Color tmp = drawing->foreground();
+            color.alpha = tmp.alpha;
+            drawing->foreground(color);
+            MonoGraphic::traverse(traversal);
+            drawing->restore();
+        }
+        virtual void pick(PickTraversal_ptr traversal)
+        { MonoGraphic::traverse(traversal); }
 
-  virtual void update(const CORBA::Any &any) { any >>= alpha; need_redraw();}
- private:
-  Coord alpha;
-};
+        virtual void update(const CORBA::Any &)
+        {
+            color.red = red->value();
+            color.green = green->value();
+            color.blue = blue->value();
+            need_redraw();
+        }
+      private:
+        RefCount_var<BoundedValue> red, green, blue;
+        Color color;
+    };
 
-class LightingAdjuster : public virtual ViewImpl,
-			 public MonoGraphic
-{
- public:
-  LightingAdjuster(BoundedValue_ptr r, BoundedValue_ptr g, BoundedValue_ptr b)
-    : red(RefCount_var<BoundedValue>::increment(r)),
-      green(RefCount_var<BoundedValue>::increment(g)),
-      blue(RefCount_var<BoundedValue>::increment(b))
+    class AlphaAdjuster : public virtual ViewImpl,
+                          public MonoGraphic
     {
-      color.red = red->value();
-      color.green = green->value();
-      color.blue = blue->value();
-    } 
-  virtual void traverse(Traversal_ptr traversal) { traversal->visit(Graphic_var(_this()));}
-  virtual void draw(DrawTraversal_ptr traversal)
-  {
-    DrawingKit_var drawing = traversal->drawing();
-    drawing->save();
-    Color tmp = drawing->lighting();
-    /*
-     * how is the light attribute concatenated, subtractive, additive ? -stefan
-     */
-    tmp.red *= color.red;
-    tmp.green *= color.green;
-    tmp.blue *= color.blue;
-    drawing->lighting(tmp);
-    MonoGraphic::traverse(traversal);
-    drawing->restore();    
-  }
-  virtual void pick(PickTraversal_ptr traversal) { MonoGraphic::traverse(traversal);}
+      public:
+        AlphaAdjuster(BoundedValue_ptr v) : alpha(v->value()) { }
+        virtual void traverse(Traversal_ptr traversal)
+        { traversal->visit(Graphic_var(_this())); }
+        virtual void draw(DrawTraversal_ptr traversal)
+        {
+            DrawingKit_var drawing = traversal->drawing();
+            drawing->save();
+            Color color = drawing->foreground();
+            color.alpha *= alpha;
+            drawing->foreground(color);
+            MonoGraphic::traverse(traversal);
+            drawing->restore();
+        }
+        virtual void pick(PickTraversal_ptr traversal)
+        { MonoGraphic::traverse(traversal); }
 
-  virtual void update(const CORBA::Any &)
+        virtual void update(const CORBA::Any &any) { any >>= alpha; need_redraw(); }
+      private:
+        Coord alpha;
+    };
+
+    class LightingAdjuster : public virtual ViewImpl, public MonoGraphic
     {
-      color.red = red->value();
-      color.green = green->value();
-      color.blue = blue->value();
-      need_redraw();
-    }
- private:
-  RefCount_var<BoundedValue> red, green, blue;
-  Color color;
-};
+      public:
+        LightingAdjuster(BoundedValue_ptr r, BoundedValue_ptr g, BoundedValue_ptr b) :
+          red(RefCount_var<BoundedValue>::increment(r)),
+          green(RefCount_var<BoundedValue>::increment(g)),
+          blue(RefCount_var<BoundedValue>::increment(b))
+        {
+            color.red = red->value();
+            color.green = green->value();
+            color.blue = blue->value();
+        }
+        virtual void traverse(Traversal_ptr traversal)
+        { traversal->visit(Graphic_var(_this())); }
+        virtual void draw(DrawTraversal_ptr traversal)
+        {
+            DrawingKit_var drawing = traversal->drawing();
+            drawing->save();
+            Color tmp = drawing->lighting();
+            /*
+             * how is the light attribute concatenated, subtractive, additive ? -stefan
+             */
+            tmp.red *= color.red;
+            tmp.green *= color.green;
+            tmp.blue *= color.blue;
+            drawing->lighting(tmp);
+            MonoGraphic::traverse(traversal);
+            drawing->restore();
+        }
+        virtual void pick(PickTraversal_ptr traversal)
+        { MonoGraphic::traverse(traversal); }
 
-class RotationAdjuster : public virtual ViewImpl,
-			 public MonoGraphic
-{
- public:
-  RotationAdjuster(Axis a) : axis(a) {}
-  virtual void update(const CORBA::Any &any)
+        virtual void update(const CORBA::Any &)
+        {
+            color.red = red->value();
+            color.green = green->value();
+            color.blue = blue->value();
+            need_redraw();
+        }
+      private:
+        RefCount_var<BoundedValue> red, green, blue;
+        Color color;
+    };
+
+    class RotationAdjuster : public virtual ViewImpl, public MonoGraphic
     {
-      Graphic_var child = body(); if (CORBA::is_nil(child)) return;
-      Transform_var transformation =
-	  child->transformation(); if (CORBA::is_nil(transformation)) return;
-      Coord phi;
-      any >>= phi;
-      transformation->load_identity();
-      transformation->rotate(phi, axis);
-      need_resize();
-    }
- private:
-  Axis axis;
-};
+      public:
+        RotationAdjuster(Axis a) : axis(a) {}
+        virtual void update(const CORBA::Any &any)
+        {
+            Graphic_var child = body(); if (CORBA::is_nil(child)) return;
+            Transform_var transformation =
+            child->transformation(); if (CORBA::is_nil(transformation)) return;
+            Coord phi;
+            any >>= phi;
+            transformation->load_identity();
+            transformation->rotate(phi, axis);
+            need_resize();
+        }
+      private:
+        Axis axis;
+    };
 
-class ZoomAdjuster : public virtual ViewImpl,
-		     public MonoGraphic
-{
- public:
-  virtual void update(const CORBA::Any &any)
+    class ZoomAdjuster : public virtual ViewImpl, public MonoGraphic
     {
-      Graphic_var child = body(); if (CORBA::is_nil(child)) return;
-      Transform_var transformation =
-	  child->transformation(); if (CORBA::is_nil(transformation)) return;
-      Coord scale;
-      any >>= scale;
-      Vertex s;
-      s.x = s.y = s.z = exp(scale);
-      transformation->load_identity();
-      transformation->scale(s);
-      need_resize();
-    }
-};
+      public:
+        virtual void update(const CORBA::Any &any)
+        {
+            Graphic_var child = body(); if (CORBA::is_nil(child)) return;
+            Transform_var transformation =
+            child->transformation(); if (CORBA::is_nil(transformation)) return;
+            Coord scale;
+            any >>= scale;
+            Vertex s;
+            s.x = s.y = s.z = exp(scale);
+            transformation->load_identity();
+            transformation->scale(s);
+            need_resize();
+        }
+    };
+  } // namespace
+} // namespace
 
 GadgetKitImpl::GadgetKitImpl(const std::string &id,
-			     const Fresco::Kit::PropertySeq &p,
-			     ServerContextImpl *c)
-  : KitImpl(id, p, c) { }
+                             const Fresco::Kit::PropertySeq &p,
+                             ServerContextImpl *c) :
+  KitImpl(id, p, c)
+{ }
 GadgetKitImpl::~GadgetKitImpl() { }
 void GadgetKitImpl::bind(ServerContext_ptr context)
 {
-  KitImpl::bind(context);
-  Fresco::Kit::PropertySeq props;
-  props.length(0);
-  _command = resolve_kit<CommandKit>(context,
-				     "IDL:fresco.org/Fresco/CommandKit:1.0",
-				     props);
-  _figure = resolve_kit<FigureKit>(context,
-				   "IDL:fresco.org/Fresco/FigureKit:1.0",
-				   props);
+    KitImpl::bind(context);
+    Fresco::Kit::PropertySeq props;
+    props.length(0);
+    _command = resolve_kit<CommandKit>(context,
+                                       "IDL:fresco.org/Fresco/CommandKit:1.0",
+                                       props);
+    _figure = resolve_kit<FigureKit>(context,
+                                     "IDL:fresco.org/Fresco/FigureKit:1.0",
+                                     props);
 }
 
 
 Graphic_ptr GadgetKitImpl::rgb(Graphic_ptr gg,
-			       BoundedValue_ptr r,
-			       BoundedValue_ptr g,
-			       BoundedValue_ptr b)
+                               BoundedValue_ptr r,
+                               BoundedValue_ptr g,
+                               BoundedValue_ptr b)
 {
-  Graphic_var adjuster =
+    Graphic_var adjuster =
       create_and_set_body<Graphic>(new RGBAdjuster(r, g, b), gg,
-				   "FadgetKit/rgb");
-  r->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  g->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  b->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  return adjuster;
+                                   "FadgetKit/rgb");
+    r->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    g->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    b->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    return adjuster;
 }
 
 Graphic_ptr GadgetKitImpl::alpha(Graphic_ptr g, BoundedValue_ptr value)
 {
-  Graphic_var adjuster =
+    Graphic_var adjuster =
       create_and_set_body<Graphic>(new AlphaAdjuster(value), g,
-				   "GadgetKit/alpha");
-  value->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  return adjuster;
+                                   "GadgetKit/alpha");
+    value->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    return adjuster;
 }
 
 Graphic_ptr GadgetKitImpl::lighting(Graphic_ptr gg,
-				    BoundedValue_ptr r,
-				    BoundedValue_ptr g,
-				    BoundedValue_ptr b)
+                                    BoundedValue_ptr r,
+                                    BoundedValue_ptr g,
+                                    BoundedValue_ptr b)
 {
-  Graphic_var adjuster =
+    Graphic_var adjuster =
       create_and_set_body<Graphic>(new LightingAdjuster(r, g, b), gg,
-				   "GadgetKit/lighting");
-  r->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  g->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  b->attach(Observer_ptr(Graphic_ptr(adjuster)));
+                                   "GadgetKit/lighting");
+    r->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    g->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    b->attach(Observer_ptr(Graphic_ptr(adjuster)));
 
-  return adjuster;
+    return adjuster;
 }
 
 Graphic_ptr GadgetKitImpl::rotator(Graphic_ptr g,
-				   BoundedValue_ptr value,
-				   Axis axis)
+                                   BoundedValue_ptr value,
+                                   Axis axis)
 {
-  Graphic_var transformer = _figure->transformer(g);
-  Graphic_var adjuster =
+    Graphic_var transformer = _figure->transformer(g);
+    Graphic_var adjuster =
       create_and_set_body<Graphic>(new RotationAdjuster(axis), transformer,
-				   "GadgetKit/rotator");
-  value->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  return adjuster;
+                                   "GadgetKit/rotator");
+    value->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    return adjuster;
 }
 
 Graphic_ptr GadgetKitImpl::zoomer(Graphic_ptr g, BoundedValue_ptr value)
 {
-  Graphic_var transformer = _figure->transformer(g);
-  Graphic_var adjuster =
+    Graphic_var transformer = _figure->transformer(g);
+    Graphic_var adjuster =
       create_and_set_body<Graphic>(new ZoomAdjuster(), transformer,
-				   "GadgetKit/zoomer");
-  value->attach(Observer_ptr(Graphic_ptr(adjuster)));
-  return adjuster;
+                                   "GadgetKit/zoomer");
+    value->attach(Observer_ptr(Graphic_ptr(adjuster)));
+    return adjuster;
 }
 
-
-
 extern "C" KitImpl *load()
 {
-  static std::string properties[] = {"implementation", "GadgetKitImpl"};
-  return create_prototype<GadgetKitImpl>("IDL:fresco.org/Fresco/GadgetKit:1.0", properties, 2);
-} 
+    static std::string properties[] = {"implementation", "GadgetKitImpl"};
+    return create_prototype<GadgetKitImpl>("IDL:fresco.org/Fresco/GadgetKit:1.0",
+                                           properties, 2);
+}

Index: GadgetKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Gadgets/GadgetKitImpl.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- GadgetKitImpl.hh	18 Feb 2003 07:26:30 -0000	1.10
+++ GadgetKitImpl.hh	27 Oct 2003 17:08:37 -0000	1.11
@@ -1,7 +1,7 @@
 /*$Id$
  *
  * This source file is a part of the Fresco Project.
- * Copyright (C) 2000 Stefan Seefeld <[email protected]> 
+ * Copyright (C) 2000 Stefan Seefeld <[email protected]>
  * http://www.fresco.org
  *
  * This library is free software; you can redistribute it and/or
@@ -31,33 +31,37 @@
 
 class GraphicImpl;
 
-namespace Berlin 
-{
-namespace GadgetKit 
+namespace Berlin
 {
+  namespace GadgetKit
+  {
 
-class GadgetKitImpl : public virtual POA_Fresco::GadgetKit,
-		      public KitImpl
-{
- public:
-  GadgetKitImpl(const std::string &,
-		const Fresco::Kit::PropertySeq &,
-		ServerContextImpl *);
-  virtual ~GadgetKitImpl();
-  virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
-  { return new GadgetKitImpl(repo_id(), p, c);}
-  virtual void bind(Fresco::ServerContext_ptr);
-  virtual Fresco::Graphic_ptr rgb(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr, Fresco::BoundedValue_ptr, Fresco::BoundedValue_ptr);
-  virtual Fresco::Graphic_ptr alpha(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr);
-  virtual Fresco::Graphic_ptr lighting(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr, Fresco::BoundedValue_ptr, Fresco::BoundedValue_ptr);
-  virtual Fresco::Graphic_ptr rotator(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr, Fresco::Axis);
-  virtual Fresco::Graphic_ptr zoomer(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr);
- private:
-  Fresco::CommandKit_var _command;
-  Fresco::FigureKit_var  _figure;
-};
+    class GadgetKitImpl : public virtual POA_Fresco::GadgetKit,
+                          public KitImpl
+    {
+      public:
+        GadgetKitImpl(const std::string &, const Fresco::Kit::PropertySeq &,
+                      ServerContextImpl *);
+        virtual ~GadgetKitImpl();
+        virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+        { return new GadgetKitImpl(repo_id(), p, c);}
+        virtual void bind(Fresco::ServerContext_ptr);
+        virtual Fresco::Graphic_ptr rgb(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr,
+                                        Fresco::BoundedValue_ptr, Fresco::BoundedValue_ptr);
+        virtual Fresco::Graphic_ptr alpha(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr);
+        virtual Fresco::Graphic_ptr lighting(Fresco::Graphic_ptr,
+                                             Fresco::BoundedValue_ptr,
+                                             Fresco::BoundedValue_ptr,
+                                             Fresco::BoundedValue_ptr);
+        virtual Fresco::Graphic_ptr rotator(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr,
+                                            Fresco::Axis);
+        virtual Fresco::Graphic_ptr zoomer(Fresco::Graphic_ptr, Fresco::BoundedValue_ptr);
+      private:
+        Fresco::CommandKit_var _command;
+        Fresco::FigureKit_var  _figure;
+    };
 
-} // namespace
+  } // namespace
 } // namespace
 
 #endif