Fresco/Berlin/modules/Figures FigureImpl.cc,1.22,1.23 FigureKitImpl.cc,1.24,1.25 FigureKitImpl.hh,1.19,1.20
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Figures
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Figures
Modified Files:
FigureImpl.cc FigureKitImpl.cc FigureKitImpl.hh
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92
Index: FigureImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Figures/FigureImpl.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- FigureImpl.cc 5 Jan 2003 16:21:31 -0000 1.22
+++ FigureImpl.cc 18 Feb 2003 07:26:29 -0000 1.23
@@ -207,6 +207,9 @@
// {
// drawing->foreground(_fg);
// drawing->surface_fillstyle(DrawingKit::outlined);
+ std::cout << "drawing " << _path->nodes.length() << std::endl;
+ for (size_t i = 0; i != _path->nodes.length(); ++i)
+ std::cout << _path->nodes[i].x << ' ' << _path->nodes[i].y << std::endl;
drawing->draw_path(_path);
// }
drawing->restore();
Index: FigureKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Figures/FigureKitImpl.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- FigureKitImpl.cc 25 Jan 2003 22:37:01 -0000 1.24
+++ FigureKitImpl.cc 18 Feb 2003 07:26:30 -0000 1.25
@@ -35,8 +35,9 @@
using namespace Berlin::FigureKit;
FigureKitImpl::FigureKitImpl(const std::string &id,
- const Fresco::Kit::PropertySeq &p)
- : KitImpl(id, p) { }
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ : KitImpl(id, p, c) { }
FigureKitImpl::~FigureKitImpl() { }
Graphic_ptr FigureKitImpl::root(Graphic_ptr g)
@@ -137,5 +138,5 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "FigureKitImpl"};
- return create_kit<FigureKitImpl> ("IDL:fresco.org/Fresco/FigureKit:1.0", properties, 2);
+ return create_prototype<FigureKitImpl> ("IDL:fresco.org/Fresco/FigureKit:1.0", properties, 2);
}
Index: FigureKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Figures/FigureKitImpl.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- FigureKitImpl.hh 5 Jan 2003 16:21:31 -0000 1.19
+++ FigureKitImpl.hh 18 Feb 2003 07:26:30 -0000 1.20
@@ -30,16 +30,21 @@
#include <Berlin/KitImpl.hh>
#include <vector>
-namespace Berlin {
-namespace FigureKit {
+namespace Berlin
+{
+namespace FigureKit
+{
class FigureKitImpl : public virtual POA_Fresco::FigureKit,
public KitImpl
{
public:
- FigureKitImpl(const std::string &, const Fresco::Kit::PropertySeq &);
+ FigureKitImpl(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
virtual ~FigureKitImpl();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p) { return new FigureKitImpl(repo_id(), p);}
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+ { return new FigureKitImpl(repo_id(), p, c);}
Fresco::Graphic_ptr root(Fresco::Graphic_ptr);
Fresco::Graphic_ptr fitter(Fresco::Graphic_ptr);