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

FIX:fixed isses with the devices dialog

Browse source 
Change-Id: I5e4822786fb2105893798b44622d080a593e41bb
This commit is contained in:
tao wang 2022-10-10 10:18:43 +08:00 • committed by Lane.Wei
parent 0761cbd1cb
commit 622f3da8df
3 changed files with 55 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/Monitor.cpp
View file

@ -318,6 +318,7 @@ void MonitorPanel::on_printer_clicked(wxMouseEvent &event)
if (!m_side_tools->is_in_interval()) { if (!m_side_tools->is_in_interval()) {
wxPoint pos = m_side_tools->ClientToScreen(wxPoint(0, 0)); wxPoint pos = m_side_tools->ClientToScreen(wxPoint(0, 0));
pos.y += m_side_tools->GetRect().height; pos.y += m_side_tools->GetRect().height;
pos.x = pos.x < 0? 0:pos.x;
m_select_machine.Position(pos, wxSize(0, 0)); m_select_machine.Position(pos, wxSize(0, 0));
#ifdef __linux__ #ifdef __linux__

82
src/slic3r/GUI/SelectMachine.cpp
View file

@ -395,13 +395,13 @@ SelectMachinePopup::SelectMachinePopup(wxWindow *parent)
m_sizxer_scrolledWindow->Fit(m_scrolledWindow); m_sizxer_scrolledWindow->Fit(m_scrolledWindow);
#if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__) #if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__)
m_sizer_search_bar = new wxBoxSizer(wxVERTICAL); m_sizer_search_bar = new wxBoxSizer(wxVERTICAL);
m_search_bar = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_search_bar = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_search_bar->ShowSearchButton( true ); m_search_bar->ShowSearchButton( true );
m_search_bar->ShowCancelButton( false ); m_search_bar->ShowCancelButton( false );
m_sizer_search_bar->Add( m_search_bar, 1, wxALL| wxEXPAND, 1 ); m_sizer_search_bar->Add( m_search_bar, 1, wxALL| wxEXPAND, 1 );
m_sizer_main->Add(m_sizer_search_bar, 0, wxALL | wxEXPAND, FromDIP(2)); m_sizer_main->Add(m_sizer_search_bar, 0, wxALL | wxEXPAND, FromDIP(2));
m_search_bar->Bind( wxEVT_COMMAND_TEXT_UPDATED, &SelectMachinePopup::update_machine_list, this ); m_search_bar->Bind( wxEVT_COMMAND_TEXT_UPDATED, &SelectMachinePopup::update_machine_list, this );
#endif #endif
auto own_title = create_title_panel(_L("My Device")); auto own_title = create_title_panel(_L("My Device"));
m_sizer_my_devices = new wxBoxSizer(wxVERTICAL); m_sizer_my_devices = new wxBoxSizer(wxVERTICAL);
@ -550,6 +550,7 @@ void SelectMachinePopup::update_other_devices()
this->Freeze(); this->Freeze();
m_scrolledWindow->Freeze(); m_scrolledWindow->Freeze();
int i = 0; int i = 0;
for (auto &elem : m_free_machine_list) { for (auto &elem : m_free_machine_list) {
MachineObject * mobj = elem.second; MachineObject * mobj = elem.second;
/* do not show printer bind state is empty */ /* do not show printer bind state is empty */
@ -568,9 +569,9 @@ void SelectMachinePopup::update_other_devices()
op = m_other_list_machine_panel[i]->mPanel; op = m_other_list_machine_panel[i]->mPanel;
op->Show(); op->Show();
#if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__) #if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__)
if (!search_for_printer(mobj)) { if (!search_for_printer(mobj)) {
op->Hide(); op->Hide();
} }
#endif #endif
} else { } else {
op = new MachineObjectPanel(m_scrolledWindow, wxID_ANY); op = new MachineObjectPanel(m_scrolledWindow, wxID_ANY);
@ -626,13 +627,27 @@ void SelectMachinePopup::update_other_devices()
m_other_list_machine_panel[j]->mPanel->update_machine_info(nullptr); m_other_list_machine_panel[j]->mPanel->update_machine_info(nullptr);
m_other_list_machine_panel[j]->mPanel->Hide(); m_other_list_machine_panel[j]->mPanel->Hide();
} }
m_sizer_other_devices->Layout();
if (m_placeholder_panel != nullptr) {
m_scrolledWindow->RemoveChild(m_placeholder_panel);
m_placeholder_panel->Destroy();
m_placeholder_panel = nullptr;
}
m_placeholder_panel = new wxWindow(m_scrolledWindow, wxID_ANY, wxDefaultPosition, wxSize(-1,FromDIP(10)));
m_placeholder_panel->SetBackgroundColour(*wxWHITE);
m_sizer_other_devices->Add(m_placeholder_panel, 0, wxEXPAND, 0);
//m_sizer_other_devices->Layout();
if(m_other_devices_count != i) {
m_scrolledWindow->Fit();
}
m_scrolledWindow->Layout(); m_scrolledWindow->Layout();
m_scrolledWindow->Fit(); m_scrolledWindow->Thaw();
m_scrolledWindow->Thaw(); Layout();
Layout(); Fit();
Fit(); this->Thaw();
this->Thaw(); m_other_devices_count = i;
BOOST_LOG_TRIVIAL(trace) << "SelectMachinePopup update_other_devices end"; BOOST_LOG_TRIVIAL(trace) << "SelectMachinePopup update_other_devices end";
} }
@ -653,6 +668,7 @@ void SelectMachinePopup::update_user_devices()
this->Freeze(); this->Freeze();
m_scrolledWindow->Freeze(); m_scrolledWindow->Freeze();
int i = 0; int i = 0;
for (auto& elem : m_bind_machine_list) { for (auto& elem : m_bind_machine_list) {
MachineObject* mobj = elem.second; MachineObject* mobj = elem.second;
MachineObjectPanel* op = nullptr; MachineObjectPanel* op = nullptr;
@ -660,9 +676,9 @@ void SelectMachinePopup::update_user_devices()
op = m_user_list_machine_panel[i]->mPanel; op = m_user_list_machine_panel[i]->mPanel;
op->Show(); op->Show();
#if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__) #if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__)
if (!search_for_printer(mobj)) { if (!search_for_printer(mobj)) {
op->Hide(); op->Hide();
} }
#endif #endif
} else { } else {
op = new MachineObjectPanel(m_scrolledWindow, wxID_ANY); op = new MachineObjectPanel(m_scrolledWindow, wxID_ANY);
@ -752,27 +768,31 @@ void SelectMachinePopup::update_user_devices()
m_user_list_machine_panel[j]->mPanel->Hide(); m_user_list_machine_panel[j]->mPanel->Hide();
} }
//m_sizer_my_devices->Layout(); //m_sizer_my_devices->Layout();
if (m_my_devices_count != i) {
m_scrolledWindow->Fit();
}
m_scrolledWindow->Layout(); m_scrolledWindow->Layout();
m_scrolledWindow->Fit();
m_scrolledWindow->Thaw(); m_scrolledWindow->Thaw();
Layout(); Layout();
Fit(); Fit();
this->Thaw(); this->Thaw();
m_my_devices_count = i;
} }
bool SelectMachinePopup::search_for_printer(MachineObject* obj) bool SelectMachinePopup::search_for_printer(MachineObject* obj)
{ {
std::string search_text = std::string((m_search_bar->GetValue()).mb_str()); std::string search_text = std::string((m_search_bar->GetValue()).mb_str());
if (search_text.empty()) { if (search_text.empty()) {
return true; return true;
} }
auto name = obj->dev_name; auto name = obj->dev_name;
auto ip = obj->dev_ip; auto ip = obj->dev_ip;
auto name_it = name.find(search_text); auto name_it = name.find(search_text);
auto ip_it = ip.find(search_text); auto ip_it = ip.find(search_text);
if ((name_it != std::string::npos)||(ip_it != std::string::npos)) { if ((name_it != std::string::npos)||(ip_it != std::string::npos)) {
return true; return true;
} }
return false; return false;
} }

3
src/slic3r/GUI/SelectMachine.hpp
View file

@ -195,6 +195,9 @@ public:
bool was_dismiss() { return m_dismiss; } bool was_dismiss() { return m_dismiss; }
private: private:
int m_my_devices_count{0};
int m_other_devices_count{0};
wxWindow* m_placeholder_panel{nullptr};
wxBoxSizer * m_sizer_body{nullptr}; wxBoxSizer * m_sizer_body{nullptr};
wxBoxSizer * m_sizer_my_devices{nullptr}; wxBoxSizer * m_sizer_my_devices{nullptr};
wxBoxSizer * m_sizer_other_devices{nullptr}; wxBoxSizer * m_sizer_other_devices{nullptr};