Skip to content

Commit

Permalink
Temporarily adding back tabs in some library models for #3449
Browse files Browse the repository at this point in the history
  • Loading branch information
lesquoyb committed Dec 21, 2022
1 parent 1f21fd4 commit f13b0c0
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion msi.gama.core/src/msi/gaml/operators/System.java
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ public static IMap<String, Object> wizardPage(final String title, final String d
value = "Asks the user to confirm a choice. The two string are used to specify the title and the message of the dialog box. ",
examples =

{ @example ("bool confirm <- user_confirm(\"Confirm\",\"Please confirm\";") })
{ @example ("bool confirm <- user_confirm(\"Confirm\",\"Please confirm\");") })
@no_test
public static Boolean userConfirmDialog(final IScope scope, final String title, final String message) {
return scope.getGui().openUserInputDialogConfirm(scope, title, message);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global

experiment "Multiple displays" type: gui {
output synchronized: true {
layout #split parameters: false navigator: false editors: false consoles: false toolbars: false tray: false tabs: false;
layout #split parameters: false navigator: false editors: false consoles: false toolbars: false tray: false tabs: true;
display "nice_bar_chart" {
chart "Nice Cumulative Bar Chart" type:histogram
background: #darkblue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ experiment "Different heatmaps" type: gui
consoles: false
toolbars: false
tray: false
tabs: false
tabs: true
;

display "Nice Heatmap" type: 3d
display "Nice Heatmap" type: 2d
{
chart "Nice Heatmap" type: heatmap background: # darkblue color: # lightgreen axes: # lightgreen title_font: font('Serif', 32.0, #italic) tick_font:
chart "Nice Heatmap" type: heatmap background: # darkblue color: # lightgreen axes: # lightgreen title_font: font('Serif', 32, #italic) tick_font:
font('Monospaced', 14, #bold) label_font: font('Serif', 18, #plain) legend_font: font('SanSerif', 18, #bold) x_label: 'Nice Xlabel' y_label: 'Nice Ylabel'
{
data "test" value: mylldata color: [# darkblue, # orange] accumulate_values: false;
Expand All @@ -84,12 +84,11 @@ experiment "Different heatmaps" type: gui
data "cosX" value: mylldata color: [# blue] accumulate_values: false;
data "sinY" value: mylldata2 color: [# darkred] accumulate_values: false;
}

}

display "list_heatmap" type: 2d
{
chart "list_heatmap" type: heatmap
chart "list_heatmap" type: heatmap
{
data "test" value: myldata color: [# cyan, # red] accumulate_values: false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ species agent_with_SIR_dynamic {
experiment Simulation type: gui {
float minimum_cycle_duration <- 0.1#s;
output {
layout #vertical tabs: false;
layout #vertical tabs: true;
display display_charts toolbar: false {
chart "Time series" type: series background: rgb(47,47,47) color: #white {
data 'S' value: first(agent_with_SIR_dynamic).S color: rgb(46,204,113) ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ experiment mysimulation type: gui {
//parameter "Window" var: time_window_size category: 'Choix';
parameter "Window" var: view category: 'Choix';
output {
layout #split tabs: false;
layout #split tabs: true;
display display_charts axes: false {
chart 'BTC price' type: series
x_range: min(elapsed_steps,time_window_size*nb_steps) background: #white
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ species LV_model {
experiment Displays type: gui {
float minimum_cycle_duration <- 0.1#s;
output {
layout #split tabs: false;
layout #split tabs: true;
display D1 toolbar: false{
chart 'Time series' type: series background: rgb(47,47,47) color: #white y_label:"pop" x_tick_line_visible: false{
data "x" value: first(LV_model).x color: rgb(52,152,219);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ experiment Simulation type: gui {
parameter 'Delta (I->R)' type: float var: _delta <- 0.2 category: "Parameters";

output {
layout #split tabs: false;
layout #split tabs: true;
display chart_3system_eq name: "Split system" toolbar: false{
chart 'Split system' type: series background: rgb(47,47,47) color: #white x_tick_line_visible: false{
data 'susceptible' value: first(S_agt).Ssize color: rgb(46,204,113) marker_shape: marker_circle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ species LVEuler {
experiment examples type: gui {
float minimum_cycle_duration <- 0.1#s;
output {
layout #split tabs: false;
layout #split tabs: true;
display LV_series name: "Time series" toolbar: false {
chart 'Comparison Euler - RK4 (RK4 is more accurate)' type: series
x_serie: first(LVRK4).t[] y_label: "pop" background: rgb(47,47,47) color: #white x_tick_line_visible: false {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ species userLV {
experiment examples type: gui {
float minimum_cycle_duration <- 0.05#s;
output {
layout horizontal([vertical([0::100,1::100])::100,2::100]) tabs: false;
layout horizontal([vertical([0::100,1::100])::100,2::100]) tabs: true;
display "h=0.01" toolbar: false{
chart 'Lotka-Voltera dynamics (time series)' type: series
background: rgb(47,47,47) color: #white
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ experiment examples type: gui {
}

output {
layout #split tabs: false;
layout #split tabs: true;
display SIR toolbar: false {
chart 'Time Teries ('+step_string+' per cycle)' type: series
background: rgb(47,47,47) color: #white y_label: "pop" x_tick_line_visible: false{
Expand Down

0 comments on commit f13b0c0

Please sign in to comment.