python-gtkextra-commits

[<pyt...@li...>]

Update of /cvsroot/python-gtkextra/python-gtkextra2/examples
In directory sc8-pr-cvs1:/tmp/cvs-serv27404/examples

Modified Files:
	testgtkplot.py testgtkplot3d.py testpixmap.py 
Log Message:
more

Index: testgtkplot.py
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtkplot.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** testgtkplot.py	24 Dec 2002 18:49:10 -0000	1.6
--- testgtkplot.py	31 Dec 2002 18:04:18 -0000	1.7
***************
*** 7,10 ****
--- 7,12 ----
  
      scale = 1.0
+     def __del__(self):
+         print 'Application.__del__'
      
      def __init__(self):
***************
*** 115,120 ****
              (i, x, y) = canvas.get_active_point()
              print "Active point: %d -> %f %f" % (i, x, y)
!             #canvas.get_active_data().add_marker(i)
!             #canvas.get_active_plot().queue_draw()
          elif item.type == gtkextra.PLOT_CANVAS_MARKER:
              print "Item selected: MARKER"
--- 117,122 ----
              (i, x, y) = canvas.get_active_point()
              print "Active point: %d -> %f %f" % (i, x, y)
!             canvas.get_active_data().add_marker(i)
!             canvas.get_active_plot().queue_draw()
          elif item.type == gtkextra.PLOT_CANVAS_MARKER:
              print "Item selected: MARKER"
***************
*** 196,202 ****
          data.set_legend("Line + Symbol")
          
!         #data = plot.add_function(self.function)
!         #data.set_line_attributes(gtkextra.PLOT_LINE_SOLID, 0, blue)
!         #data.set_legend("Function Plot")
  
      def build_example2(self, plot):
--- 198,204 ----
          data.set_legend("Line + Symbol")
          
!         data = plot.add_function(self.function)
!         data.set_line_attributes(gtkextra.PLOT_LINE_SOLID, 0, 0, 0, blue)
!         data.set_legend("Function Plot")
  
      def build_example2(self, plot):
***************
*** 209,215 ****
          blue = colormap.alloc_color("blue")
          
!         #data = plot.add_function(self.gaussian)
!         #data.set_line_attributes(gtkextra.PLOT_LINE_DASHED, 2, dark_green)
!         #data.set_legend("Gaussian")
  
          data = gtkextra.PlotBar(gtk.ORIENTATION_VERTICAL)
--- 211,217 ----
          blue = colormap.alloc_color("blue")
          
!         data = plot.add_function(self.gaussian)
!         data.set_line_attributes(gtkextra.PLOT_LINE_DASHED, 0, 0, 2, dark_green)
!         data.set_legend("Gaussian")
  
          data = gtkextra.PlotBar(gtk.ORIENTATION_VERTICAL)

Index: testgtkplot3d.py
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtkplot3d.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testgtkplot3d.py	30 Dec 2002 20:42:12 -0000	1.2
--- testgtkplot3d.py	31 Dec 2002 18:04:18 -0000	1.3
***************
*** 6,9 ****
--- 6,11 ----
  
  class Application(gtk.Window):
+     def __del__(self):
+         print 'Application.__del__'
  
      def __init__(self):
***************
*** 32,37 ****
          canvas.add_plot(plot, 0.10, 0.06)
  
!         #surface = gtkextra.PlotSurface(self.function) #FIXME SOON
!         surface = gtkextra.PlotSurface()
          surface.set_xstep(0.025)
          surface.set_ystep(0.025)
--- 34,38 ----
          canvas.add_plot(plot, 0.10, 0.06)
  
!         surface = gtkextra.PlotSurface(self.function)
          surface.set_xstep(0.025)
          surface.set_ystep(0.025)
***************
*** 78,84 ****
          canvas.refresh()
          
-     def mainloop(self):
-         mainloop()
- 
      def quit(self, *args):
          gtk.main_quit()
--- 79,82 ----

Index: testpixmap.py
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testpixmap.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** testpixmap.py	10 Jul 2002 19:06:54 -0000	1.1.1.1
--- testpixmap.py	31 Dec 2002 18:04:18 -0000	1.2
***************
*** 1,8 ****
  #!/usr/bin/env python
  
! from gtk import *
! from gtkextra import *
  
