From 4d7de73877bb6df5377026bb34702ab3c1e7fcc8 Mon Sep 17 00:00:00 2001 From: Vladislav TRUBKIN Date: Fri, 4 Apr 2014 10:01:48 +0200 Subject: [PATCH] Xcos: updated TKSCALE simulation function (slider and legend are at the same frame). Change-Id: I0c38a9d9b52b271e9d231bb8be54e04b5c3527e2 --- .../helptools/images/TKSCALE_en_US.zcos.png | Bin 5353 -> 5909 bytes .../scicos_blocks/macros/Sources/tkscaleblk.sci | 75 +++++++++++++------- .../examples/sources_pal/en_US/TKSCALE_en_US.zcos | Bin 3484 -> 4034 bytes 3 files changed, 50 insertions(+), 25 deletions(-) diff --git a/scilab/modules/helptools/images/TKSCALE_en_US.zcos.png b/scilab/modules/helptools/images/TKSCALE_en_US.zcos.png index 0d715e64ddce52a5b01844b761550b8fce6023a8..7d84d7bf49e7dbbb7f4dc6c1ca7f402cf2e91a5a 100644 GIT binary patch literal 5909 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 literal 5353 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 ZWY`D1T7!;e;eTOXQ&)j17e6u!{1?bmZNdNm diff --git a/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci b/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci index bad00cc..8a27d79 100644 --- a/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci +++ b/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci @@ -22,14 +22,15 @@ function block=tkscaleblk(block,flag) if flag == 1 then // Output update - slider = findobj("Tag", block.label + "#slider"); + slider = get(block.uid + "#slider"); + if slider <> [] then // calculate real value - value = (block.rpar(1) + block.rpar(2) - slider.value) / block.rpar(3); + value = (block.rpar(1) + block.rpar(2) + get(slider,"value")) / block.rpar(3); - w = slider.parent; + w = get(block.uid); if w <> [] then - w.info_message = string(value); + set(w, "info_message", string(value)); end block.outptr(1) = value; @@ -38,44 +39,68 @@ function block=tkscaleblk(block,flag) // Initialization // if already exists (stopped) then reuse - f = findobj("Tag", block.label); + f = get(block.uid); if f <> [] then return; end - f = figure("Tag", block.label, "Figure_name", "TK Source: " + block.label); - - // delete standard menus - delmenu(f.figure_id, gettext("&File")); - delmenu(f.figure_id, gettext("&Tools")); - delmenu(f.figure_id, gettext("&Edit")); - delmenu(f.figure_id, gettext("&?")); - toolbar(f.figure_id, "off"); + f = figure("Figure_name", "TK Source: " + block.label, ... + "dockable", "off", ... + "infobar_visible" , "on", ... + "toolbar", "none", ... + "menubar_visible", "off", ... + "menubar", "none", ... + "backgroundcolor", [1 1 1], ... + "default_axes", "off", ... + "figure_size", [180 350], ... + "layout", "border", ... + "figure_position", [40 40], ... + "Tag", block.uid); - f.position = [0 0 80 200]; + frame_slider = uicontrol(f, ... + "style", "frame", ... + "constraints", createConstraints("border", "left", [180, 0]), ... + "border", createBorder("line", "lightGray", 1), ... + "backgroundcolor", [1 1 1], ... + "layout", "gridbag"); // slider bounds = block.rpar(1:2); initial = mean(bounds); - uicontrol(f, "Style", "slider", "Tag", block.label + "#slider", .. - "Min", bounds(1), "Max", bounds(2), "Value", initial, .. - "Position", [0 0 20 200], "SliderStep", [block.rpar(3) 2*block.rpar(3)]); + uicontrol(frame_slider, ... + "Style", "slider", ... + "Tag", block.uid + "#slider", ... + "Min", bounds(1), ... + "Max", bounds(2), ... + "Value", initial, ... + "Position", [0 0 10 20], ... + "SliderStep", [block.rpar(3) 2*block.rpar(3)]); + + frame_label = uicontrol(frame_slider, ... + "style", "frame", ... + "constraints", createConstraints("border", "right"), ... + "backgroundcolor", [1 1 1], ... + "layout", "gridbag"); // labels - labels = string([bounds(2) ;.. - mean([bounds(2) initial]) ;.. - initial ;.. - mean([bounds(1) initial]) ;.. + labels = string([bounds(2) ; ... + mean([bounds(2) initial]) ; ... + initial ; ... + mean([bounds(1) initial]) ; ... bounds(1)]); - labels = strcat(labels, "


"); - uicontrol(f, "Style", "text", "String", labels(1), .. - "Position", [30 0 50 200]); + labels = "" + strcat(labels, "


") + ""; + + uicontrol(frame_label, ... + "Style", "text", ... + "String", labels(1), ... + "FontWeight", "bold", ... + "backgroundcolor", [1 1 1]); // update default value block.outptr(1) = initial / block.rpar(3); elseif flag == 5 then // Ending - f = findobj("Tag", block.label); + f = get(block.uid); if f <> [] then close(f); end diff --git a/scilab/modules/xcos/examples/sources_pal/en_US/TKSCALE_en_US.zcos b/scilab/modules/xcos/examples/sources_pal/en_US/TKSCALE_en_US.zcos index 2d978d7ca3b7cf294f8aa9cb83b18bca79f2b499..c15e5e0a9a0e8f7c35013241c4bde3700ced14a0 100644 GIT binary patch delta 3547 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 Gz5f8g^q6%3 delta 2988 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 U1EE;41a<*z6(<)%GTR^JKfhY2@Bjb+ -- 1.7.9.5