viewit/OrcaSlicer-KX
5
3
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

ENH: add sync status for main frame

Browse Source 
jira: none
Change-Id: Ie718baf4928d8c6cb336ea1f2a78de1e877d8624
(cherry picked from commit e4b7efada86e22438daa7000ee06629f32fc4369)
(cherry picked from commit a9e179a0abd6a6518b344de65b47db94e41b47ea)
This commit is contained in:
zhimin.zeng
2024-12-20 21:27:38 +08:00
committed by Noisyfox
parent db026b7f87
commit 6dff86bc1c
4 changed files with 162 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -2815,7 +2815,7 @@ void MachineObject::set_online_state(bool on_off)
if (!on_off) m_active_state = NotActive;
}
bool MachineObject::is_info_ready()
bool MachineObject::is_info_ready() const
{
if (module_vers.empty())
return false;
@@ -5085,6 +5085,9 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
BOOST_LOG_TRIVIAL(trace) << "parse_json timeout = " << diff.count();
}
DeviceManager::update_local_machine(*this);
if (GUI::wxGetApp().plater())
GUI::wxGetApp().plater()->update_machine_sync_status();
return 0;
}

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

@@ -1167,7 +1167,7 @@ public:
bool is_connecting();
void set_online_state(bool on_off);
bool is_online() { return m_is_online; }
bool is_info_ready();
bool is_info_ready() const;
bool is_camera_busy_off();
std::vector<std::string> get_resolution_supported();

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

