QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-02-03 18:38:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

update slic3r

Browse Source
This commit is contained in:
QIDI TECH
2024-11-28 15:19:12 +08:00
parent a26696f35e
commit 7eb6543991
196 changed files with 18701 additions and 3803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
src/slic3r/GUI/MainFrame.cpp
View File

@@ -67,7 +67,7 @@
#endif // _WIN32
#include <slic3r/GUI/CreatePresetsDialog.hpp>
//y
#include "../QIDI/QIDINetwork.hpp"
namespace Slic3r {
@@ -199,6 +199,9 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
//reset log level
auto loglevel = wxGetApp().app_config->get("severity_level");
Slic3r::set_logging_level(Slic3r::level_string_to_boost(loglevel));
std::map<std::string, int> wx_log_levels{{"fatal", wxLOG_FatalError}, {"error", wxLOG_FatalError}, {"warning", wxLOG_Warning},
{"info", wxLOG_Info}, {"debug", wxLOG_Debug}, {"trace", wxLOG_Trace}};
wxLog::SetLogLevel(wx_log_levels[loglevel]);
// QDS
m_recent_projects.SetMenuPathStyle(wxFH_PATH_SHOW_ALWAYS);
@@ -550,11 +553,13 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
MarkdownTip::ExitTip();
m_plater->reset();
//y
m_printer_view->StopStatusThread();
this->shutdown();
// propagate event
wxGetApp().remove_mall_system_dialog();
event.Skip();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< ": mainframe finished process close_widow event";
@@ -578,7 +583,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
wxGetApp().plater()->get_current_canvas3D()->request_extra_frame();
event.Skip();
});
#endif
#endif
update_ui_from_settings(); // FIXME (?)
@@ -641,12 +646,12 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
return;
}
else if (evt.CmdDown() && evt.GetKeyCode() == 'G') { if (can_export_gcode()) { wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_EXPORT_SLICED_FILE)); } evt.Skip(); return; }
if (evt.CmdDown() && evt.GetKeyCode() == 'J') { m_printhost_queue_dlg->Show(); return; }
if (evt.CmdDown() && evt.GetKeyCode() == 'J') { m_printhost_queue_dlg->Show(); return; }
if (evt.CmdDown() && evt.GetKeyCode() == 'N') { m_plater->new_project(); return;}
if (evt.CmdDown() && evt.GetKeyCode() == 'O') { m_plater->load_project(); return;}
if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'S') { if (can_save_as()) m_plater->save_project(true); return;}
else if (evt.CmdDown() && evt.GetKeyCode() == 'S') { if (can_save()) m_plater->save_project(); return;}
if (evt.CmdDown() && evt.GetKeyCode() == 'F') {
if (evt.CmdDown() && evt.GetKeyCode() == 'F') {
if (m_plater && (m_tabpanel->GetSelection() == TabPosition::tp3DEditor || m_tabpanel->GetSelection() == TabPosition::tpPreview)) {
m_plater->sidebar().can_search();
}
@@ -821,6 +826,10 @@ void MainFrame::update_layout()
if (!preview_only_hint())
return;
}
//y
//else if (evt.GetId() == tpCalibration) {
// m_calibration->update_all();
//}
evt.Skip();
});
@@ -884,6 +893,7 @@ void MainFrame::shutdown()
#endif // _WIN32
if (m_plater != nullptr) {
m_plater->get_ui_job_worker().cancel_all();
m_plater->stop_jobs();
// Unbinding of wxWidgets event handling in canvases needs to be done here because on MAC,
@@ -952,13 +962,6 @@ void MainFrame::update_title()
return;
}
void MainFrame::show_publish_button(bool show)
{
//B
// m_publish_btn->Show(show);
Layout();
}
void MainFrame::show_calibration_button(bool show)
{
#ifdef __APPLE__
@@ -1040,8 +1043,25 @@ void MainFrame::init_tabpanel()
wxCommandEvent* evt = new wxCommandEvent(EVT_INSTALL_PLUGIN_HINT);
wxQueueEvent(m_plater, evt);
}
if (m_confirm_download_plugin_dlg == nullptr){
m_confirm_download_plugin_dlg = new SecondaryCheckDialog(this, wxID_ANY, _L("Install network plug-in"), SecondaryCheckDialog::ButtonStyle::ONLY_CONFIRM);
m_confirm_download_plugin_dlg->SetSize(wxSize(FromDIP(270), FromDIP(158)));
m_confirm_download_plugin_dlg->update_text(_L("Please Install network plug-in before log in."));
m_confirm_download_plugin_dlg->update_btn_label(_L("Install Network Plug-in"), _L(""));
m_confirm_download_plugin_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) {
this->m_confirm_download_plugin_dlg->Close();
wxGetApp().ShowDownNetPluginDlg();
return;
});
}
int xPos = GetRect().GetX() + (GetSize().x - m_confirm_download_plugin_dlg->GetSize().x) / 2;
int yPos = GetRect().GetY() + (GetSize().y - m_confirm_download_plugin_dlg->GetSize().y) / 2;
m_confirm_download_plugin_dlg->SetPosition(wxPoint(xPos, yPos));
m_confirm_download_plugin_dlg->on_show();
}
}
//y
else if (new_sel == tpMonitor && wxGetApp().preset_bundle != nullptr) {
// auto cfg = wxGetApp().preset_bundle->printers.get_edited_preset().config;
//wxString url;
@@ -1515,6 +1535,7 @@ bool MainFrame::can_send_gcode() const
{
if (m_plater && !m_plater->model().objects.empty())
{
// y
//auto cfg = wxGetApp().preset_bundle->printers.get_edited_preset().config;
//if (const auto *print_host_opt = cfg.option<ConfigOptionString>("print_host"); print_host_opt)
// return !print_host_opt->value.empty();
@@ -1605,17 +1626,14 @@ wxBoxSizer* MainFrame::create_side_tools()
m_slice_select = eSlicePlate;
m_print_select = ePrintPlate;
// m_publish_btn = new Button(this, _L("Upload"), "bar_publish", 0, FromDIP(16));
m_slice_btn = new SideButton(this, _L("Slice plate"), "");
m_slice_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14));
m_print_btn = new SideButton(this, _L("Print plate"), "");
m_print_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14));
update_side_button_style();
// m_publish_btn->Hide();
m_slice_option_btn->Enable();
m_print_option_btn->Enable();
// sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(FromDIP(15), 0, 0, 0, 0);
sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1));
@@ -1626,23 +1644,6 @@ wxBoxSizer* MainFrame::create_side_tools()
sizer->Layout();
// m_publish_btn->Bind(wxEVT_BUTTON, [this](auto& e) {
// CallAfter([this] {
// wxGetApp().open_publish_page_dialog();
// if (!wxGetApp().getAgent()) {
// BOOST_LOG_TRIVIAL(info) << "publish: no agent";
// return;
// }
// // record
// json j;
// NetworkAgent* agent = GUI::wxGetApp().getAgent();
// if (agent)
// agent->track_event("enter_model_mall", j.dump());
// });
// });
m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event)
{
//this->m_plater->select_view_3D("Preview");
@@ -1787,6 +1788,8 @@ wxBoxSizer* MainFrame::create_side_tools()
SideButton* export_all_sliced_file_btn = new SideButton(p, _L("Export all sliced file"), "");
export_all_sliced_file_btn->SetCornerRadius(0);
//y
export_all_sliced_file_btn->Hide();
print_plate_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) {
m_print_btn->SetLabel(_L("Print plate"));
@@ -1867,7 +1870,6 @@ wxBoxSizer* MainFrame::create_side_tools()
});
p->append_button(print_multi_machine_btn);
}
}
p->Popup(m_print_btn);
@@ -1961,11 +1963,11 @@ bool MainFrame::get_enable_print_status()
}
else if (m_print_select == eExportGcode)
{
if (!current_plate->is_slice_result_valid())
{
enable = false;
}
enable = enable && !is_all_plates;
if (!current_plate->is_slice_result_valid())
{
enable = false;
}
enable = enable && !is_all_plates;
}
else if (m_print_select == eSendGcode)
{
@@ -1978,19 +1980,19 @@ bool MainFrame::get_enable_print_status()
// y16
else if (m_print_select == eUploadGcode)
{
if (!current_plate->is_slice_result_valid())
enable = false;
if (!can_send_gcode())
enable = false;
enable = enable && !is_all_plates;
if (!current_plate->is_slice_result_valid())
enable = false;
if (!can_send_gcode())
enable = false;
enable = enable && !is_all_plates;
}
else if (m_print_select == eExportSlicedFile)
{
if (!current_plate->is_slice_result_ready_for_export())
{
enable = false;
}
enable = enable && !is_all_plates;
else if (m_print_select == eExportSlicedFile)
{
if (!current_plate->is_slice_result_ready_for_export())
{
enable = false;
}
enable = enable && !is_all_plates;
}
else if (m_print_select == eSendToPrinter)
{
@@ -1998,30 +2000,30 @@ bool MainFrame::get_enable_print_status()
{
enable = false;
}
enable = enable && !is_all_plates;
enable = enable && !is_all_plates;
}
else if (m_print_select == eSendToPrinterAll)
{
if (!part_plate_list.is_all_slice_results_ready_for_print())
{
enable = false;
}
}
else if (m_print_select == eExportAllSlicedFile)
{
if (!part_plate_list.is_all_slice_result_ready_for_export())
{
enable = false;
}
}
else if (m_print_select == ePrintMultiMachine)
{
if (!current_plate->is_slice_result_ready_for_print())
{
enable = false;
}
enable = enable && !is_all_plates;
}
else if (m_print_select == eSendToPrinterAll)
{
if (!part_plate_list.is_all_slice_results_ready_for_print())
{
enable = false;
}
}
else if (m_print_select == eExportAllSlicedFile)
{
if (!part_plate_list.is_all_slice_result_ready_for_export())
{
enable = false;
}
}
else if (m_print_select == ePrintMultiMachine)
{
if (!current_plate->is_slice_result_ready_for_print())
{
enable = false;
}
enable = enable && !is_all_plates;
}
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": m_print_select %1%, enable= %2% ")%m_print_select %enable;
@@ -2045,13 +2047,6 @@ void MainFrame::update_side_button_style()
std::pair<wxColour, int>(wxColour(68, 121, 251), StateColor::Normal) // y96
);
// m_publish_btn->SetMinSize(wxSize(FromDIP(125), FromDIP(24)));
// m_publish_btn->SetCornerRadius(FromDIP(12));
// m_publish_btn->SetBackgroundColor(m_btn_bg_enable);
// m_publish_btn->SetBorderColor(m_btn_bg_enable);
// m_publish_btn->SetBackgroundColour(wxColour(59,68,70));
// m_publish_btn->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
m_slice_btn->SetTextLayout(SideButton::EHorizontalOrientation::HO_Left, FromDIP(15));
m_slice_btn->SetCornerRadius(FromDIP(12));
m_slice_btn->SetExtraSize(wxSize(FromDIP(38), FromDIP(10)));
@@ -2238,10 +2233,15 @@ static const wxString sep_space = "";
static wxMenu* generate_help_menu()
{
wxMenu* helpMenu = new wxMenu();
#ifdef __WINDOWS__
// shortcut key
append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "&?", _L("Show the list of the keyboard shortcuts"),
auto alt = GUI::shortkey_alt_prefix();
append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "& Shift+" + alt +"?", _L("Show the list of the keyboard shortcuts"),
[](wxCommandEvent&) { wxGetApp().keyboard_shortcuts(); });
#else
append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "& Shift+?", _L("Show the list of the keyboard shortcuts"),
[](wxCommandEvent &) { wxGetApp().keyboard_shortcuts(); });
#endif
// Show Beginner's Tutorial
append_menu_item(helpMenu, wxID_ANY, _L("Setup Wizard"), _L("Setup Wizard"), [](wxCommandEvent &) {wxGetApp().ShowUserGuide();});
@@ -2273,7 +2273,11 @@ static wxMenu* generate_help_menu()
return true;
});
//B
// append_menu_item(helpMenu, wxID_ANY, _L("Open Network Test"), _L("Open Network Test"), [](wxCommandEvent&) {
// append_menu_item(helpMenu, wxID_ANY, _L("Check for Presets Update"), _L("Check for Presets Update"), [](wxCommandEvent &) {
// wxGetApp().check_config_updates_from_menu();
// });
// append_menu_item(helpMenu, wxID_ANY, _L("Open Network Test"), _L("Open Network Test"), [](wxCommandEvent&) {
// NetworkTestDialog dlg(wxGetApp().mainframe);
// dlg.ShowModal();
// });
@@ -2473,7 +2477,29 @@ void MainFrame::init_menubar_as_editor()
append_submenu(fileMenu, export_menu, wxID_ANY, _L("Export"), "");
fileMenu->AppendSeparator();
//y
// // Publish to MakerWorld
// append_menu_item(
// fileMenu, wxID_ANY, _L("Publish to MakerWorld"), _L("Publish to MakerWorld"),
// [this](wxCommandEvent &) {
// CallAfter([this] {
// wxGetApp().open_publish_page_dialog();
// if (!wxGetApp().getAgent()) {
// BOOST_LOG_TRIVIAL(info) << "publish: no agent";
// return;
// }
// // record
// json j;
// NetworkAgent *agent = GUI::wxGetApp().getAgent();
// if (agent) agent->track_event("enter_model_mall", j.dump());
// });
// },
// "", nullptr,
// [this](){ return wxGetApp().has_model_mall(); }, this);
// fileMenu->AppendSeparator();
#ifndef __APPLE__
append_menu_item(fileMenu, wxID_EXIT, _L("Quit"), wxString::Format(_L("Quit")),
@@ -2715,7 +2741,7 @@ void MainFrame::init_menubar_as_editor()
viewMenu->Check(wxID_CAMERA_ORTHOGONAL + camera_id_base, true);
viewMenu->AppendSeparator();
append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Labels") + "\t" + ctrl + "E", _L("Show object labels in 3D scene"),
append_menu_check_item(viewMenu, wxID_ANY, _L("Show Labels") + "\t" + ctrl + "E", _L("Show object labels in 3D scene"),
[this](wxCommandEvent&) { m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this,
[this]() { return m_plater->is_view3D_shown(); }, [this]() { return m_plater->are_view3D_labels_shown(); }, this);
@@ -2725,6 +2751,25 @@ void MainFrame::init_menubar_as_editor()
m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT));
},
this, [this]() { return m_plater->is_view3D_shown(); }, [this]() { return m_plater->is_view3D_overhang_shown(); }, this);
viewMenu->AppendSeparator();
append_menu_item(
viewMenu, wxID_ANY, _L("Set 3DConnexion"), _L("Set 3DConnexion mouse"),
[this](wxCommandEvent &) {
#ifdef _WIN32
if (wxGetApp().app_config->get("use_legacy_3DConnexion") == "true") {
#endif //_WIN32
Mouse3DController &controller = wxGetApp().plater()->get_mouse3d_controller();
controller.show_settings_dialog(!controller.is_settings_dialog_shown());
#ifdef _WIN32
}
#endif //_WIN32
}, "", nullptr, [this]() {
Mouse3DController &controller = wxGetApp().plater()->get_mouse3d_controller();
auto tab_index = (MainFrame::TabPosition) dynamic_cast<Notebook *>(wxGetApp().tab_panel())->GetSelection();
auto is_3d_view = tab_index == MainFrame::TabPosition::tp3DEditor || tab_index == MainFrame::TabPosition::tpPreview;
return is_3d_view && controller.connected();
},
this);
/*viewMenu->AppendSeparator();
append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Wireframe") + "\tCtrl+Shift+Enter", _L("Show wireframes in 3D scene"),
[this](wxCommandEvent&) { m_plater->toggle_show_wireframe(); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this,
@@ -2977,7 +3022,7 @@ void MainFrame::init_menubar_as_editor()
NetworkAgent *agent = GUI::wxGetApp().getAgent();
if (agent) agent->track_event("third_cali", js.dump());
} catch (...) {}
wxLaunchDefaultBrowser("https://wiki.qidilab.com/en/qidi-studio/Calibration", wxBROWSER_NEW_WINDOW);
wxLaunchDefaultBrowser("https://wiki.qidi3d.com/en/qidi-studio/Calibration", wxBROWSER_NEW_WINDOW);
}, "", nullptr,
[this]() {return m_plater->is_view3D_shown();; }, this);
@@ -3107,14 +3152,14 @@ void MainFrame::init_menubar_as_editor()
NetworkAgent *agent = GUI::wxGetApp().getAgent();
if (agent) agent->track_event("third_cali", js.dump());
} catch (...) {}
wxLaunchDefaultBrowser("https://wiki.qidilab.com/en/qidi-studio/Calibration", wxBROWSER_NEW_WINDOW);
wxLaunchDefaultBrowser("https://wiki.qidi3d.com/en/qidi-studio/Calibration", wxBROWSER_NEW_WINDOW);
}, "", nullptr,
[this]() {
return m_plater->is_view3D_shown();
;
},
this);
m_menubar->Append(new wxMenu(), L("Window"));
std::string window_items[] = {
L("Minimize"),
@@ -3287,7 +3332,7 @@ void MainFrame::export_config()
{
ExportConfigsDialog export_configs_dlg(nullptr);
export_configs_dlg.ShowModal();
return;
return;
// Generate a cummulative configuration for the selected print, filaments and printer.
wxDirDialog dlg(this, _L("Choose a directory"),
@@ -3807,7 +3852,7 @@ void MainFrame::load_printer_url()
PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
if (preset_bundle.printers.get_edited_preset().is_qdt_vendor_preset(&preset_bundle))
return;
auto cfg = preset_bundle.printers.get_edited_preset().config;
wxString url =
cfg.opt_string("print_host_webui").empty() ? cfg.opt_string("print_host") : cfg.opt_string("print_host_webui");
@@ -3834,9 +3879,9 @@ void MainFrame::RunScript(wxString js)
m_webview->RunScript(js);
}
void MainFrame::RunScriptLeft(wxString js)
void MainFrame::RunScriptLeft(wxString js)
{
if (m_webview != nullptr)
if (m_webview != nullptr)
m_webview->RunScriptLeft(js);
}