* Bug #14359 fixed - Black Hole demo updated. Stop and Clear buttons did not have...

Change-Id: Idc92db0fb501968cd9cc5433b4d23cc1f399a778

diff --git a/scilab/CHANGES b/scilab/CHANGES
index 4545c20..176c052 100644 (file)
--- a/scilab/CHANGES
+++ b/scilab/CHANGES
@@ -308,6 +308,8 @@ In 6.0.0:
 
 * Bug #14035 fixed - ndgrid did not manage all homogeneous data type (booleans, integers, polynomials, rationals, strings, [])
 
+* Bug #14359 fixed - Black Hole demo updated. Stop and Clear buttons did not have priority tag set. Callback_type property has been added and set to 10.
+
 * Bug #14423 fixed - bench_run did not have a return value, export file was not configurable
 
 * Bug #14433 fixed - acoth (which call atanh) crash scilab

diff --git a/scilab/modules/differential_equations/demos/flow/blackhole_interface.sci b/scilab/modules/differential_equations/demos/flow/blackhole_interface.sci
index 9656600..ccd62ec 100644 (file)
--- a/scilab/modules/differential_equations/demos/flow/blackhole_interface.sci
+++ b/scilab/modules/differential_equations/demos/flow/blackhole_interface.sci
@@ -458,6 +458,7 @@ function start_simu()
     my_figure_handle = get("main_figure");
     fin=my_figure_handle.user_data
     my_figure_handle.user_data=%f
+    set("clear_button", "userdata", %f);
     slider_r     = get("slider_r");
     slider_theta = get("slider_theta");
     slider_speed = get("slider_speed");
@@ -487,16 +488,18 @@ function start_simu()
         end
     end
 
+    if get("clear_button", "userdata") then
+        clear_simu()
+    end
+
     if is_handle_valid(my_figure_handle) then
         my_figure_handle.user_data = %t;
     end
 endfunction
 
 function stop_simu()
-    //stop button callback
-    my_figure_handle = get("main_figure");
-    fin = %T;
-    my_figure_handle.user_data = fin
+    set("main_figure", "userdata", %t);
+    set("clear_button", "userdata", %f);
 endfunction
 
 function clear_simu()
@@ -507,5 +510,8 @@ function clear_simu()
         curAxe = gca();
         traj_handle = curAxe.children(1).children(5);
         traj_handle.data = [0 0 0];
+        return
     end
+    set("main_figure", "userdata", %t);
+    set("clear_button", "userdata", %t);
 endfunction

diff --git a/scilab/modules/differential_equations/demos/flow/create_interface.sci b/scilab/modules/differential_equations/demos/flow/create_interface.sci
index af60581..a0839ae 100644 (file)
--- a/scilab/modules/differential_equations/demos/flow/create_interface.sci
+++ b/scilab/modules/differential_equations/demos/flow/create_interface.sci
@@ -170,6 +170,7 @@ function create_buttons(button_frame)
         "String", "Stop", ...
         "Fontsize", 14, ...
         "callback", "stop_simu", ...
+        "callback_type", 10, ...
         "constraints", c_buttons, ...
         "tag", "stop_button");
 
@@ -185,6 +186,7 @@ function create_buttons(button_frame)
         "String", "Clear", ...
         "Fontsize", 14, ...
         "callback", "clear_simu", ...
+        "callback_type", 10, ...
         "constraints", c_buttons, ...
         "tag", "clear_button");