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

enum zip archive entries

Browse Source
This commit is contained in:
David Kocik 2022-06-01 15:40:51 +02:00
parent 16b0654a6a
commit 28d4d53516
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/downloader/DownloaderApp.cpp
View File

@ -125,7 +125,7 @@ bool DownloadApp::OnCmdLineParsed(wxCmdLineParser& parser)
if (!url.empty() && m_frame != nullptr)
m_frame->start_download(std::move(url));
m_frame->start_download("open?file=https%3A%2F%2Fmedia.printables.com%2Fmedia%2Fprints%2F152208%2Fstls%2F1431590_8b8287b3-03b1-4cbe-82d0-268a0affa171%2Ff1_logo.stl");
//m_frame->start_download("open?file=https%3A%2F%2Fmedia.printables.com%2Fmedia%2Fprints%2F152208%2Fstls%2F1431590_8b8287b3-03b1-4cbe-82d0-268a0affa171%2Ff1_logo.stl");
return wxApp::OnCmdLineParsed(parser);
}

36
src/slic3r/GUI/Plater.cpp
View File

@ -50,6 +50,7 @@
#include "libslic3r/Utils.hpp"
#include "libslic3r/PresetBundle.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "libslic3r/miniz_extension.hpp"
#include "GUI.hpp"
#include "GUI_App.hpp"
@ -5452,6 +5453,37 @@ std::vector<size_t> Plater::load_files(const std::vector<std::string>& input_fil
return p->load_files(paths, load_model, load_config, imperial_units);
}
void Plater::preview_archive(const boost::filesystem::path& input_file)
{
BOOST_LOG_TRIVIAL(error) << "preview zip archive: " << input_file;
mz_zip_archive archive;
mz_zip_zero_struct(&archive);
if (!open_zip_reader(&archive, input_file.string()))
return ;
mz_uint num_entries = mz_zip_reader_get_num_files(&archive);
BOOST_LOG_TRIVIAL(error) << "entries: " << num_entries;
mz_zip_archive_file_stat stat;
bool config_found = false;
for (mz_uint i = 0; i < num_entries; ++i) {
if (mz_zip_reader_file_stat(&archive, i, &stat)) {
std::string name(stat.m_filename);
//std::replace(name.begin(), name.end(), '\\', '/');
BOOST_LOG_TRIVIAL(error) << name;
}
}
close_zip_reader(&archive);
}
enum class LoadType : unsigned char
{
Unknown,
@ -5533,7 +5565,7 @@ void ProjectDropDialog::on_dpi_changed(const wxRect& suggested_rect)
bool Plater::load_files(const wxArrayString& filenames)
{
const std::regex pattern_drop(".*[.](stl|obj|amf|3mf|prusa)", std::regex::icase);
const std::regex pattern_drop(".*[.](stl|obj|amf|3mf|prusa|zip)", std::regex::icase);
const std::regex pattern_gcode_drop(".*[.](gcode|g)", std::regex::icase);
std::vector<fs::path> paths;
@ -5624,6 +5656,8 @@ bool Plater::load_files(const wxArrayString& filenames)
}
return true;
} else if (boost::algorithm::iends_with(filename, ".zip")) {
preview_archive(*it);
}
}

2
src/slic3r/GUI/Plater.hpp
View File

@ -177,6 +177,8 @@ public:
bool load_files(const wxArrayString& filenames);
void check_selected_presets_visibility(PrinterTechnology loaded_printer_technology);
void preview_archive(const boost::filesystem::path& input_file);
const wxString& get_last_loaded_gcode() const { return m_last_loaded_gcode; }
void update();