mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e6697a6405
* ext/tk/tcltklib.c: avoid error on a shared object. * ext/tk/extconf.rb: support --with-tcltkversion * ext/tk/README.tcltklib: add document about --with-tcltkversion * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: not work on $SAFE==4 * ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9. * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the procedure which called at end of the timer. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options. * ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. * ext/tk/lib/tk/text.rb: typo. call a wrong method. * ext/tk/lib/tk/itemconfig.rb: ditto. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/canvas.rb: support alias names of option keys. * ext/tk/lib/tk/grid.rb: lack of module-method definitions. * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported parameter patterns of configure method. * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row. * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot pass the given block to methods of Tk::Wm module. * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to an invalid value. * ext/tk/lib/tk.rb: fix memory (object) leak bug. * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak. * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb: bug fix. * ext/tk/lib/tkextlib/blt/component.rb, ext/tk/lib/tkextlib/tile/tentry.rb, ext/tk/lib/tkextlib/tile/treeview.rb: ditto. * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: bug fix. * ext/tk/sample/ttk_wrapper.rb: ditto. * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom. * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode. * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. add Tk::Tile.themes and Tk::Tile.set_theme(theme). * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions. * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) characters for headings. * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name. * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; those are attributes of event object). It means that Ruby/Tk accepts not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". It is potentially incompatible, when user passes symbols to the arguments of the callback block (the block receives the symbols as strings). I think that is very rare case (probably, used by Ruby/Tk experts only). When causes such trouble, please give strings instead of such symbol parameters (e.g. call Symbol#to_s method). * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, ext/tk/lib/tkextlib/blt/treeview.rb, ext/tk/lib/tkextlib/winico/winico.rb: ditto. * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on TkUtil::CallbackSubst class (it is useful on Ruby 1.9). * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, ext/tk/lib/tkextlib/iwidgets/spinner.rb, ext/tk/lib/tkextlib/iwidgets/entryfield.rb, ext/tk/lib/tkextlib/iwidgets/calendar.rb, ext/tk/lib/tkextlib/blt/dragdrop.rb, ext/tk/lib/tkextlib/tkDND/tkdnd.rb, ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c. * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define the constant WITH_ENCODING. * ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
124 lines
3.6 KiB
Ruby
124 lines
3.6 KiB
Ruby
# plot.rb
|
|
#
|
|
# This demonstration script creates a canvas widget showing a 2-D
|
|
# plot with data points that can be dragged with the mouse.
|
|
#
|
|
# 2-D plot widget demo (called by 'widget')
|
|
#
|
|
|
|
# toplevel widget
|
|
if defined?($plot_demo) && $plot_demo
|
|
$plot_demo.destroy
|
|
$plot_demo = nil
|
|
end
|
|
|
|
# demo toplevel widget
|
|
$plot_demo = TkToplevel.new {|w|
|
|
title("Plot Demonstration")
|
|
iconname("Plot")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
# label
|
|
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
|
|
'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot. You can doctor the data by dragging any of the points with mouse button 1."){
|
|
pack('side'=>'top')
|
|
}
|
|
|
|
# frame
|
|
$plot_buttons = TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
text 'Dismiss'
|
|
command proc{
|
|
tmppath = $plot_demo
|
|
$plot_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'Show Code'
|
|
command proc{showCode 'plot'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
}
|
|
$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
# font
|
|
plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
|
|
|
|
# canvas
|
|
$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
|
|
$plot_canvas.pack('side'=>'top', 'fill'=>'x')
|
|
|
|
# plot
|
|
TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
|
|
TkcLine.new($plot_canvas, 100, 250, 100, 50, 'width'=>2)
|
|
TkcText.new($plot_canvas, 225, 20,
|
|
'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
|
|
|
|
(0..10).each {|i|
|
|
x = 100 + (i * 30)
|
|
TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
|
|
TkcText.new($plot_canvas, x, 254,
|
|
'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
|
|
}
|
|
(0..5).each {|i|
|
|
y = 250 - (i * 40)
|
|
TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
|
|
TkcText.new($plot_canvas, 96, y,
|
|
'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
|
|
}
|
|
|
|
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
|
|
x = 100 + (3*xx)
|
|
y = 250 - (4*yy)/5
|
|
item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
|
|
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
|
|
item.addtag 'point'
|
|
end
|
|
|
|
$plot_canvas.itembind('point', 'Any-Enter',
|
|
proc{$plot_canvas.itemconfigure 'current','fill','red'})
|
|
$plot_canvas.itembind('point', 'Any-Leave',
|
|
proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
|
|
$plot_canvas.itembind('point', '1',
|
|
proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
|
|
$plot_canvas.itembind('point', 'ButtonRelease-1',
|
|
proc{$plot_canvas.dtag 'selected'})
|
|
$plot_canvas.bind('B1-Motion',
|
|
proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
|
|
|
|
$plot = {'lastX'=>0, 'lastY'=>0}
|
|
|
|
# plotDown --
|
|
# This method is invoked when the mouse is pressed over one of the
|
|
# data points. It sets up state to allow the point to be dragged.
|
|
#
|
|
# Arguments:
|
|
# w - The canvas window.
|
|
# x, y - The coordinates of the mouse press.
|
|
|
|
def plotDown (w, x, y)
|
|
w.dtag 'selected'
|
|
w.addtag_withtag 'selected', 'current'
|
|
w.raise 'current'
|
|
$plot['lastX'] = x
|
|
$plot['lastY'] = y
|
|
end
|
|
|
|
# plotMove --
|
|
# This method is invoked during mouse motion events. It drags the
|
|
# current item.
|
|
#
|
|
# Arguments:
|
|
# w - The canvas window.
|
|
# x, y - The coordinates of the mouse.
|
|
|
|
def plotMove (w, x, y)
|
|
w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
|
|
$plot['lastX'] = x
|
|
$plot['lastY'] = y
|
|
end
|
|
|