3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH: [STUDIO-1868] fetch printer model files and parse

Browse source 
Change-Id: If8da0072be5856cc179da3e62a06982de0ce2ecb
This commit is contained in:
chunmao.guo 2023-04-23 09:18:10 +08:00 • committed by Lane.Wei
parent e8387b97ac
commit 904b122878
4 changed files with 391 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

226
src/slic3r/GUI/Printer/PrinterFileSystem.cpp
View file

@ -1,11 +1,14 @@
#include "PrinterFileSystem.h"
#include "libslic3r/Utils.hpp"
#include "libslic3r/Format/bbs_3mf.hpp"
#include "libslic3r/Model.hpp"
#include "../../Utils/NetworkAgent.hpp"
#include "../BitmapCache.hpp"
#include <boost/algorithm/hex.hpp>
#include <boost/uuid/detail/md5.hpp>
#include <boost/regex.hpp>
#include "nlohmann/json.hpp"
@ -43,14 +46,25 @@ PrinterFileSystem::PrinterFileSystem()
m_session.owner = this;
#ifdef PRINTER_FILE_SYSTEM_TEST
auto time = wxDateTime::Now();
wxString path = "D:\\work\\pic\\";
for (int i = 0; i < 10; ++i) {
auto name = wxString::Format(L"gcode-%02d.3mf", i + 1);
m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i < 5 ? FF_DOWNLOAD : 0, default_thumbnail, i * 34 - 35});
std::ifstream ifs((path + name).ToUTF8().data(), std::ios::binary);
if (ifs)
ParseThumbnail(m_file_list.back(), ifs);
time.Add(wxDateSpan::Days(-1));
}
m_file_list.swap(m_file_list_cache[{F_MODEL, ""}]);
time = wxDateTime::Now();
for (int i = 0; i < 100; ++i) {
auto name = wxString::Format(L"img-%03d.jpg", i + 1);
wxImage im(L"D:\\work\\pic\\" + name);
m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i > 3 ? im : default_thumbnail, i < 20 ? FF_DOWNLOAD : 0, i * 10 - 40 - 1});
wxImage im(path + name);
m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i < 20 ? FF_DOWNLOAD : 0, i > 3 ? im : default_thumbnail, i * 10 - 40 - 1});
time.Add(wxDateSpan::Days(-1));
}
m_file_list[0].thumbnail = default_thumbnail;
BuildGroups();
m_file_list.swap(m_file_list_cache[{F_TIMELAPSE, ""}]);
#endif
}
@ -59,14 +73,20 @@ PrinterFileSystem::~PrinterFileSystem()
m_recv_thread.detach();
}
void PrinterFileSystem::SetFileType(FileType type)
void PrinterFileSystem::SetFileType(FileType type, std::string const &storage)
{
if (this->m_file_type == type)
if (m_file_type == type && m_file_storage == storage)
return;
this->m_file_type = type;
m_file_list.swap(m_file_list2);
assert(m_file_list_cache[std::make_pair(m_file_type, m_file_storage)].empty());
m_file_list.swap(m_file_list_cache[{m_file_type, m_file_storage}]);
std::swap(m_file_type, type);
m_file_storage = storage;
m_file_list.swap(m_file_list_cache[{m_file_type, m_file_storage}]);
m_lock_start = m_lock_end = 0;
BuildGroups();
SendChangedEvent(EVT_FILE_CHANGED);
if (type == F_INVALID_TYPE)
return;
m_status = Status::ListSyncing;
SendChangedEvent(EVT_STATUS_CHANGED, m_status);
ListAllFiles();
@ -94,7 +114,10 @@ size_t PrinterFileSystem::EnterSubGroup(size_t index)
void PrinterFileSystem::ListAllFiles()
{
json req;
req["type"] = m_file_type == F_VIDEO ? "video" : "timelapse";
char const * types[] {"timelapse","video", "model" };
req["type"] = types[m_file_type];
if (!m_file_storage.empty())
req["storage"] = m_file_storage;
req["notify"] = "DETAIL";
SendRequest<FileList>(LIST_INFO, req, [this](json const& resp, FileList & list, auto) {
json files = resp["file_lists"];
@ -103,7 +126,7 @@ void PrinterFileSystem::ListAllFiles()
std::string path = f.value("path", "");
time_t time = f.value("time", 0);
boost::uint64_t size = f["size"];
File ff = {name, path, time, size, default_thumbnail};
File ff = {name, path, time, size, 0, default_thumbnail};
list.push_back(ff);
}
return 0;
@ -235,6 +258,38 @@ void PrinterFileSystem::DownloadCancel(size_t index)
file.flags &= ~FF_DOWNLOAD;
}
void PrinterFileSystem::FetchModel(size_t index, std::function<void(std::string const &)> callback)
{
json req;
json arr;
if (index == (size_t) -1) return;
if (index >= m_file_list.size()) return;
auto &file = m_file_list[index];
arr.push_back(file.path + "#_rel/.rels");
arr.push_back(file.path + "#3D/3dmodel.model");
arr.push_back(file.path + "#Metadata/slice_info.config");
arr.push_back(file.path + "#Metadata/project_settings.config");
for (auto & meta : file.metadata) {
if (boost::algorithm::starts_with(meta.first, "plate_thumbnail_"))
arr.push_back(file.path + "#" + meta.second);
}
req["paths"] = arr;
SendRequest<File>(
SUB_FILE, req,
[](json const &resp, File &file, unsigned char const *data) -> int {
// in work thread, continue recv
// receive data
boost::uint32_t size = resp["size"];
if (size > 0) {
file.local_path = std::string((char *) data, size);
}
return 0;
},
[callback](int, File const &file) {
callback(file.local_path);
});
}
size_t PrinterFileSystem::GetCount() const
{
if (m_group_mode == G_NONE)
@ -242,6 +297,12 @@ size_t PrinterFileSystem::GetCount() const
return m_group_mode == G_YEAR ? m_group_year.size() : m_group_month.size();
}
std::string PrinterFileSystem::File::Metadata(std::string const &key, std::string const & dflt) const
{
auto iter = metadata.find(key);
return iter == metadata.end() || iter->second.empty() ? dflt : iter->second;
}
size_t PrinterFileSystem::GetIndexAtTime(boost::uint32_t time)
{
auto iter = std::upper_bound(m_file_list.begin(), m_file_list.end(), File{"", "", time});
@ -513,7 +574,7 @@ void PrinterFileSystem::DownloadNextFile()
m_task_flags |= FF_DOWNLOAD;
m_download_seq = SendRequest<Progress>(
FILE_DOWNLOAD, req,
[this, download](json const &resp, Progress &prog, unsigned char const *data) -> int {
[download](json const &resp, Progress &prog, unsigned char const *data) -> int {
// in work thread, continue recv
size_t size = resp["size"];
prog.size = resp["offset"];
@ -572,65 +633,148 @@ void PrinterFileSystem::UpdateFocusThumbnail()
return;
size_t start = m_lock_start;
size_t end = std::min(m_lock_end, GetCount());
std::vector<std::string> names;
std::vector<std::string> paths;
std::vector<File> names;
std::vector<File> paths;
for (; start < end; ++start) {
auto &file = GetFile(start);
if ((file.flags & FF_THUMNAIL) == 0) {
if (file.path.empty())
names.push_back(file.name);
names.push_back({file.name, "", 0, 0, FF_THUMNAIL});
else
paths.push_back(file.path + "#thumbnail");
paths.push_back({"", file.path});
if (names.size() >= 5 || paths.size() >= 5)
break;
}
}
if (names.empty() && paths.empty())
return;
m_task_flags |= FF_THUMNAIL;
UpdateFocusThumbnail2(std::make_shared<std::vector<File>>(paths), paths.empty() ? 0 : m_file_type == F_MODEL ? 2 : 1);
}
bool PrinterFileSystem::ParseThumbnail(File &file)
{
std::istringstream iss(file.local_path, std::ios::binary);
return ParseThumbnail(file, iss);
}
static std::string durationString(long duration)
{
static boost::regex rx("^0d(0h)?");
auto time = boost::format("%1%d%2%h%3%m") % (duration / 86400) % ((duration % 86400) / 3600) % ((duration % 3600) / 60);
return boost::regex_replace(time.str(), rx, "");
}
bool PrinterFileSystem::ParseThumbnail(File &file, std::istream &is)
{
Slic3r::DynamicPrintConfig config;
Slic3r::Model model;
Slic3r::PlateDataPtrs plate_data_list;
Slic3r::Semver file_version;
if (!Slic3r::load_gcode_3mf_from_stream(is, &config, &model, &plate_data_list, &file_version))
return false;
float time = 0.f;
float weight = 0.f;
for (auto &plate : plate_data_list) {
time += atof(plate->gcode_prediction.c_str());
weight += atof(plate->gcode_weight.c_str());
file.metadata.emplace("plate_thumbnail_" + std::to_string(plate->plate_index), plate->thumbnail_file);
}
file.metadata.emplace("Title", model.model_info->model_name);
file.metadata.emplace("Time", durationString(round(time)));
file.metadata.emplace("Weight", std::to_string(int(round(weight))));
auto thumbnail = model.model_info->metadata_items["Thumbnail"];
if (thumbnail.empty() && !plate_data_list.empty()) {
thumbnail = plate_data_list.front()->thumbnail_file;
if (thumbnail.empty()) {
thumbnail = plate_data_list.front()->gcode_file;
boost::algorithm::replace_all(thumbnail, ".gcode", ".png");
}
}
file.metadata.emplace("Thumbnail", thumbnail);
return true;
}
void PrinterFileSystem::UpdateFocusThumbnail2(std::shared_ptr<std::vector<File>> files, int type)
{
json req;
json arr;
if (paths.empty()) {
for (auto &name : names) arr.push_back(name);
if (type == 0) {
for (auto &file : *files) arr.push_back(file.name);
req["files"] = arr;
if (m_file_type == F_MODEL) {
for (auto &file : *files) arr.push_back(file.path);
}
for (auto &file : *files) arr.push_back(file.path);
} else {
for (auto &path : paths) arr.push_back(path);
if (type == 1) {
for (auto &file : *files) arr.push_back(file.path + "#thumbnail");
} else if (type == 2) {
for (auto &file : *files) {
arr.push_back(file.path + "#_rel/.rels");
arr.push_back(file.path + "#3D/3dmodel.model");
arr.push_back(file.path + "#Metadata/slice_info.config");
arr.push_back(file.path + "#Metadata/project_settings.config");
}
req["zip"] = true;
} else {
for (auto &file : *files) arr.push_back(file.path + "#" + file.metadata["Thumbnail"]);
}
req["paths"] = arr;
}
m_task_flags |= FF_THUMNAIL;
SendRequest<Thumbnail>(
THUMBNAIL, req,
[this](json const &resp, Thumbnail &thumb, unsigned char const *data) -> int {
SendRequest<File>(
SUB_FILE, req, [type](json const &resp, File &file, unsigned char const *data) -> int {
// in work thread, continue recv
// receive data
wxString mimetype = resp.value("mimetype", "image/jpeg");
std::string thumbnail = resp.value("thumbnail", "");
std::string path = resp.value("path", "");
boost::uint32_t size = resp["size"];
thumb.name = thumbnail;
thumb.path = path;
wxString mimetype = resp.value("mimetype", "image/jpeg");
std::string thumbnail = resp.value("thumbnail", "");
std::string path = resp.value("path", "");
boost::uint32_t size = resp["size"];
file.name = thumbnail;
file.path = path;
if (size > 0) {
wxMemoryInputStream mis(data, size);
thumb.thumbnail = wxImage(mis, mimetype);
if (type != 2) {
wxMemoryInputStream mis(data, size);
file.thumbnail = wxImage(mis, mimetype);
} else {
file.local_path = std::string((char *) data, size);
ParseThumbnail(file);
}
}
return 0;
},
[this](int result, Thumbnail const &thumb) {
auto n = thumb.name.find_last_of('.');
auto name = n == std::string::npos ? thumb.name : thumb.name.substr(0, n);
n = thumb.path.find_last_of('#');
auto path = n == std::string::npos ? thumb.path : thumb.path.substr(0, n);
[this, files, type](int result, File const &file) {
auto n = file.name.find_last_of('.');
auto name = n == std::string::npos ? file.name : file.name.substr(0, n);
n = file.path.find_last_of('#');
auto path = n == std::string::npos ? file.path : file.path.substr(0, n);
auto iter = path.empty() ? std::find_if(m_file_list.begin(), m_file_list.end(), [&name](auto &f) { return boost::algorithm::starts_with(f.name, name); }) :
std::find_if(m_file_list.begin(), m_file_list.end(), [&path](auto &f) { return f.path == path; });
if (iter != m_file_list.end()) {
iter->flags |= FF_THUMNAIL; // DOTO: retry on fail
if (thumb.thumbnail.IsOk()) {
iter->thumbnail = thumb.thumbnail;
int index = iter - m_file_list.begin();
SendChangedEvent(EVT_THUMBNAIL, index, thumb.name);
if (type == 2) {
if (!file.metadata.empty()) {
iter->metadata = file.metadata;
int index = iter - m_file_list.begin();
SendChangedEvent(EVT_THUMBNAIL, index, file.name);
auto iter = std::find_if(files->begin(), files->end(), [&path](auto &f) { return f.path == path; });
if (iter != files->end())
iter->metadata = file.metadata;
}
} else {
iter->flags |= FF_THUMNAIL; // DOTO: retry on fail
if (file.thumbnail.IsOk()) {
iter->thumbnail = file.thumbnail;
int index = iter - m_file_list.begin();
SendChangedEvent(EVT_THUMBNAIL, index, file.name);
}
}
}
if (result == 0)
UpdateFocusThumbnail();
if (result == 0) {
if (type == 2)
UpdateFocusThumbnail2(files, 3);
else
UpdateFocusThumbnail();
}
});
}

32
src/slic3r/GUI/Printer/PrinterFileSystem.h
View file

@ -28,7 +28,7 @@ class PrinterFileSystem : public wxEvtHandler, public boost::enable_shared_from_
enum {
LIST_INFO = 0x0001,
THUMBNAIL = 0x0002,
SUB_FILE = 0x0002,
FILE_DEL = 0x0003,
FILE_DOWNLOAD = 0X0004,
NOTIFY_FIRST = 0x0100,
@ -61,6 +61,8 @@ public:
enum FileType {
F_TIMELAPSE,
F_VIDEO,
F_MODEL,
F_INVALID_TYPE,
};
enum GroupMode {
@ -69,13 +71,13 @@ public:
G_YEAR,
};
void SetFileType(FileType type);
void SetFileType(FileType type, std::string const & storage = {});
void SetGroupMode(GroupMode mode);
size_t EnterSubGroup(size_t index);
GroupMode GetFileType() const { return m_group_mode; }
FileType GetFileType() const { return m_file_type; }
GroupMode GetGroupMode() const { return m_group_mode; }
@ -94,13 +96,15 @@ public:
std::string path;
time_t time = 0;
boost::uint64_t size = 0;
wxBitmap thumbnail;
int flags = 0;
wxBitmap thumbnail;
int progress = -1; // -1: waiting
std::string local_path;
std::map<std::string, std::string> metadata;
bool IsSelect() const { return flags & FF_SELECT; }
bool IsDownload() const { return flags & FF_DOWNLOAD; }
std::string Metadata(std::string const & key, std::string const & dflt) const;
friend bool operator<(File const & l, File const & r) { return l.time > r.time; }
};
@ -109,13 +113,6 @@ public:
typedef std::vector<File> FileList;
struct Thumbnail
{
std::string name;
std::string path;
wxBitmap thumbnail;
};
struct Progress
{
wxInt64 size;
@ -134,6 +131,8 @@ public:
void DownloadCancel(size_t index);
void FetchModel(size_t index, std::function<void(std::string const &)> callback);
size_t GetCount() const;
size_t GetIndexAtTime(boost::uint32_t time);
@ -182,6 +181,12 @@ private:
void UpdateFocusThumbnail();
static bool ParseThumbnail(File &file);
static bool ParseThumbnail(File &file, std::istream &is);
void UpdateFocusThumbnail2(std::shared_ptr<std::vector<File>> files, int type);
void FileRemoved(size_t index, std::string const &name, bool by_path);
size_t FindFile(size_t index, std::string const &name, bool by_path);
@ -266,10 +271,11 @@ private:
void PostCallback(std::function<void(void)> const & callback);
protected:
FileType m_file_type = F_TIMELAPSE;
FileType m_file_type = F_INVALID_TYPE;
std::string m_file_storage;
GroupMode m_group_mode = G_NONE;
FileList m_file_list;
FileList m_file_list2;
std::map<std::pair<FileType, std::string>, FileList> m_file_list_cache;
std::vector<size_t> m_group_year;
std::vector<size_t> m_group_month;
std::vector<int> m_group_flags;