Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,8 @@ std::string saveSession()
}
else{
std::cout << "saving canceled" << std::endl;

return "";
}
}

Expand Down Expand Up @@ -2135,8 +2137,6 @@ void display()
}

int prev_index_pose = session.control_points.index_pose;
if (session.control_points.is_imgui)
session.control_points.imgui(session.point_clouds_container, rotation_center);

if (prev_index_pose != session.control_points.index_pose)
{
Expand All @@ -2162,15 +2162,18 @@ void display()
camera_transition_active = true;
}

if (session.ground_control_points.is_imgui)
session.ground_control_points.imgui(session.point_clouds_container);

ImGui_ImplOpenGL2_NewFrame();
ImGui_ImplGLUT_NewFrame();
ImGui::NewFrame();

ShowMainDockSpace();

if (session.control_points.is_imgui)
session.control_points.imgui(session.point_clouds_container, rotation_center);

if (session.ground_control_points.is_imgui)
session.ground_control_points.imgui(session.point_clouds_container);

if (!session.control_points.is_imgui)
{
if (!is_loop_closure_gui)
Expand Down Expand Up @@ -2547,7 +2550,7 @@ void display()
save_all_to_las(session, output_file_name, false);
}
if (ImGui::IsItemHovered())
ImGui::SetTooltip("To export in full resolution, close the program and open again, unmark 'simple_gui', unmark 'downsample during load'");
ImGui::SetTooltip("To export in full resolution, close the program and open again and unmark 'downsample during load' before loading session");

if (ImGui::MenuItem("Separate global scans (laz)"))
{
Expand Down
5 changes: 2 additions & 3 deletions core/src/pfd_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ namespace mandeye::fd{
{
auto sel = OpenFileDialog(title, filter, false);
if (sel.empty())
{
return "";
}
return sel.back();

return std::filesystem::path(sel.back()).lexically_normal().string();
}

std::vector<std::string> OpenFileDialog(const std::string& title, const std::vector<std::string>&filter, bool multiselect)
Expand Down