Merge branch 'dev' into alpha

larc · Nov 29, 2023 · 3f454db · 3f454db
2 parents f2483df + 4bf6522
commit 3f454db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/gproshan/app_viewer.cpp b/src/gproshan/app_viewer.cpp
@@ -212,6 +212,7 @@ bool app_viewer::process_simulate_scanner(viewer * p_view)
 	{
 		che * ptx_mesh = scanner_ptx_jpg(mesh.rt_embree, n_rows, n_cols, cam_pos, mesh->filename);
 		che_ptx::write_file(ptx_mesh, mesh->filename, n_rows, n_cols);
+		ptx_mesh->filename = mesh->filename + ".ptx";
 		view->add_mesh(ptx_mesh);
 	}
 

diff --git a/src/gproshan/viewer/viewer.cpp b/src/gproshan/viewer/viewer.cpp
@@ -51,10 +51,10 @@ const std::vector<ivec2> viewer::m_window_split = {	{1, 1},
 
 
 const std::vector<std::string> viewer::colormap = { "vertex color",
-													"blue heatmap",
-													"red heatmap",
-													"blue/read heatmap",
-													"set heatmap",
+													"heatmap blue",
+													"heatmap red",
+													"heatmap blue/read",
+													"heatmap set",
 													"material scene",
 													};
 
@@ -231,7 +231,7 @@ void viewer::imgui()
 	ImGui::End();
 
 	ImGui::SetNextWindowSize(ImVec2(360, -1));
-	ImGui::SetNextWindowPos(ImVec2(20, 60), ImGuiCond_Once);
+	ImGui::SetNextWindowPos(ImVec2(0, 20), ImGuiCond_Once);
 	ImGui::Begin("gproshan");
 
 	ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5);