@@ -448,6 +448,7 @@ struct Sidebar::priv
void can_search();
void sync_extruder_list();
void update_sync_status(const MachineObject* obj);
#ifdef _WIN32
wxString btn_reslice_tip;
@@ -899,6 +900,8 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title
combo_nozzle->Bind(wxEVT_COMBOBOX, [this, index, combo_nozzle](wxCommandEvent &evt) {
auto printer_tab = dynamic_cast<TabPrinter *>(wxGetApp().get_tab(Preset::TYPE_PRINTER));
printer_tab->set_extruder_volume_type(index, NozzleVolumeType(intptr_t(combo_nozzle->GetClientData(evt.GetInt()))));
if (GUI::wxGetApp().plater())
GUI::wxGetApp().plater()->update_machine_sync_status();
});
this->combo_nozzle = combo_nozzle;
@@ -1042,6 +1045,9 @@ void ExtruderGroup::update_ams()
}
sizer->Layout();
if (GUI::wxGetApp().plater())
GUI::wxGetApp().plater()->update_machine_sync_status();
}
void Sidebar::priv::sync_extruder_list()
@@ -1050,7 +1056,7 @@ void Sidebar::priv::sync_extruder_list()
printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtHighFlow);
printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtStandard);
MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
if (obj == nullptr) {
if (obj == nullptr || !obj->is_info_ready()) {
MessageDialog dlg(this->plater, _L("Please select a printer in 'Device' page first."), _L("Sync extruder infomation"), wxOK);
dlg.ShowModal();
return;
@@ -1064,12 +1070,21 @@ void Sidebar::priv::sync_extruder_list()
std::string machine_print_name = obj->printer_type;
PresetBundle *preset_bundle = wxGetApp().preset_bundle;
std::string target_model_id = preset_bundle->printers.get_selected_preset().get_printer_type(preset_bundle);
Preset* machine_preset = get_printer_preset(obj);
if (machine_print_name != target_model_id) {
MessageDialog dlg(this->plater, _L("The currently selected machine preset is inconsistent with the connected printer type.\n"
"Are you sure to continue syncing?"), _L("Sync extruder infomation"), wxICON_WARNING | wxYES | wxNO);
if (dlg.ShowModal() == wxID_NO) {
return;
}
if (!this->plater)
return;
this->plater->update_objects_position_when_select_preset([&obj, machine_preset]() {
Tab *printer_tab = GUI::wxGetApp().get_tab(Preset::Type::TYPE_PRINTER);
printer_tab->select_preset(machine_preset->name);
});
}
int deputy_4 = 0, main_4 = 0, deputy_1 = 0, main_1 = 0;
@@ -1096,6 +1111,119 @@ void Sidebar::priv::sync_extruder_list()
AMSCountPopupWindow::UpdateAMSCount(1, right_extruder);
}
void Sidebar::priv::update_sync_status(const MachineObject *obj)
{
auto clear_all_sync_status = [this]() {
panel_printer_preset->ShowBadge(false);
panel_printer_bed->ShowBadge(false);
left_extruder->ShowBadge(false);
right_extruder->ShowBadge(false);
single_extruder->ShowBadge(false);
};
if (!obj || !obj->is_info_ready()) {
clear_all_sync_status();
return;
}
PresetBundle *preset_bundle = wxGetApp().preset_bundle;
if (!preset_bundle) {
clear_all_sync_status();
return;
}
// 1. update printer status
const Preset &cur_preset = wxGetApp().preset_bundle->printers.get_edited_preset();
if (preset_bundle && preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle) == obj->printer_type) {
panel_printer_preset->ShowBadge(true);
} else {
clear_all_sync_status();
return;
}
struct ExtruderInfo
{
float diameter{0.4};
int nozzle_volue_type{0};
int ams_4{0};
int ams_1{0};
bool operator==(const ExtruderInfo &other) const
{
return abs(diameter - other.diameter) < EPSILON
&& nozzle_volue_type == other.nozzle_volue_type
&& ams_4 == other.ams_4
&& ams_1 == other.ams_1;
}
};
// 2. update extruder status
int extruder_nums = preset_bundle->get_printer_extruder_count();
std::vector<ExtruderInfo> extruder_infos(extruder_nums);
std::vector<int> nozzle_volume_types = wxGetApp().preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values;
for (size_t i = 0; i < nozzle_volume_types.size(); ++i) {
extruder_infos[i].nozzle_volue_type = nozzle_volume_types[i];
}
std::vector<std::map<int, int>> extruder_ams_counts = wxGetApp().preset_bundle->extruder_ams_counts;
for (size_t i = 0; i < extruder_ams_counts.size(); ++i) {
for (auto iter = extruder_ams_counts[i].begin(); iter != extruder_ams_counts[i].end(); ++iter){
if (iter->first == 4)
extruder_infos[i].ams_4 = iter->second;
if (iter->first == 1)
extruder_infos[i].ams_1 = iter->second;
}
}
if (extruder_nums == 1) {
double value = 0.0;
single_extruder->diameter.ToDouble(&value);
extruder_infos[0].diameter = float(value);
}
else if(extruder_nums == 2){
double value = 0.0;
left_extruder->diameter.ToDouble(&value);
extruder_infos[0].diameter = float(value);
value = 0.0;
right_extruder->diameter.ToDouble(&value);
extruder_infos[1].diameter = float(value);
}
std::vector<ExtruderInfo> machine_extruder_infos(obj->m_extder_data.extders.size());
for (const Extder &extruder : obj->m_extder_data.extders) {
machine_extruder_infos[extruder.id].nozzle_volue_type = int(extruder.current_nozzle_flow_type) - 1;
machine_extruder_infos[extruder.id].diameter = extruder.current_nozzle_diameter;
}
for (auto &item : obj->amsList) {
if (item.second->type == 4) { // N3S
machine_extruder_infos[item.second->nozzle].ams_1++;
} else {
machine_extruder_infos[item.second->nozzle].ams_4++;
}
}
std::reverse(machine_extruder_infos.begin(), machine_extruder_infos.end());
if (extruder_nums == 1) {
if (extruder_infos == machine_extruder_infos)
single_extruder->ShowBadge(true);
else
single_extruder->ShowBadge(false);
}
else if (extruder_nums == 2) {
if (extruder_infos[0] == machine_extruder_infos[0])
left_extruder->ShowBadge(true);
else
left_extruder->ShowBadge(false);
if (extruder_infos[1] == machine_extruder_infos[1])
right_extruder->ShowBadge(true);
else
right_extruder->ShowBadge(false);
}
}
#define PRINTER_THUMBNAIL_SIZE (wxSize(FromDIP(48), FromDIP(48)))
#define PRINTER_PANEL_SIZE_SMALL (wxSize(FromDIP(98), FromDIP(68)))
#define PRINTER_PANEL_SIZE (wxSize(FromDIP(98), FromDIP(98)))
@@ -1211,7 +1339,6 @@ Sidebar::Sidebar(Plater *parent)
p->panel_printer_preset->SetCornerRadius(8);
p->panel_printer_preset->SetBorderColor(wxColour("#CECECE"));
p->panel_printer_preset->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
p->panel_printer_preset->ShowBadge(true);
ScalableButton *edit_btn = new ScalableButton(p->panel_printer_preset, wxID_ANY, "dot");
edit_btn->SetToolTip(_L("Click to edit preset"));
@@ -1252,7 +1379,6 @@ Sidebar::Sidebar(Plater *parent)
p->panel_printer_bed->SetCornerRadius(8);
p->panel_printer_bed->SetBorderColor(wxColour("#CECECE"));
p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
p->panel_printer_bed->ShowBadge(true);
ScalableButton *wiki_bed = new ScalableButton(p->panel_printer_bed, wxID_ANY, "dot");
wiki_bed->Bind(wxEVT_BUTTON, [](wxCommandEvent) {
@@ -1634,7 +1760,6 @@ void Sidebar::create_printer_preset()
void Sidebar::init_filament_combo(PlaterPresetComboBox **combo, const int filament_idx)
{
*combo = new PlaterPresetComboBox(p->m_panel_filament_content, Slic3r::Preset::TYPE_FILAMENT);
(*combo)->ShowBadge(true);
(*combo)->set_filament_idx(filament_idx);
auto combo_and_btn_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -1898,6 +2023,9 @@ void Sidebar::update_presets(Preset::Type preset_type)
bool is_dual_extruder = nozzle_diameter->size() == 2;
p->layout_printer(isBBL, is_dual_extruder);
if (GUI::wxGetApp().plater())
GUI::wxGetApp().plater()->update_machine_sync_status();
Layout();
break;
@@ -2346,6 +2474,11 @@ void Sidebar::sync_extruder_list()
p->sync_extruder_list();
}
void Sidebar::update_sync_status(const MachineObject *obj)
{
p->update_sync_status(obj);
}
bool Sidebar::should_sync_extruder_list(MachineObject *obj)
{
if (obj && obj->is_connected() && obj->is_multi_extruders() && wxGetApp().plater()->is_multi_extruder_ams_empty()) {
@@ -15524,6 +15657,11 @@ void Plater::post_process_string_object_exception(StringObjectException &err)
return;
}
void Plater::update_objects_position_when_select_preset(const std::function<void()> &select_prest)
{
p->update_objects_position_when_select_preset(select_prest);
}
bool Plater::check_ams_status()
{
if (m_check_status == 0) {
@@ -15539,6 +15677,17 @@ bool Plater::check_ams_status()
return true;
}
void Plater::update_machine_sync_status()
{
DeviceManager *dev_maneger = wxGetApp().getDeviceManager();
if (!dev_maneger) {
GUI::wxGetApp().sidebar().update_sync_status(nullptr);
return;
}
MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
GUI::wxGetApp().sidebar().update_sync_status(obj);
}
#if ENABLE_ENVIRONMENT_MAP
void Plater::init_environment_texture()
{

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

@@ -168,6 +168,7 @@ public:
void sync_ams_list();
void sync_extruder_list();
bool should_sync_extruder_list(MachineObject* obj);
void update_sync_status(const MachineObject* obj);
// Orca
void show_SEMM_buttons(bool bshow);
void update_dynamic_filament_list();
@@ -638,9 +639,12 @@ public:
bool show_publish_dialog(bool show = true);
//BBS: post process string object exception strings by warning types
void post_process_string_object_exception(StringObjectException &err);
void update_objects_position_when_select_preset(const std::function<void()> &select_prest);
bool check_ams_status();
void update_machine_sync_status();
#if ENABLE_ENVIRONMENT_MAP
void init_environment_texture();
unsigned int get_environment_texture_id() const;