QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Machine_List applies to Linux and MacOS

Browse Source
This commit is contained in:
sunsets
2023-12-07 13:37:35 +08:00
parent c08509a354
commit d9c7898876
2 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -904,23 +904,23 @@ void MainFrame::create_preset_tabs()
wxGetApp().plater()->sidebar().update_presets(Preset::TYPE_PRINTER); wxGetApp().plater()->sidebar().update_presets(Preset::TYPE_PRINTER);
}); });
m_printer_view->SetDeleteHandler([this](wxCommandEvent &event) { //m_printer_view->SetDeleteHandler([this](wxCommandEvent &event) {
PresetBundle &preset_bundle = *wxGetApp().preset_bundle; // PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
const std::string &printer_name = preset_bundle.physical_printers.get_selected_full_printer_name(); // const std::string &printer_name = preset_bundle.physical_printers.get_selected_full_printer_name();
if (printer_name.empty()) // if (printer_name.empty())
return false; // return false;
wxString msg; // wxString msg;
//if (!note_string.IsEmpty()) // //if (!note_string.IsEmpty())
// msg += note_string + "\n"; // // msg += note_string + "\n";
msg += format_wxstr(_L("Are you sure you want to delete \"%1%\" printer?"), printer_name); // msg += format_wxstr(_L("Are you sure you want to delete \"%1%\" printer?"), printer_name);
if (MessageDialog(this, msg, _L("Delete Physical Printer"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION).ShowModal() != wxID_YES) // if (MessageDialog(this, msg, _L("Delete Physical Printer"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION).ShowModal() != wxID_YES)
return false; // return false;
preset_bundle.physical_printers.delete_selected_printer(); // preset_bundle.physical_printers.delete_selected_printer();
}); //});
// #if defined(__WIN32__) // #if defined(__WIN32__)
// m_tabpanel->Bind(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, &MainFrame::OnTabPanelSelectionChanged, this); // m_tabpanel->Bind(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, &MainFrame::OnTabPanelSelectionChanged, this);

60
src/slic3r/GUI/PrinterWebView.cpp
View File

@@ -15,6 +15,7 @@
#include "PhysicalPrinterDialog.hpp" #include "PhysicalPrinterDialog.hpp"
//B45 //B45
#include <wx/regex.h> #include <wx/regex.h>
#include <boost/regex.hpp>
namespace pt = boost::property_tree; namespace pt = boost::property_tree;
@@ -398,26 +399,24 @@ void PrinterWebView::OnAddButtonClick(wxCommandEvent &event)
formattedHost = wxString::Format("%s:10088", formattedHost); formattedHost = wxString::Format("%s:10088", formattedHost);
std::string fullname = preset_bundle.physical_printers.get_selected_full_printer_name(); std::string fullname = preset_bundle.physical_printers.get_selected_full_printer_name();
std::string preset_name = printer.get_preset_name(fullname);
std::regex ipRegex(R"(\b(?:\d{1,3}\.){3}\d{1,3}\b)"); Preset * preset = wxGetApp().preset_bundle->printers.find_preset(preset_name);
bool isValidIPAddress = std::regex_match(host.ToStdString(), ipRegex); std::string model_id = "X-MAX 3";
wxString machine_type = "X-MAX 3"; if (preset != nullptr) {
DynamicPrintConfig *cfg_t = &(printer.config); model_id = preset->config.opt_string("printer_model");
std::regex regex1("\\*\\s(.*)(?=\\snozzle)");
std::smatch match;
if (std::regex_search(fullname, match, regex1)) {
std::string regexmatch = match.str(0);
std::regex regex2("(X-\\w+\\s\\d)");
if (std::regex_search(regexmatch, match, regex2))
machine_type = match.str(0);
} }
boost::regex ipRegex(R"(\b(?:\d{1,3}\.){3}\d{1,3}\b)");
bool isValidIPAddress = boost::regex_match(host.ToStdString(), ipRegex);
DynamicPrintConfig *cfg_t = &(printer.config);
UnSelectedButton(); UnSelectedButton();
if (isValidIPAddress) if (isValidIPAddress)
AddButton( AddButton(
printer_name, host, machine_type, fullname, printer_name, host, model_id, fullname,
[formattedHost, this](wxMouseEvent &event) { [formattedHost, this](wxMouseEvent &event) {
wxString host = formattedHost; wxString host = formattedHost;
load_url(host); load_url(host);
@@ -438,7 +437,12 @@ void PrinterWebView::OnDeleteButtonClick(wxCommandEvent &event) {
wxString msg; wxString msg;
//if (!note_string.IsEmpty()) //if (!note_string.IsEmpty())
// msg += note_string + "\n"; // msg += note_string + "\n";
msg += format_wxstr(_L("Are you sure you want to delete \"%1%\" printer?"), (button->getLabel()));
#if defined(__WIN32__) || defined(__WXMAC__)
msg += format_wxstr(_L("Are you sure you want to delete \"%1%\" printer?"), (button->getLabel()));
#else
msg += _L("Are you sure you want to delete ") + (button->getLabel()) + _L("printer?");
#endif
if (MessageDialog(this, msg, _L("Delete Physical Printer"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION).ShowModal() != wxID_YES) if (MessageDialog(this, msg, _L("Delete Physical Printer"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION).ShowModal() != wxID_YES)
return ; return ;
@@ -498,26 +502,20 @@ void PrinterWebView::OnEditButtonClick(wxCommandEvent &event) {
std::string printer_name = printer.name; std::string printer_name = printer.name;
wxString host = printer.config.opt_string("print_host"); wxString host = printer.config.opt_string("print_host");
std::string fullname = preset_bundle.physical_printers.get_selected_full_printer_name(); std::string fullname = preset_bundle.physical_printers.get_selected_full_printer_name();
std::string preset_name = printer.get_preset_name(fullname);
std::regex ipRegex(R"(\b(?:\d{1,3}\.){3}\d{1,3}\b)"); Preset * preset = wxGetApp().preset_bundle->printers.find_preset(preset_name);
bool isValidIPAddress = std::regex_match(host.ToStdString(), ipRegex); std::string model_id = "X-MAX 3";
wxString machine_type = "X-MAX 3"; if (preset != nullptr) {
DynamicPrintConfig *cfg_t = &(printer.config); model_id = preset->config.opt_string("printer_model");
std::regex regex1("\\*\\s(.*)(?=\\snozzle)");
std::smatch match;
if (std::regex_search(fullname, match, regex1)) {
std::string regexmatch = match.str(0);
std::regex regex2("(X-\\w+\\s\\d)");
if (std::regex_search(regexmatch, match, regex2))
machine_type = match.str(0);
} }
DynamicPrintConfig *cfg_t = &(printer.config);
button->SetNameText((wxString::FromUTF8(printer_name))); button->SetNameText((wxString::FromUTF8(printer_name)));
button->SetIPText(host); button->SetIPText(host);
button->SetLabel(fullname); button->SetLabel(fullname);
wxString Machine_Name = Machine_Name.Format("%s%s", machine_type, "_thumbnail"); wxString Machine_Name = Machine_Name.Format("%s%s", model_id, "_thumbnail");
button->SetBitMap(get_bmp_bundle(std::string(Machine_Name.mb_str()), 80)->GetBitmapFor(this)); button->SetBitMap(get_bmp_bundle(std::string(Machine_Name.mb_str()), 80)->GetBitmapFor(this));
UpdateLayout(); UpdateLayout();