From 008e7e59f4a8a8209686f5fffa8c996cfd6ec964 Mon Sep 17 00:00:00 2001 From: gforney Date: Wed, 8 May 2024 22:55:34 -0400 Subject: [PATCH 1/3] smokeview source: formatting changes to loading option dialog box --- Source/smokeview/glui_bounds.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Source/smokeview/glui_bounds.cpp b/Source/smokeview/glui_bounds.cpp index 95d41f23c6..214c25c25e 100644 --- a/Source/smokeview/glui_bounds.cpp +++ b/Source/smokeview/glui_bounds.cpp @@ -2625,11 +2625,9 @@ GLUI_Panel *PANEL_slice_plot2dd = NULL; GLUI_Panel *PANEL_slice_plot2de = NULL; GLUI_Panel *PANEL_slice_plot2df = NULL; GLUI_Panel *PANEL_loadbounds = NULL; -GLUI_Panel *PANEL_box_option = NULL; GLUI_Panel *PANEL_box_specifya = NULL; GLUI_Panel *PANEL_box_specifyb = NULL; GLUI_Panel *PANEL_box_specifyab = NULL; -GLUI_Panel *PANEL_load_data = NULL; GLUI_Spinner *SPINNER_partdrawskip = NULL; GLUI_Spinner *SPINNER_sliceval_ndigits = NULL; @@ -5296,20 +5294,18 @@ hvacductboundsCPP.setup("hvac", ROLLOUT_hvacduct, hvacductbounds_cpp, nhvacductb PANEL_box_specifyab = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "", false); PANEL_box_specifya = glui_bounds->add_panel_to_panel(PANEL_box_specifyab, "", false); glui_bounds->add_column_to_panel(PANEL_box_specifyab, false); - PANEL_load_data = glui_bounds->add_panel_to_panel(PANEL_box_specifyab, "Load data for meshes that", true); + PANEL_box_specifyb = glui_bounds->add_panel_to_panel(PANEL_box_specifyab, "", false); CHECKBOX_show_intersection_box = glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Show intersection box", &show_intersection_box, USEMESH_DRAW_BOX, MeshBoundCB); - CHECKBOX_show_intersected_meshes = glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Show specified meshes", &show_intersected_meshes, USEMESH_DRAW_MESH, MeshBoundCB); - glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Show specified mesh indices", &show_mesh_labels); - CHECKBOX_load_only_when_unloaded = glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Load a file only if unloaded", &load_only_when_unloaded, USEMESH_LOAD_WHEN_LOADED, MeshBoundCB); - - RADIO_intersect_option = glui_bounds->add_radiogroup_to_panel(PANEL_load_data, &glui_mesh_intersection_option, USEMESH_XYZ, MeshBoundCB); - glui_bounds->add_radiobutton_to_group(RADIO_intersect_option, _("intersect box")); - glui_bounds->add_radiobutton_to_group(RADIO_intersect_option, _("are completely within box")); - - - PANEL_mesh = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "", false); - PANEL_mesh_minmax = glui_bounds->add_panel_to_panel(PANEL_mesh, "Specify meshes by setting the intersection box"); + CHECKBOX_show_intersected_meshes = glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Show selected meshes", &show_intersected_meshes, USEMESH_DRAW_MESH, MeshBoundCB); + glui_bounds->add_checkbox_to_panel(PANEL_box_specifyb, "Show selected mesh indices", &show_mesh_labels); + CHECKBOX_load_only_when_unloaded = glui_bounds->add_checkbox_to_panel(PANEL_box_specifyb, "Load a file only if unloaded", &load_only_when_unloaded, USEMESH_LOAD_WHEN_LOADED, MeshBoundCB); + + PANEL_mesh = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "Select meshes by setting the intersection box"); + RADIO_intersect_option = glui_bounds->add_radiogroup_to_panel(PANEL_mesh, &glui_mesh_intersection_option, USEMESH_XYZ, MeshBoundCB); + glui_bounds->add_radiobutton_to_group(RADIO_intersect_option, _("Select meshes that intersect the box")); + glui_bounds->add_radiobutton_to_group(RADIO_intersect_option, _("Select meshes that are completely within the box")); + PANEL_mesh_minmax = glui_bounds->add_panel_to_panel(PANEL_mesh, "",false); PANEL_meshxyz[0] = glui_bounds->add_panel_to_panel(PANEL_mesh_minmax, "", false); PANEL_meshxyz[2] = glui_bounds->add_panel_to_panel(PANEL_mesh_minmax, "", false); PANEL_meshxyz[4] = glui_bounds->add_panel_to_panel(PANEL_mesh_minmax, "", false); @@ -5337,7 +5333,7 @@ hvacductboundsCPP.setup("hvac", ROLLOUT_hvacduct, hvacductbounds_cpp, nhvacductb SPINNER_meshclip[4]->set_float_limits(zbar0FDS, zbarFDS); SPINNER_meshclip[5]->set_float_limits(zbar0FDS, zbarFDS); - PANEL_setmesh = glui_bounds->add_panel_to_panel(PANEL_mesh, "or by specifying mesh(es) directly", true); + PANEL_setmesh = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "or by selecting mesh(es) directly", true); PANEL_addmesh = glui_bounds->add_panel_to_panel(PANEL_setmesh, "", false); SPINNER_set_mesh = glui_bounds->add_spinner_to_panel(PANEL_addmesh, "mesh:", GLUI_SPINNER_INT, &set_mesh); From 6acbc9082d53d3db4b0eae130385c3817631ff8f Mon Sep 17 00:00:00 2001 From: gforney Date: Wed, 8 May 2024 22:56:05 -0400 Subject: [PATCH 2/3] dummy commit --- Source/smokebot_trigger.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/smokebot_trigger.txt b/Source/smokebot_trigger.txt index 780e3e5e7d..cd14454b77 100644 --- a/Source/smokebot_trigger.txt +++ b/Source/smokebot_trigger.txt @@ -1,4 +1,4 @@ - master: dummy text to trigger smokebot + master: dummy text to trigger smokebot devel: dummy text to trigger smokebot devel2: dummy text to trigger smokebot test: dummy text to trigger smokebot From c3dd61467ba82a53eb430a16d1456ff119ecb3cf Mon Sep 17 00:00:00 2001 From: gforney Date: Wed, 8 May 2024 23:18:19 -0400 Subject: [PATCH 3/3] smokeview source: formatting changes to loading option dialog box --- Source/smokeview/glui_bounds.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Source/smokeview/glui_bounds.cpp b/Source/smokeview/glui_bounds.cpp index 214c25c25e..3ce9804cef 100644 --- a/Source/smokeview/glui_bounds.cpp +++ b/Source/smokeview/glui_bounds.cpp @@ -2625,9 +2625,7 @@ GLUI_Panel *PANEL_slice_plot2dd = NULL; GLUI_Panel *PANEL_slice_plot2de = NULL; GLUI_Panel *PANEL_slice_plot2df = NULL; GLUI_Panel *PANEL_loadbounds = NULL; -GLUI_Panel *PANEL_box_specifya = NULL; -GLUI_Panel *PANEL_box_specifyb = NULL; -GLUI_Panel *PANEL_box_specifyab = NULL; +GLUI_Panel *PANEL_intersection_box = NULL; GLUI_Spinner *SPINNER_partdrawskip = NULL; GLUI_Spinner *SPINNER_sliceval_ndigits = NULL; @@ -5291,20 +5289,18 @@ hvacductboundsCPP.setup("hvac", ROLLOUT_hvacduct, hvacductbounds_cpp, nhvacductb INSERT_ROLLOUT(ROLLOUT_box_specify, glui_bounds); ADDPROCINFO(loadprocinfo, nloadprocinfo, ROLLOUT_box_specify, LOAD_SPACEBOUND_ROLLOUT, glui_bounds); - PANEL_box_specifyab = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "", false); - PANEL_box_specifya = glui_bounds->add_panel_to_panel(PANEL_box_specifyab, "", false); - glui_bounds->add_column_to_panel(PANEL_box_specifyab, false); - PANEL_box_specifyb = glui_bounds->add_panel_to_panel(PANEL_box_specifyab, "", false); + PANEL_intersection_box = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "", false); + PANEL_intersection_box->set_alignment(GLUI_ALIGN_LEFT); + CHECKBOX_show_intersected_meshes = glui_bounds->add_checkbox_to_panel(PANEL_intersection_box, "Show selected meshes", &show_intersected_meshes, USEMESH_DRAW_MESH, MeshBoundCB); + glui_bounds->add_checkbox_to_panel(PANEL_intersection_box, "Show selected mesh indices", &show_mesh_labels); + CHECKBOX_load_only_when_unloaded = glui_bounds->add_checkbox_to_panel(PANEL_intersection_box, "Load a file only if unloaded", &load_only_when_unloaded, USEMESH_LOAD_WHEN_LOADED, MeshBoundCB); - CHECKBOX_show_intersection_box = glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Show intersection box", &show_intersection_box, USEMESH_DRAW_BOX, MeshBoundCB); - CHECKBOX_show_intersected_meshes = glui_bounds->add_checkbox_to_panel(PANEL_box_specifya, "Show selected meshes", &show_intersected_meshes, USEMESH_DRAW_MESH, MeshBoundCB); - glui_bounds->add_checkbox_to_panel(PANEL_box_specifyb, "Show selected mesh indices", &show_mesh_labels); - CHECKBOX_load_only_when_unloaded = glui_bounds->add_checkbox_to_panel(PANEL_box_specifyb, "Load a file only if unloaded", &load_only_when_unloaded, USEMESH_LOAD_WHEN_LOADED, MeshBoundCB); - - PANEL_mesh = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "Select meshes by setting the intersection box"); + PANEL_mesh = glui_bounds->add_panel_to_panel(ROLLOUT_box_specify, "Select meshes by specifying the intersection box"); RADIO_intersect_option = glui_bounds->add_radiogroup_to_panel(PANEL_mesh, &glui_mesh_intersection_option, USEMESH_XYZ, MeshBoundCB); glui_bounds->add_radiobutton_to_group(RADIO_intersect_option, _("Select meshes that intersect the box")); glui_bounds->add_radiobutton_to_group(RADIO_intersect_option, _("Select meshes that are completely within the box")); + CHECKBOX_show_intersection_box = glui_bounds->add_checkbox_to_panel(PANEL_mesh, "Show intersection box", &show_intersection_box, USEMESH_DRAW_BOX, MeshBoundCB); + PANEL_mesh_minmax = glui_bounds->add_panel_to_panel(PANEL_mesh, "",false); PANEL_meshxyz[0] = glui_bounds->add_panel_to_panel(PANEL_mesh_minmax, "", false); PANEL_meshxyz[2] = glui_bounds->add_panel_to_panel(PANEL_mesh_minmax, "", false);