GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 04:25:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce svg file menu

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-09-06 13:52:00 +02:00
parent fc11639679
commit 73d6c58db3
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
View File

@ -1351,49 +1351,49 @@ void GLGizmoSVG::draw_filename(){
ImGui::SetTooltip("%s", _u8L("Change to another .svg file").c_str()); ImGui::SetTooltip("%s", _u8L("Change to another .svg file").c_str());
} }
std::string bake1 = _u8L("Bake 1 ©"); std::string forget_path = _u8L("Forget the file path");
if (m_volume->emboss_shape->svg_file.path.empty()){ if (m_volume->emboss_shape->svg_file.path.empty()){
draw(get_icon(m_icons, IconType::bake_inactive)); draw(get_icon(m_icons, IconType::bake_inactive));
ImGui::SameLine(); ImGui::SameLine();
m_imgui->text_colored(ImGuiWrapper::COL_GREY_DARK, bake1.c_str()); m_imgui->text_colored(ImGuiWrapper::COL_GREY_DARK, forget_path.c_str());
} else { } else {
draw(get_icon(m_icons, IconType::bake)); draw(get_icon(m_icons, IconType::bake));
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Selectable(bake1.c_str())) { if (ImGui::Selectable(forget_path.c_str())) {
// set .svg_file.path_in_3mf to remember file name // set .svg_file.path_in_3mf to remember file name
m_volume->emboss_shape->svg_file.path.clear(); m_volume->emboss_shape->svg_file.path.clear();
m_volume_shape.svg_file.path.clear(); m_volume_shape.svg_file.path.clear();
m_filename_preview.clear(); m_filename_preview.clear();
} else if (ImGui::IsItemHovered()) { } else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Remove path to local svg file.\nDisable reload from disk.").c_str()); ImGui::SetTooltip("%s", _u8L("Don't save local path to SVG file.\n Also disable option to reload from disk.").c_str());
} }
} }
draw(get_icon(m_icons, IconType::bake)); //draw(get_icon(m_icons, IconType::bake));
ImGui::SameLine(); //ImGui::SameLine();
if (ImGui::Selectable(_u8L("Bake 2 ©").c_str())) { //if (ImGui::Selectable(_u8L("Bake 2 ©").c_str())) {
EmbossShape::SvgFile &svg = m_volume_shape.svg_file; // EmbossShape::SvgFile &svg = m_volume_shape.svg_file;
std::stringstream ss; // std::stringstream ss;
Slic3r::save(*svg.image, ss); // Slic3r::save(*svg.image, ss);
svg.file_data = std::make_unique<std::string>(ss.str()); // svg.file_data = std::make_unique<std::string>(ss.str());
svg.image = nsvgParse(*svg.file_data); // svg.image = nsvgParse(*svg.file_data);
assert(svg.image.get() != NULL); // assert(svg.image.get() != NULL);
if (svg.image.get() != NULL) { // if (svg.image.get() != NULL) {
m_volume->emboss_shape->svg_file = svg; // copy - write changes into volume // m_volume->emboss_shape->svg_file = svg; // copy - write changes into volume
} else { // } else {
svg = m_volume->emboss_shape->svg_file; // revert changes // svg = m_volume->emboss_shape->svg_file; // revert changes
} // }
} else if (ImGui::IsItemHovered()) { //} else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Use only paths from svg - recreate svg").c_str()); // ImGui::SetTooltip("%s", _u8L("Use only paths from svg - recreate svg").c_str());
} //}
draw(get_icon(m_icons, IconType::bake)); draw(get_icon(m_icons, IconType::bake));
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Selectable(_u8L("Bake 3 ©").c_str())) { if (ImGui::Selectable(_u8L("Bake").c_str())) {
m_volume->emboss_shape.reset(); m_volume->emboss_shape.reset();
close(); close();
} else if (ImGui::IsItemHovered()) { } else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Bake to uneditable part and save copyright of svg").c_str()); ImGui::SetTooltip("%s", _u8L("Bake into model uneditable part and protect yours ©opyright of svg").c_str());
} }
draw(get_icon(m_icons, IconType::save)); draw(get_icon(m_icons, IconType::save));
@ -1413,7 +1413,7 @@ void GLGizmoSVG::draw_filename(){
std::ofstream stream(path); std::ofstream stream(path);
if (stream.is_open()){ if (stream.is_open()){
stream << svg.file_data.get(); stream << *svg.file_data;
// change source file // change source file
m_filename_preview.clear(); m_filename_preview.clear();
@ -1429,24 +1429,24 @@ void GLGizmoSVG::draw_filename(){
ImGui::SetTooltip("%s", _u8L("Save as '.svg' file").c_str()); ImGui::SetTooltip("%s", _u8L("Save as '.svg' file").c_str());
} }
draw(get_icon(m_icons, IconType::save)); //draw(get_icon(m_icons, IconType::save));
ImGui::SameLine(); //ImGui::SameLine();
if (ImGui::Selectable((_L("Save used as") + dots).ToUTF8().data())) { //if (ImGui::Selectable((_L("Save used as") + dots).ToUTF8().data())) {
GUI::FileType file_type = FT_SVG; // GUI::FileType file_type = FT_SVG;
wxString wildcard = file_wildcards(file_type); // wxString wildcard = file_wildcards(file_type);
wxString dlg_title = _L("Export SVG file:"); // wxString dlg_title = _L("Export SVG file:");
wxString dlg_dir = from_u8(wxGetApp().app_config->get_last_dir()); // wxString dlg_dir = from_u8(wxGetApp().app_config->get_last_dir());
const EmbossShape::SvgFile& svg = m_volume_shape.svg_file; // const EmbossShape::SvgFile& svg = m_volume_shape.svg_file;
wxString dlg_file = from_u8(get_file_name(((!svg.path.empty()) ? svg.path : svg.path_in_3mf))) + ".svg"; // wxString dlg_file = from_u8(get_file_name(((!svg.path.empty()) ? svg.path : svg.path_in_3mf))) + ".svg";
wxFileDialog dlg(nullptr, dlg_title, dlg_dir, dlg_file, wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT); // wxFileDialog dlg(nullptr, dlg_title, dlg_dir, dlg_file, wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (dlg.ShowModal() == wxID_OK ){ // if (dlg.ShowModal() == wxID_OK ){
wxString out_path = dlg.GetPath(); // wxString out_path = dlg.GetPath();
std::string path{out_path.c_str()}; // std::string path{out_path.c_str()};
Slic3r::save(*m_volume_shape.svg_file.image, path); // Slic3r::save(*m_volume_shape.svg_file.image, path);
} // }
} else if (ImGui::IsItemHovered()) { //} else if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Save only used path as '.svg' file").c_str()); // ImGui::SetTooltip("%s", _u8L("Save only used path as '.svg' file").c_str());
} //}
} }
if (file_changed) { if (file_changed) {