[Python-gtkextra-commits] CVS: python-gtkextra2/examples testgtkplot.py,1.2,1.3

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

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

Modified Files:
	testgtkplot.py 
Log Message:
testgtkplot.py mostly works now. Still VERY rough.

Index: testgtkplot.py
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtkplot.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testgtkplot.py	11 Jul 2002 19:17:44 -0000	1.2
--- testgtkplot.py	12 Jul 2002 19:59:50 -0000	1.3
***************
*** 9,12 ****
--- 9,14 ----
      
      def __init__(self):
+         self.hack = []
+         
          self.nlayers = 0
          self.buttons = []
***************
*** 47,53 ****
          plot.axis_set_labels_suffix(gtkextra.PLOT_AXIS_LEFT, "%");
          canvas.add_plot(plot, 0.15, 0.06)
!         #self.build_example1(plot)
! 
!         
  
          plot = self.new_layer(canvas)
--- 49,53 ----
          plot.axis_set_labels_suffix(gtkextra.PLOT_AXIS_LEFT, "%");
          canvas.add_plot(plot, 0.15, 0.06)
!         self.build_example1(plot)
  
          plot = self.new_layer(canvas)
***************
*** 63,70 ****
          plot.legends_move(0.58, 0.05)
          canvas.add_plot(plot, 0.15, 0.4)
!         #self.build_example2(plot)
! 
!         #self.show_all()
!         #return
  
          canvas.connect("move_item", self.move_item)
--- 63,67 ----
          plot.legends_move(0.58, 0.05)
          canvas.add_plot(plot, 0.15, 0.4)
!         self.build_example2(plot)
  
          canvas.connect("move_item", self.move_item)
***************
*** 81,86 ****
                                  "Format text mixing \\Bbold \\N\\i, italics, "\
                                  "\\ggreek \\4\\N and \\+different fonts")
!         #This is harder since "data" can be different types.  Think about this...
!         #child.data.set_border(gtkextra.PLOT_BORDER_SHADOW, 2, 0, 2)
  
          self.show_all()
--- 78,83 ----
                                  "Format text mixing \\Bbold \\N\\i, italics, "\
                                  "\\ggreek \\4\\N and \\+different fonts")
! 
!         child.data.set_border(gtkextra.PLOT_BORDER_SHADOW, 2, 0, 2)
  
          self.show_all()
***************
*** 177,206 ****
  
          colormap = self.get_colormap()
!         red = colormap.alloc("red")
!         black = colormap.alloc("black")
!         blue = colormap.alloc("blue")
  
!         data = GtkPlotData()
          plot.add_data(data)
          data.set_points(px1, py1, dx1, dy1)
!         data.set_symbol(gtkextra.PLOT_SYMBOL_DIAMOND, gtkextra.PLOT_SYMBOL_EMPTY, 10, 2, red)
!         data.set_line_attributes(gtkextra.PLOT_LINE_SOLID, 1, red)
          data.set_connector(gtkextra.PLOT_CONNECT_SPLINE)
          data.show_yerrbars()
          data.set_legend("Spline + EY")
  
!         data = GtkPlotData()
          plot.add_data(data)
          data.set_points(px2, py2, dx2, dy2)
!         data.set_symbol(gtkextra.PLOT_SYMBOL_SQUARE, gtkextra.PLOT_SYMBOL_OPAQUE, 8, 2, black)
!         data.set_line_attributes(gtkextra.PLOT_LINE_SOLID, 4, red)
          data.set_connector(gtkextra.PLOT_CONNECT_STRAIGHT)
!         data.set_x_attributes(gtkextra.PLOT_LINE_SOLID, 0, black)
!         data.set_y_attributes(gtkextra.PLOT_LINE_SOLID, 0, black)
          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):
--- 174,206 ----
  
          colormap = self.get_colormap()
!         red = colormap.alloc_color("red")
!         black = colormap.alloc_color("black")
!         blue = colormap.alloc_color("blue")
  
!         data = gtkextra.PlotData()
          plot.add_data(data)
          data.set_points(px1, py1, dx1, dy1)
!         data.set_symbol(gtkextra.PLOT_SYMBOL_DIAMOND, gtkextra.PLOT_SYMBOL_EMPTY, 10, 2, red, red)
!         data.set_line_attributes(gtkextra.PLOT_LINE_SOLID, 0, 0, 1, red)
          data.set_connector(gtkextra.PLOT_CONNECT_SPLINE)
          data.show_yerrbars()
          data.set_legend("Spline + EY")
+         self.hack.append(data) #FIXME: Crashes without holding this. I think plot.add_data() should do a ref().
  
! 
!         data = gtkextra.PlotData()
          plot.add_data(data)
          data.set_points(px2, py2, dx2, dy2)
!         data.set_symbol(gtkextra.PLOT_SYMBOL_SQUARE, gtkextra.PLOT_SYMBOL_OPAQUE, 8, 2, black, black)
!         data.set_line_attributes(gtkextra.PLOT_LINE_SOLID, 0, 0, 4, red)
          data.set_connector(gtkextra.PLOT_CONNECT_STRAIGHT)
!         data.set_x_attributes(gtkextra.PLOT_LINE_SOLID, 0, 0, 0, black)
!         data.set_y_attributes(gtkextra.PLOT_LINE_SOLID, 0, 0, 0, black)
          data.set_legend("Line + Symbol")
+         self.hack.append(data) #FIXME: Crashes without holding this. I think plot.add_data() should do a ref().
          
!         #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):
***************
*** 210,228 ****
  
          colormap = self.get_colormap()
!         dark_green = colormap.alloc("dark green")
!         blue = colormap.alloc("blue")
          
!         data = plot.add_function(self.gaussian)
!         data.set_line_attributes(gtkextra.PLOT_LINE_DASHED, 2, dark_green)
!         data.set_legend("Gaussian")
  
!         data = GtkPlotBar(gtkextra.ORIENTATION_VERTICAL)
          plot.add_data(data)
          data.set_points(px2, py2, dx2)
!         data.set_symbol(gtkextra.PLOT_SYMBOL_NONE, gtkextra.PLOT_SYMBOL_OPAQUE, 10, 2, blue)
!         data.set_line_attributes(gtkextra.PLOT_LINE_NONE, 1, blue)
          data.set_connector(gtkextra.PLOT_CONNECT_NONE)
          data.set_legend("V Bars")
!         
      def function(self, x, *extra):
          try:
--- 210,229 ----
  
          colormap = self.get_colormap()
!         dark_green = colormap.alloc_color("dark green")
!         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)
          plot.add_data(data)
          data.set_points(px2, py2, dx2)
!         data.set_symbol(gtkextra.PLOT_SYMBOL_NONE, gtkextra.PLOT_SYMBOL_OPAQUE, 10, 2, blue, blue)
!         data.set_line_attributes(gtkextra.PLOT_LINE_NONE, 0, 0, 1, blue)
          data.set_connector(gtkextra.PLOT_CONNECT_NONE)
          data.set_legend("V Bars")
!         self.hack.append(data) #FIXME: Crashes without holding this. I think plot.add_data() should do a ref().
! 
      def function(self, x, *extra):
          try:
***************
*** 239,243 ****
          gtk.main_quit()
  
! if __name__ == '__main__':		
      app = Application()
      gtk.main()
--- 240,245 ----
          gtk.main_quit()
  
! if __name__ == '__main__':
!     raw_input("attach now")
      app = Application()
      gtk.main()