Fresco/Fresco-Python-demos/src clock,1.8,1.9 logo,1.16,1.17 menu,1.18,1.19 multilogo,1.11,1.12 primitive,1.8,1.9 unidraw,1.6,1.7 viewport,1.5,1.6
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Fresco-Python-demos/src
In directory purcel:/tmp/cvs-serv19450/src
Modified Files:
clock logo menu multilogo primitive unidraw viewport
Log Message:
changes to the python demos to reflect the fixed runtime
Index: clock
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/clock,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- clock 18 Feb 2003 01:52:03 -0000 1.8
+++ clock 4 Mar 2003 05:31:45 -0000 1.9
@@ -11,13 +11,9 @@
# Import the Fresco stubs and client lib
import Fresco, Unidraw
-import Fresco__POA
-from Fresco import Label, Callback, nullAny
-
-# Import Fresco lib
-import pyfresco
+import FrescoClient
-class TickGraphic (pyfresco.PyGraphic):
+class TickGraphic (FrescoClient.Graphic):
"Simple graphic that draws a 'tick'"
def request(self): # --> void
x = Fresco.Graphic.Requirement(1, 2000., 3000., 100., 0.)
@@ -48,10 +44,10 @@
dk.restore()
-class ClockGraphic (pyfresco.PyGraphic):
+class ClockGraphic (FrescoClient.Graphic):
"Simple graphic that draws a clock"
def __init__(self):
- pyfresco.PyGraphic.__init__(self)
+ FrescoClient.Graphic.__init__(self)
thread.start_new_thread(self._run_update_thread, ())
self._offset = 0. #angular offset
self._lock = threading.Lock()
@@ -124,9 +120,9 @@
dk.draw_path(path)
dk.restore()
-class ClockController (pyfresco.PyController):
+class ClockController (FrescoClient.Controller):
def __init__(self):
- pyfresco.PyController.__init__(self, 0)
+ FrescoClient.Controller.__init__(self, 0)
self.clock = ClockGraphic()
self._set_body(self.clock._this())
self._rot = 0.
@@ -136,25 +132,25 @@
print "Press a key (in the Fresco window) to reset the angle"
def traverse(self, traversal):
- pyfresco.PyController.traverse(self, traversal)
+ FrescoClient.Controller.traverse(self, traversal)
def press(self, pickTraversal, input_event):
print "Press"
self.clock._lock.acquire()
- pyfresco.PyController.press(self, pickTraversal, input_event)
- self._pos = pyfresco.get_position(input_event)
+ FrescoClient.Controller.press(self, pickTraversal, input_event)
+ self._pos = FrescoClient.get_position(input_event)
self._rot = self.clock._offset
self._start_rot = None
self._curr_rot = self._rot
def release(self, pickTraversal, input_event):
print "Release"
- pyfresco.PyController.release(self, pickTraversal, input_event)
- pos = pyfresco.get_position(input_event)
+ FrescoClient.Controller.release(self, pickTraversal, input_event)
+ pos = FrescoClient.get_position(input_event)
bounds = pickTraversal.current_allocation().bounds()
bounds = map(pickTraversal.current_transformation().transform_vertex, bounds)
self.do_drag(bounds, pos)
self.clock._lock.release()
def drag(self, pickTraversal, input_event):
- pos = pyfresco.get_position(input_event)
+ pos = FrescoClient.get_position(input_event)
bounds = pickTraversal.current_allocation().bounds()
bounds = map(pickTraversal.current_transformation().transform_vertex, bounds)
self.do_drag(bounds, pos)
@@ -181,10 +177,10 @@
self.clock.need_redraw()
self.clock._lock.release()
-class GraphicApp (Fresco.App):
+class GraphicApp (FrescoClient.App):
def run(self):
clock = ClockController()._this()
- clock_group = kits.tool.group(clock)
+ clock_group = kits.tools.group(clock)
clock_group.append_controller(clock)
self.window = kits.desktop.shell(clock_group, connection.clientContext)
@@ -194,8 +190,8 @@
def main():
# Create singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = GraphicApp()
app.run()
Index: logo
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/logo,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- logo 18 Feb 2003 01:52:03 -0000 1.16
+++ logo 4 Mar 2003 05:31:46 -0000 1.17
@@ -5,16 +5,16 @@
# Import Fresco client lib
import Fresco
-from Fresco import Label, Callback, nullAny
+import FrescoClient
-class DemoApp (Fresco.App):
+class DemoApp (FrescoClient.App):
def run(self):
# Create a pixmap
- pixmap = kits.figure.pixmap(kits.image.create_raster("berlin-128.png"))
+ pixmap = kits.figures.pixmap(kits.rasters.create_raster("fresco.png"))
margin = kits.layout.margin_flexible(pixmap, 100., 500., 100.)
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.5)
- demo = kits.tool.frame(margin, 10., spec, 1)
- group = kits.tool.group(kits.tool.debugger(demo, "debug"))
+ demo = kits.tools.frame(margin, 10., spec, 1)
+ group = kits.tools.group(kits.tools.debugger(demo, "debug"))
shell = kits.desktop.shell(group, connection.clientContext)
@@ -22,8 +22,8 @@
def main():
# Create singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = DemoApp()
app.run()
Index: menu
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/menu,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- menu 18 Feb 2003 01:52:03 -0000 1.18
+++ menu 4 Mar 2003 05:31:46 -0000 1.19
@@ -13,15 +13,11 @@
from omniORB import CORBA, PortableServer
# Import the Fresco stubs and client lib
-import Fresco, Layout
-import Fresco__POA
-from Fresco import Label, Callback, nullAny
-
-# Import Python client lib
-import pyfresco
-from pyfresco import Babylon
+import Fresco, Layout, Fresco__POA
+import FrescoClient
+from FrescoClient import Label, Callback, nullAny, Babylon
-class MenuKitImpl (Fresco__POA.MenuKit):
+class MenuKitImpl(Fresco__POA.MenuKit):
"""Pretend kit that builds menu objects"""
def menu_bar(self):
"""Returns a menubar object"""
@@ -44,7 +40,7 @@
if not isinstance(obj, class_obj): raise TypeError, "Not local object"
return obj
-class MenuItem (pyfresco.PyController):
+class MenuItem (FrescoClient.Controller):
"""Encapsulates a Menu item with label and optional submenu and callback.
TODO: provide api to close all parent popups once an item is selected."""
def __init__(self, root, label, orient, submenu=None, callback=None):
@@ -70,7 +66,7 @@
# Construct the dynamic frame that shows when in focus or not
fspec_out = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.5)
fspec_none = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.none, 1.0)
- self.frame = kits.tool.dynamic(self.button, 10.,
+ self.frame = kits.tools.dynamic(self.button, 10.,
Fresco.Controller.active, fspec_out, fspec_none,
0, self._this())
self._set_body(self.frame)
@@ -86,7 +82,7 @@
if self.submenu:
fspec_focus = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.8)
fspec_none = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.3)
- tri = kits.tool.dynamic_triangle(None,
+ tri = kits.tools.dynamic_triangle(None,
10., Fresco.Controller.active, fspec_focus, fspec_none,
1, Fresco.ToolKit.right, self._this())
tri = kits.layout.fixed_size(tri, 140., 140.)
@@ -245,7 +241,7 @@
else: to = Fresco.Vertex(lower.x, upper.y, 0.)
sub._set_position(to)
-class Menu (pyfresco.PyController):
+class Menu (FrescoClient.Controller):
"""Encapsulates a vertical menu of MenuItems"""
def __init__(self):
"Creates menu from sequence of items"
@@ -279,7 +275,7 @@
self.box = kits.layout.vbox()
self._set_body(self.box)
#fspec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.2)
- #frame = kits.tool.frame(box, 10.0, fspec, 1)
+ #frame = kits.tools.frame(box, 10.0, fspec, 1)
map(self._add_item, self.items)
@@ -302,7 +298,7 @@
spacer_box.append_graphic(kits.layout.hfill())
fspec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.2)
- frame = kits.tool.frame(spacer_box, 10.0, fspec, 1)
+ frame = kits.tools.frame(spacer_box, 10.0, fspec, 1)
self._set_body(frame)
@@ -317,8 +313,8 @@
self.button = kits.widget.button(Label("Okay"), self._get_hide_cmd())
self.vbox.append_graphic(self.button)
fspec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.none, 0)
- self.frame = kits.tool.frame(self.vbox, 0.0, fspec, 1)
- self.group = kits.tool.group(kits.tool.rgb(self.frame, 0.8, 0.8, 0.8))
+ self.frame = kits.tools.frame(self.vbox, 0.0, fspec, 1)
+ self.group = kits.tools.group(kits.tools.rgb(self.frame, 0.8, 0.8, 0.8))
self.window = kits.desktop.transient(self.group)
self._mapper_show = kits.desktop.map(self.window, 1)
self._mapper_hide = kits.desktop.map(self.window, 0)
@@ -345,7 +341,7 @@
print "Failed"
sys.exit(0)
-class MenuApp (Fresco.App):
+class MenuApp (FrescoClient.App):
def run(self):
def add(menu, items):
for item in items:
@@ -390,13 +386,13 @@
vbox = kits.layout.vbox()
vbox.append_graphic(menu)
- contents = kits.figure.pixmap(kits.image.create("marble.png"))
+ contents = kits.figure.pixmap(kits.rasters.create("marble.png"))
grid = kits.layout.fixed_grid(Layout.Grid.Index(5,4))
for i in range(5*4):
grid.append_graphic(contents)
vbox.append_graphic(kits.layout.fixed_size(grid,6400.,4800.))
- group = kits.tool.group(vbox)
+ group = kits.tools.group(vbox)
group.append_controller(menu)
self.window = kits.desktop.shell(group, connection.clientContext)
self.window._set_position(Fresco.Vertex(0, -210, 0))
@@ -418,8 +414,8 @@
def main():
# Create the singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = MenuApp()
app.run()
Index: multilogo
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/multilogo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- multilogo 18 Feb 2003 01:52:03 -0000 1.11
+++ multilogo 4 Mar 2003 05:31:46 -0000 1.12
@@ -5,16 +5,17 @@
# Import Fresco stubs and client lib
import Fresco
+import FrescoClient
-class DemoApp (Fresco.App):
+class DemoApp (FrescoClient.App):
def mk_frame(self, color):
spec = Fresco.ToolKit.FrameSpec(
Fresco.ToolKit.colored, apply(Fresco.Color, color))
- return kits.tool.frame(self.pixmap, 50, spec, 1)
+ return kits.tools.frame(self.pixmap, 50, spec, 1)
def run(self):
# Create a pixmap
- raster = kits.image.create("berlin-48.png")
- self.pixmap = kits.figure.pixmap(raster)
+ raster = kits.rasters.create_raster("fresco.png")
+ self.pixmap = kits.figures.pixmap(raster)
if 1: # The elegant way to do it
colors = (
@@ -30,7 +31,7 @@
# an object instance
map(box.append_graphic, frames)
# We can only shell a controller, so wrap the hbox in a group
- group = kits.tool.group(box)
+ group = kits.tools.group(box)
shell = kits.desktop.shell(group, connection.clientContext)
# Get an iterator that points at the first graphic (frame)
# Note the iterator is a reference to a server-side object
@@ -49,22 +50,22 @@
else: # The simple way to do it :)
pixmap = self.pixmap
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(1., 0.5, 0.5, 1.))
- frame1 = tool.frame(pixmap, 50, spec, 1)
+ frame1 = tools.frame(pixmap, 50, spec, 1)
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(0.5, 1., 0.5, 1.))
- frame2 = tool.frame(pixmap, 50, spec, 1)
+ frame2 = tools.frame(pixmap, 50, spec, 1)
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(0.5, 0.5, 1., 1.))
- frame3 = tool.frame(pixmap, 50, spec, 1)
+ frame3 = tools.frame(pixmap, 50, spec, 1)
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(1., 1., 0.5, 1.))
- frame4 = tool.frame(pixmap, 50, spec, 1)
+ frame4 = tools.frame(pixmap, 50, spec, 1)
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(1., 0.5, 1., 1.))
- frame5 = tool.frame(pixmap, 50, spec, 1)
+ frame5 = tools.frame(pixmap, 50, spec, 1)
box = layout.hbox()
box.append_graphic(frame1)
box.append_graphic(frame2)
box.append_graphic(frame3)
box.append_graphic(frame4)
box.append_graphic(frame5)
- group = tool.group(box)
+ group = tools.group(box)
shell = desktop.shell(group)
iterator = box.first_child_graphic()
for i in [1,2,3,4,5]:
@@ -85,8 +86,8 @@
def main():
# Create singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = DemoApp()
app.run()
Index: primitive
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/primitive,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- primitive 18 Feb 2003 01:52:03 -0000 1.8
+++ primitive 4 Mar 2003 05:31:46 -0000 1.9
@@ -10,12 +10,8 @@
from omniORB import CORBA
# Import the Fresco stubs and client lib
-import Fresco, Unidraw
-import Fresco__POA
-from Fresco import Label, Callback, nullAny
-
-# Import Fresco lib
-import pyfresco
+import Fresco, Unidraw, Fresco__POA
+import FrescoClient
class Rotator(Fresco__POA.Observer):
def __init__(self, value, child, parent, axis):
@@ -57,10 +53,10 @@
return Fresco.Mesh(map(scale, nodes), map(triangulate, triangles), map(normalize, normals))
-class Primitive (pyfresco.PyGraphic):
+class Primitive (FrescoClient.Graphic):
"Simple graphic that draws a clock"
def __init__(self, w, h, d):
- pyfresco.PyGraphic.__init__(self)
+ FrescoClient.Graphic.__init__(self)
self.__width = w
self.__height = h
self.__depth = d
@@ -88,45 +84,45 @@
dk.draw_mesh(self.__mesh)
dk.restore()
-class GraphicApp (Fresco.App):
+class GraphicApp (FrescoClient.App):
def run(self):
vbox = kits.layout.vbox()
- phi = kits.command.bvalue(0., 360., 0., 1., 10.)
- psi = kits.command.bvalue(0., 360., 0., 1., 10.)
+ phi = kits.commands.bvalue(0., 360., 0., 1., 10.)
+ psi = kits.commands.bvalue(0., 360., 0., 1., 10.)
hbox = kits.layout.hbox()
hbox.append_graphic(kits.layout.hfill())
- hbox.append_graphic(kits.widget.slider(phi, Fresco.xaxis))
+ hbox.append_graphic(kits.widgets.slider(phi, Fresco.xaxis))
hbox.append_graphic(kits.layout.hfill())
vbox.append_graphic(hbox)
hbox = kits.layout.hbox()
hbox.append_graphic(kits.layout.hfill())
- hbox.append_graphic(kits.widget.slider(psi, Fresco.xaxis))
+ hbox.append_graphic(kits.widgets.slider(psi, Fresco.xaxis))
hbox.append_graphic(kits.layout.hfill())
vbox.append_graphic(hbox)
#primitive = Primitive(3000., 3000., 3000.)._this()
- primitive = kits.primitive.geometry(generate_mesh(300., 300., 300.))
- primitive = kits.tool.rgb(primitive, 0.6, 0.6, 1.0)
- root = kits.primitive.root(Fresco.Graphic._nil)
+ primitive = kits.primitives.geometry(generate_mesh(300., 300., 300.))
+ primitive = kits.tools.rgb(primitive, 0.6, 0.6, 1.0)
+ root = kits.primitives.root(Fresco.Graphic._nil)
# heh, try to figure out what the next few lines do :)
- transformer = kits.primitive.transformer(primitive)
+ transformer = kits.primitives.transformer(primitive)
phi.attach(Rotator(phi, transformer, root, Fresco.zaxis)._this())
- transformer = kits.primitive.transformer(transformer)
+ transformer = kits.primitives.transformer(transformer)
psi.attach(Rotator(psi, transformer, root, Fresco.yaxis)._this())
green = Fresco.Color(0., 1., 0., 1.)
direction = Fresco.Vertex(1., 0., 0.)
- light1 = kits.primitive.directional_light(transformer, green, 1., direction)
+ light1 = kits.primitives.directional_light(transformer, green, 1., direction)
orange = Fresco.Color(0.8, 1., 0., 1.)
direction = Fresco.Vertex(0., 1., 0.)
- light2 = kits.primitive.directional_light(light1, green, 1., direction)
+ light2 = kits.primitives.directional_light(light1, green, 1., direction)
violet = Fresco.Color(1., 0., 1., 1.)
direction = Fresco.Vertex(0., 0., 1.)
- light3 = kits.primitive.directional_light(light2, violet, 1., direction)
+ light3 = kits.primitives.directional_light(light2, violet, 1., direction)
root._set_body(light3)
vbox.prepend_graphic(kits.layout.align(root, 0., 0.))
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.inset, 0.5)
- frame = kits.tool.frame(vbox, 10., spec, 1)
- group = kits.tool.group(frame)
+ frame = kits.tools.frame(vbox, 10., spec, 1)
+ group = kits.tools.group(frame)
self.window = kits.desktop.shell(group, connection.clientContext)
#kits.desktop.shell(kits.tool.group(TickGraphic()._this()))
@@ -135,8 +131,8 @@
def main():
# Create singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = GraphicApp()
app.run()
Index: unidraw
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/unidraw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- unidraw 18 Feb 2003 01:52:03 -0000 1.6
+++ unidraw 4 Mar 2003 05:31:46 -0000 1.7
@@ -9,8 +9,9 @@
# Import the Fresco stubs
import Fresco, Unidraw
+import FrescoClient
-class DemoApp (Fresco.App):
+class DemoApp (FrescoClient.App):
def run(self):
# FIXME: This is bitrotted
editor = kits.unidraw.create_editor()
@@ -20,8 +21,8 @@
def main():
# Create singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = DemoApp()
app.run()
Index: viewport
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/viewport,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- viewport 18 Feb 2003 01:52:03 -0000 1.5
+++ viewport 4 Mar 2003 05:31:46 -0000 1.6
@@ -10,38 +10,33 @@
# Import the Fresco stubs and client lib
import Fresco, Unidraw, Layout
-from Fresco import Label, Callback, nullAny
-import Fresco__POA
-
-# Import Python client lib
-import pyfresco
-from pyfresco import Babylon
+import FrescoClient
-class Mapper (pyfresco.PyController):
+class Mapper (FrescoClient.Controller):
def __init__(self, xrange, yrange):
- pyfresco.PyController.__init__(self, 0)
+ FrescoClient.Controller.__init__(self, 0)
self.__xrange = xrange
self.__yrange = yrange
self._set_body(kits.layout.align(kits.layout.fixed_size(Fresco.Graphic._nil, 200., 200.), 0., 0.))
- panner = kits.widget.panner(xrange, yrange)
+ panner = kits.widgets.panner(xrange, yrange)
self.__pulldown = kits.desktop.pulldown(panner)
def press(self, pickTraversal, input_event):
- position = pyfresco.get_position(input_event)
+ position = FrescoClient.get_position(input_event)
self.__pulldown._set_position(position)
self.__pulldown._set_mapped(1)
def release(self, pickTraversal, input_event):
print "Release"
-class ViewportApp (Fresco.App):
+class ViewportApp (FrescoClient.App):
def run(self):
- Fresco.App.__init__(self)
- kits = Fresco.get_kits()
- pixmap = kits.figure.pixmap(kits.image.create("landscape.png"))
+ FrescoClient.App.__init__(self)
+ kits = FrescoClient.get_kits()
+ pixmap = kits.figures.pixmap(kits.rasters.create_raster("landscape.png"))
viewport = kits.layout.scrollable(pixmap)
- xscroller = kits.widget.scrollbar(viewport.adjustment(Fresco.xaxis), Fresco.xaxis)
- yscroller = kits.widget.scrollbar(viewport.adjustment(Fresco.yaxis), Fresco.yaxis)
+ xscroller = kits.widgets.scrollbar(viewport.adjustment(Fresco.xaxis), Fresco.xaxis)
+ yscroller = kits.widgets.scrollbar(viewport.adjustment(Fresco.yaxis), Fresco.yaxis)
mapper = Mapper(viewport.adjustment(Fresco.xaxis), viewport.adjustment(Fresco.yaxis))._this()
hbox1 = kits.layout.hbox()
hbox1.append_graphic(viewport)
@@ -54,8 +49,8 @@
vbox1.append_graphic(hbox2)
spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.5)
- background = kits.tool.frame(vbox1, 10., spec, 1)
- group = kits.tool.group(background)
+ background = kits.tools.frame(vbox1, 10., spec, 1)
+ group = kits.tools.group(background)
self.window = kits.desktop.shell(group, connection.clientContext)
def exit(self, any):
@@ -64,8 +59,8 @@
def main():
# Create the singletons
global app, kits, connection
- connection = Fresco.get_connection()
- kits = Fresco.get_kits()
+ connection = FrescoClient.get_connection()
+ kits = FrescoClient.get_kits()
app = ViewportApp()
app.run()