Fresco/Fresco-C++-demos/src Application.cc,1.34,1.35 Application.hh,1.23,1.24 ColorDemo.cc,1.11,1.12 CubeDemo.cc,1.5,1.6 FocusDemo.cc,1.19,1.20 PrimitiveDemo.cc,1.10,1.11 RasterDemo.cc,1.10,1.11 TransformDemo.cc,1.11,1.12 ViewportDemo.cc,1.12,1.13

Stefan Seefeld <[email protected]>
Newsgroups gmane.comp.video.fresco.cvs
Message-ID <[email protected]>
Update of /cvs/fresco/Fresco/Fresco-C++-demos/src
In directory purcel:/tmp/cvs-serv28932/Fresco-C++-demos/src

Modified Files:
	Application.cc Application.hh ColorDemo.cc CubeDemo.cc 
	FocusDemo.cc PrimitiveDemo.cc RasterDemo.cc TransformDemo.cc 
	ViewportDemo.cc 
Log Message:
rename ImageKit to RasterKit

Index: Application.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/Application.cc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Application.cc	25 Jan 2003 12:43:48 -0000	1.34
+++ Application.cc	18 Feb 2003 21:18:14 -0000	1.35
@@ -88,14 +88,14 @@
     _wk(::resolve_kit<WidgetKit>(_server, "IDL:fresco.org/Fresco/WidgetKit:1.0")),
     _fk(::resolve_kit<FigureKit>(_server, "IDL:fresco.org/Fresco/FigureKit:1.0")),
     _ck(::resolve_kit<CommandKit>(_server, "IDL:fresco.org/Fresco/CommandKit:1.0")),