! class Application(GtkWindow):
      
      cloud_xpm = [
--- 1,8 ----
  #!/usr/bin/env python
  
! import gtk
! import gtkextra
  
! class Application(gtk.Window):
      
      cloud_xpm = [
***************
*** 74,99 ****
  
      def __init__(self):
!         GtkWindow.__init__(self, title="GtkPlotPixmap Demo")
!         self.set_usize(500, 320)
!         self.connect("destroy", mainquit)
  
          colormap = self.get_colormap()
          
!         canvas = GtkPlotCanvas(PLOT_LETTER_W, PLOT_LETTER_H)
!         canvas.plot_canvas_set_flags(PLOT_CANVAS_DND_FLAGS)
          self.add(canvas)
  
!         plot = GtkPlot(width=0.5, height=0.25)
          plot.set_range(0.0, 1.0, 0.0, 1.4)
          plot.legends_move(0.5, 0.05)
          plot.set_legends_border(0, 0)
!         plot.axis_hide_title(PLOT_AXIS_TOP)
!         plot.axis_show_ticks(PLOT_AXIS_BOTTOM, 15, 3)
!         plot.axis_set_ticks(PLOT_AXIS_X, 1.0, 1)
!         plot.axis_set_ticks(PLOT_AXIS_Y, 1.0, 1)
!         plot.axis_set_visible(PLOT_AXIS_TOP, TRUE)
!         plot.axis_set_visible(PLOT_AXIS_RIGHT, TRUE)
!         plot.x0_set_visible(TRUE)
!         plot.y0_set_visible(TRUE)
          canvas.add_plot(plot, 0.15, 0.06)
  
--- 74,100 ----
  
      def __init__(self):
!         gtk.Window.__init__(self)
!         self.connect("destroy", self.quit)
!         self.set_title=("GtkPlot3D Demo")
!         self.set_size_request(550, 650)
  
          colormap = self.get_colormap()
          
!         canvas = gtkextra.PlotCanvas(gtkextra.PLOT_LETTER_W, gtkextra.PLOT_LETTER_H)
!         canvas.plot_canvas_set_flags(gtkextra.PLOT_CANVAS_DND_FLAGS)
          self.add(canvas)
  
!         plot = gtkextra.Plot(width=0.5, height=0.25)
          plot.set_range(0.0, 1.0, 0.0, 1.4)
          plot.legends_move(0.5, 0.05)
          plot.set_legends_border(0, 0)
!         plot.axis_hide_title(gtkextra.PLOT_AXIS_TOP)
!         plot.axis_show_ticks(gtkextra.PLOT_AXIS_BOTTOM, 15, 3)
!         plot.axis_set_ticks(gtkextra.PLOT_AXIS_X, 1.0, 1)
!         plot.axis_set_ticks(gtkextra.PLOT_AXIS_Y, 1.0, 1)
!         plot.axis_set_visible(gtkextra.PLOT_AXIS_TOP, gtk.TRUE)
!         plot.axis_set_visible(gtkextra.PLOT_AXIS_RIGHT, gtk.TRUE)
!         plot.x0_set_visible(gtk.TRUE)
!         plot.y0_set_visible(gtk.TRUE)
          canvas.add_plot(plot, 0.15, 0.06)
  
***************
*** 103,117 ****
          py2 = [.12, .22, .27, .12, .52, .62]
  
!         (pixmap, mask) = create_pixmap_from_xpm_d(colormap, None,
!                                                   self.cloud_xpm)
!         data = GtkPlotPixmap(pixmap, mask)
!         data.set_points(px1, py1, px2, py2)
          data.set_legend("Pixmap 1")
          plot.add_data(data)
  
!         (pixmap, mask) = create_pixmap_from_xpm_d(colormap, None,
!                                                   self.suncloud_xpm)
!         data = GtkPlotPixmap(pixmap, mask)
!         data.set_points(px2, py2)
          data.set_legend("Pixmap 2")
          plot.add_data(data)
--- 104,119 ----
          py2 = [.12, .22, .27, .12, .52, .62]
  
!         (pixmap, mask) = gtk.gdk.pixmap_colormap_create_from_xpm_d(None, colormap,
!                                                                    None, self.cloud_xpm)
!         data = gtkextra.PlotPixmap(pixmap, mask)
!         data.set_points(x=px1, y=py1)
          data.set_legend("Pixmap 1")
          plot.add_data(data)
  
!         (pixmap, mask) = gtk.gdk.pixmap_colormap_create_from_xpm_d(None, colormap,
!                                                                    None, self.suncloud_xpm)
! 
!         data = gtkextra.PlotPixmap(pixmap, mask)
!         data.set_points(x=px2, y=py2)
          data.set_legend("Pixmap 2")
          plot.add_data(data)
***************
*** 125,132 ****
              pass
  
!     def mainloop(self):
!         mainloop()
  
  if __name__ == '__main__':		
      app = Application()
!     app.mainloop()
--- 127,135 ----
              pass
  
!     def quit(self, *args):
!         gtk.main_quit()
  
  if __name__ == '__main__':		
      app = Application()
!     #app.connect("destroy", lambda win : gtk.main_quit)
!     gtk.mainloop()