3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 14:44:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

NEW:support for importing models from browser to Studio on mac

Browse source 
Change-Id: Ia4c39b3de1705d66a00442d11bd15a61ebc349ff
This commit is contained in:
tao wang 2023-03-29 14:28:38 +08:00 • committed by Lane.Wei
parent cf556814ce
commit 6175446aaf
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/slic3r/GUI/GUI_App.cpp
View file

@ -973,7 +973,7 @@ static void generic_exception_handle()
//#endif //#endif
} }
static vector<string> split_str(const string& src, const string& separator) static std::vector<std::string> split_str(const std::string& src, const std::string& separator)
{ {
size_t pos; size_t pos;
size_t start_pos = 0; size_t start_pos = 0;
@ -5500,6 +5500,27 @@ void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames)
}*/ }*/
wxApp::OSXStoreOpenFiles(fileNames); wxApp::OSXStoreOpenFiles(fileNames);
} }
void GUI_App::MacOpenURL(const wxString& url)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "get mac url " << url;
if (!url.empty() && boost::starts_with(url, "bambustudioopen://")) {
auto input_str_arr = split_str(url.ToStdString(), "bambustudioopen://");
std::string download_origin_url;
for (auto input_str : input_str_arr) {
if (!input_str.empty()) download_origin_url = input_str;
}
std::string download_file_url = url_decode(download_origin_url);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << download_file_url;
if (!download_file_url.empty() && (boost::starts_with(download_file_url, "http://") || boost::starts_with(download_file_url, "https://"))) {
request_model_download(download_file_url);
}
}
}
// wxWidgets override to get an event on open files. // wxWidgets override to get an event on open files.
void GUI_App::MacOpenFiles(const wxArrayString &fileNames) void GUI_App::MacOpenFiles(const wxArrayString &fileNames)
{ {
@ -5565,6 +5586,7 @@ void GUI_App::MacOpenFiles(const wxArrayString &fileNames)
start_new_gcodeviewer(&filename);*/ start_new_gcodeviewer(&filename);*/
} }
} }
#endif /* __APPLE */ #endif /* __APPLE */
Sidebar& GUI_App::sidebar() Sidebar& GUI_App::sidebar()

1
src/slic3r/GUI/GUI_App.hpp
View file

@ -496,6 +496,7 @@ public:
void OSXStoreOpenFiles(const wxArrayString &files); void OSXStoreOpenFiles(const wxArrayString &files);
// wxWidgets override to get an event on open files. // wxWidgets override to get an event on open files.
void MacOpenFiles(const wxArrayString &fileNames) override; void MacOpenFiles(const wxArrayString &fileNames) override;
void MacOpenURL(const wxString& url) override;
#endif /* __APPLE */ #endif /* __APPLE */
Sidebar& sidebar(); Sidebar& sidebar();