-    _ik(::resolve_kit<ImageKit>(_server, "IDL:fresco.org/Fresco/ImageKit:1.0")),
+    _rk(::resolve_kit<RasterKit>(_server, "IDL:fresco.org/Fresco/RasterKit:1.0")),
     _gk(::resolve_kit<GadgetKit>(_server, "IDL:fresco.org/Fresco/GadgetKit:1.0")),
     _vbox(_lk->vbox()),
     _choice(_wk->toggle_choice()),
     _mapper(new Mapper(_demos, Selection_var(_choice->state())))
 {
   _background.red = _background.green = _background.blue = 0.6; _background.alpha = 1.;
-  Raster_var raster = _ik->create_raster("fresco.png");
+  Raster_var raster = _rk->create_raster("fresco.png");
   Image_var  image = _fk->pixmap(raster);
   Graphic_var hbox = _lk->hbox();
   Graphic_var vbox = _lk->vbox();

Index: Application.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/Application.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Application.hh	29 Sep 2002 01:36:19 -0000	1.23
+++ Application.hh	18 Feb 2003 21:18:14 -0000	1.24
@@ -32,7 +32,7 @@
 #include <Fresco/FigureKit.hh>
 #include <Fresco/CommandKit.hh>
 #include <Fresco/DesktopKit.hh>
-#include <Fresco/ImageKit.hh>
+#include <Fresco/RasterKit.hh>
 #include <Fresco/GadgetKit.hh>
 #include <Fresco/MainController.hh>
 #include <Fresco/Trigger.hh>
@@ -94,7 +94,7 @@
   Fresco::WidgetKit_var     _wk;
   Fresco::FigureKit_var     _fk;
   Fresco::CommandKit_var    _ck;
-  Fresco::ImageKit_var      _ik;
+  Fresco::RasterKit_var     _rk;
   Fresco::GadgetKit_var     _gk;
   Fresco::Graphic_var       _vbox;
   Widget::Choice_var        _choice;

Index: ColorDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/ColorDemo.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ColorDemo.cc	24 Dec 2002 16:54:11 -0000	1.11
+++ ColorDemo.cc	18 Feb 2003 21:18:14 -0000	1.12
@@ -28,7 +28,7 @@
 ColorDemo::ColorDemo(Application *a)
   : Demo(a)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var images = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   FigureKit_var figures = application->resolve<FigureKit>("IDL:fresco.org/Fresco/FigureKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");

Index: CubeDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/CubeDemo.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CubeDemo.cc	7 Aug 2002 15:52:29 -0000	1.5
+++ CubeDemo.cc	18 Feb 2003 21:18:14 -0000	1.6
@@ -75,7 +75,7 @@
     tx1(new TransformImpl),
     tx2(new TransformImpl)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var images = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   PrimitiveKit_var primitives = application->resolve<PrimitiveKit>("IDL:fresco.org/Fresco/PrimitiveKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");

Index: FocusDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/FocusDemo.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- FocusDemo.cc	25 Jan 2003 12:43:48 -0000	1.19
+++ FocusDemo.cc	18 Feb 2003 21:18:14 -0000	1.20
@@ -44,7 +44,7 @@
 FocusDemo::FocusDemo(Application *a)
   : Demo(a), observer(new Observer)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var images = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   FigureKit_var figures = application->resolve<FigureKit>("IDL:fresco.org/Fresco/FigureKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");

Index: PrimitiveDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/PrimitiveDemo.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PrimitiveDemo.cc	29 Oct 2002 18:52:05 -0000	1.10
+++ PrimitiveDemo.cc	18 Feb 2003 21:18:14 -0000	1.11
@@ -75,7 +75,7 @@
     tx1(new TransformImpl),
     tx2(new TransformImpl)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var images = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   PrimitiveKit_var primitives = application->resolve<PrimitiveKit>("IDL:fresco.org/Fresco/PrimitiveKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");

Index: RasterDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/RasterDemo.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- RasterDemo.cc	25 Jan 2003 12:43:48 -0000	1.10
+++ RasterDemo.cc	18 Feb 2003 21:18:14 -0000	1.11
@@ -28,7 +28,7 @@
 RasterDemo::RasterDemo(Application *a)
   : Demo(a)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var rasters = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   FigureKit_var figures = application->resolve<FigureKit>("IDL:fresco.org/Fresco/FigureKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");
@@ -39,13 +39,13 @@
   Command_var command2 = commands->log("hello World 2");
   Command_var command3 = commands->log("hello World 3");
   
-  Raster_var raster = images->create_raster("png.png");
-  Image_var  im = figures->pixmap(raster);
+  Raster_var raster = rasters->create_raster("png.png");
+  Image_var  image = figures->pixmap(raster);
   
   Graphic_var hbox = layout->hbox();
-  hbox->append_graphic(Graphic_var(widgets->button(im, command1)));
-  hbox->append_graphic(Graphic_var(widgets->button(im, command2)));
-  hbox->append_graphic(Graphic_var(widgets->button(im, command3)));
+  hbox->append_graphic(Graphic_var(widgets->button(image, command1)));
+  hbox->append_graphic(Graphic_var(widgets->button(image, command2)));
+  hbox->append_graphic(Graphic_var(widgets->button(image, command3)));
   Controller_var group = tools->group(hbox);
 
   application->append(group, Babylon::String("raster"));

Index: TransformDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/TransformDemo.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TransformDemo.cc	25 Jan 2003 12:43:48 -0000	1.11
+++ TransformDemo.cc	18 Feb 2003 21:18:14 -0000	1.12
@@ -29,7 +29,7 @@
 TransformDemo::TransformDemo(Application *a)
   : Demo(a)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var rasters = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   FigureKit_var figures = application->resolve<FigureKit>("IDL:fresco.org/Fresco/FigureKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");
@@ -40,13 +40,13 @@
   Command_var command2 = commands->log("hello World 2");
   Command_var command3 = commands->log("hello World 3");
   
-  Raster_var raster = images->create_raster("../etc/PNG/png.png");
-  Image_var  im = figures->pixmap(raster);
+  Raster_var raster = rasters->create_raster("png.png");
+  Image_var  image = figures->pixmap(raster);
   
   Graphic_var hbox = layout->hbox();
-  hbox->append_graphic(Graphic_var(widgets->button(im, command1)));
-  hbox->append_graphic(Graphic_var(widgets->button(im, command2)));
-  hbox->append_graphic(Graphic_var(widgets->button(im, command3)));
+  hbox->append_graphic(Graphic_var(widgets->button(image, command1)));
+  hbox->append_graphic(Graphic_var(widgets->button(image, command2)));
+  hbox->append_graphic(Graphic_var(widgets->button(image, command3)));
   Graphic_var transformer = figures->transformer(hbox);
   Transform_var(transformer->transformation())->rotate(45., zaxis);
   Graphic_var root = layout->halign(transformer, 0.);

Index: ViewportDemo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/ViewportDemo.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ViewportDemo.cc	25 Jan 2003 12:43:48 -0000	1.12
+++ ViewportDemo.cc	18 Feb 2003 21:18:14 -0000	1.13
@@ -29,14 +29,14 @@
 ViewportDemo::ViewportDemo(Application *a)
   : Demo(a)
 {
-  ImageKit_var images = application->resolve<ImageKit>("IDL:fresco.org/Fresco/ImageKit:1.0");
+  RasterKit_var rasters = application->resolve<RasterKit>("IDL:fresco.org/Fresco/RasterKit:1.0");
   FigureKit_var figures = application->resolve<FigureKit>("IDL:fresco.org/Fresco/FigureKit:1.0");
   LayoutKit_var layout = application->resolve<LayoutKit>("IDL:fresco.org/Fresco/LayoutKit:1.0");
   CommandKit_var commands = application->resolve<CommandKit>("IDL:fresco.org/Fresco/CommandKit:1.0");
   ToolKit_var tools = application->resolve<ToolKit>("IDL:fresco.org/Fresco/ToolKit:1.0");
   WidgetKit_var widgets = application->resolve<WidgetKit>("IDL:fresco.org/Fresco/WidgetKit:1.0");
 
-  Raster_var raster = images->create_raster("landscape.png");
+  Raster_var raster = rasters->create_raster("landscape.png");
   Image_var pixmap = figures->pixmap(raster);
   Layout::Viewport_var viewport = layout->scrollable(pixmap);
   Controller_var panner = widgets->panner(BoundedRange_var(viewport->adjustment(xaxis)), BoundedRange_var(viewport->adjustment(yaxis)));
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.