diff --git a/src/slic3r/GUI/MultiMachine.cpp b/src/slic3r/GUI/MultiMachine.cpp index 7be604ec0..f22994e79 100644 --- a/src/slic3r/GUI/MultiMachine.cpp +++ b/src/slic3r/GUI/MultiMachine.cpp @@ -216,6 +216,9 @@ std::vector selected_machines(const std::vector& dev_i SortItem::SortItem() { + sort_map.emplace(std::make_pair(SortRule::SR_None, [this](const DeviceItem* d1, const DeviceItem* d2) { + return d1->state_dev_name > d2->state_dev_name; + })); sort_map.emplace(std::make_pair(SortRule::SR_DEV_NAME, [this](const DeviceItem* d1, const DeviceItem* d2) { return this->big ? d1->state_dev_name > d2->state_dev_name : d1->state_dev_name < d2->state_dev_name; })); diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp index 3cdb5b3ce..cc24655d4 100644 --- a/src/slic3r/GUI/MultiTaskManagerPage.cpp +++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp @@ -553,7 +553,6 @@ LocalTaskManagerPage::LocalTaskManagerPage(wxWindow* parent) m_select_checkbox = new CheckBox(m_table_head_panel, wxID_ANY); m_select_checkbox->SetMinSize(wxSize(FromDIP(TASK_LEFT_PRINTABLE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); m_select_checkbox->SetMaxSize(wxSize(FromDIP(TASK_LEFT_PRINTABLE), FromDIP(DEVICE_ITEM_MAX_HEIGHT))); - m_table_head_sizer->AddSpacer(FromDIP(TASK_LEFT_PADDING_LEFT)); m_table_head_sizer->Add(m_select_checkbox, 0, wxALIGN_CENTER_VERTICAL, 0); m_select_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) { @@ -756,8 +755,8 @@ void LocalTaskManagerPage::refresh_user_device(bool clear) auto task_manager = wxGetApp().getTaskManager(); if (task_manager) { auto m_task_obj_list = task_manager->get_local_task_list(); - - for (auto it = m_task_obj_list.begin(); it != m_task_obj_list.end(); it++) { + + for (auto it = m_task_obj_list.rbegin(); it != m_task_obj_list.rend(); ++it) { TaskStateInfo* task_state_info = it->second; @@ -794,7 +793,7 @@ void LocalTaskManagerPage::refresh_user_device(bool clear) task_temps.push_back(mtitem); } - if (m_sort.rule != SortItem::SortRule::SR_None) { + if (m_sort.rule != SortItem::SortRule::SR_None && m_sort.rule != SortItem::SortRule::SR_SEND_TIME) { std::sort(task_temps.begin(), task_temps.end(), m_sort.get_call_back()); } diff --git a/src/slic3r/GUI/MultiTaskManagerPage.hpp b/src/slic3r/GUI/MultiTaskManagerPage.hpp index b463f048e..40341560e 100644 --- a/src/slic3r/GUI/MultiTaskManagerPage.hpp +++ b/src/slic3r/GUI/MultiTaskManagerPage.hpp @@ -88,7 +88,7 @@ public: private: SortItem m_sort; - std::map m_task_items; + std::map m_task_items; bool device_name_big{ true }; bool device_state_big{ true }; bool device_send_time{ true }; diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index ced9fb397..6cb719dbd 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -1230,8 +1230,8 @@ wxPanel* SendMultiMachinePage::create_page() // add send option wxBoxSizer* title_send_option = create_item_title(_L("Send Options"), main_page, ""); - wxBoxSizer* max_printer_send = create_item_input(_L("Send"), _L("printers at the same time"), main_page, "", "max_send"); - wxBoxSizer* delay_time = create_item_input(_L("Wait"), _L("minute each batch"), main_page, "", "sending_interval"); + wxBoxSizer* max_printer_send = create_item_input(_L("Send"), _L("printers at the same time.(It depends on how many devices can undergo heating at the same time.)"), main_page, "", "max_send"); + wxBoxSizer* delay_time = create_item_input(_L("Wait"), _L("minute each batch.(It depends on how long it takes to complete the heating.)"), main_page, "", "sending_interval"); sizer->Add(title_send_option, 0, wxEXPAND, 0); sizer->Add(max_printer_send, 0, wxLEFT, FromDIP(20)); sizer->AddSpacer(FromDIP(3)); diff --git a/src/slic3r/GUI/TaskManager.cpp b/src/slic3r/GUI/TaskManager.cpp index 0de31566a..f011e10ce 100644 --- a/src/slic3r/GUI/TaskManager.cpp +++ b/src/slic3r/GUI/TaskManager.cpp @@ -284,9 +284,9 @@ void TaskManager::stop() m_scedule_thread.join(); } -std::map TaskManager::get_local_task_list() +std::map TaskManager::get_local_task_list() { - std::map out; + std::map out; m_map_mutex.lock(); for (auto it = m_cache_map.begin(); it != m_cache_map.end(); it++) { for (auto iter = (*it).tasks.begin(); iter != (*it).tasks.end(); iter++) { @@ -295,7 +295,7 @@ std::map TaskManager::get_local_task_list() || (*iter)->state() == TaskState::TS_SEND_CANCELED || (*iter)->state() == TaskState::TS_SEND_COMPLETED || (*iter)->state() == TaskState::TS_SEND_FAILED) { - out.insert(std::make_pair(std::to_string((*iter)->task_info_id), *iter)); + out.insert(std::make_pair((*iter)->task_info_id, *iter)); } } } diff --git a/src/slic3r/GUI/TaskManager.hpp b/src/slic3r/GUI/TaskManager.hpp index caaae368f..e4aa8627e 100644 --- a/src/slic3r/GUI/TaskManager.hpp +++ b/src/slic3r/GUI/TaskManager.hpp @@ -150,7 +150,7 @@ public: void start(); void stop(); - std::map get_local_task_list(); + std::map get_local_task_list(); /* curr_page is start with 0 */ std::map get_task_list(int curr_page, int page_count, int& total);