mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-17 03:37:54 -06:00

* fixed logic error in PLA jamming gcode for P1S * Fix use after free bug in LinesBucketQueue::emplace_back_bucket I found a use after free bug in LinesBucketQueue::emplace_back_bucket. This was found by enabling address sanitizer. The LinesBucketQueue class has two related members: std::vector<LinesBucket> line_buckets; std::priority_queue<LinesBucket *, std::vector<LinesBucket *>, LinesBucketPtrComp> line_bucket_ptr_queue; line_bucket_ptr_queue holds pointers into line_buckets. However, since items are inserted into line_buckets one at a time, existing pointers that were stored inside line_bucket_ptr_queue become invalid. Specifically: void LinesBucketQueue::emplace_back_bucket(ExtrusionLayers &&els, const void *objPtr, Point offset) { auto oldSize = line_buckets.capacity(); line_buckets.emplace_back(std::move(els), objPtr, offset); <--- Causes a reallocation, making previous pointers invalid line_bucket_ptr_queue.push(&line_buckets.back()); <-- priority queue compares against old, now invalid pointers ... The proposed fix is to calculate the required number of entries in ConflictChecker::find_inter_of_lines_in_diff_objs, and then calling line_buckets.reserve(count). This ensures that sufficient buffer is allocated up front and the pointers are stable as items are added. * Updated to fix the handling of the capacity change, and removed the code I previously added to reserve upfront since it is not really needed * Remove accidentally added whitespace * Removed unused method * ENH:add mz_zip_reader_extract_to_file_w api to solove plugin install failed problem by special wide char jira: none Change-Id: Ic7d3efe3fdf852387650abf9df65803da9e46a60 (cherry picked from commit b68ad03717a63675fef2f3ef73d4058bf311adea) * FIX: PrinterFileSystem report real connect error Change-Id: I99d6ff7f6dcb1f53ccf59854f5f19d0bd39fa9fc Jira: none * rename preference name * FIX:Relax restrictions on importing obj files jira: none Change-Id: I61a0156a8424a5f59922956918d37d38e2c3306a * FIX: [6469] popup dialog too mach when reload object Jira: 6469 Change-Id: I4097e3a3b018c7a676fea93bf63f8f778bb3148b * FIX:fixed incorrect display of printer options page on Linux jira:[STUDIO-6220] Change-Id: Id1f084658b0b340b7f17ab97ba82c0fd3ae83fae * FIX: handle exception of dividing by zero in arranging jira: none Change-Id: I0d20464dbe81a80293539100f06d72dee456a27b (cherry picked from commit 94746ae9bf7f467243849570450567b4fdc78e3a) * ENH:delete no use code jira: none Change-Id: I40e7ffa7ea47bb3cd4039eef9f6c28c604eb3abc * FIX: PrinterFileSystem::FileRemoved Change-Id: I891aaa8d58ff379dc1ebd8581064865a33388f74 * FIX: resend ttcode to printer on -90 error Change-Id: I96dc45102a2759a9f1a0002f42c3a91b2c6b2d75 Jira: STUDIO-5947 (cherry picked from commit 97d687b7c88f8cd51b8eddd39120349d8eac42b1) * FIX: fix some issue in multi machine JIRA: STUDIO-6934 STUDIO-6888 1. Fix the issue of incomplete display caused by excessively long file names 2. Fix the issue of icon display being too large 3. Fix the issue of garbled Chinese characters in the task list Change-Id: I36bc10bf2067f44aaa7e3651b58e526ea323c8ad * FIX: Incorrect multiplier, when the multiplier is set to below 1 github: #3987 #3805 1. In some languages that use commas as decimal points, setting multiplier below 1 will resolve to 0 2. Unable to save multiplier correctly Change-Id: I62bc55e270929ebb5e910eb79c6f97106e842b93 * Arrange * FIX: wrong wipe tower when open 3mf file 1.wipe tower pos in 3mf was overwritten by default pos when opening 3mf with a different printer profile.This patch fix it jira: STUDIO-5890 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I12e5d4b80a0ad86194db0682c1763ba4a9492521 * ENH: update A1 machine gcode 1.Adjust the y position of the A1 extrusion compensation line jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Iea690a0184ae10a47f53e1532272c31fc0a04cfa * FIX: minor spelling mistake in gcode github:#3477 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id3201bf8b8125ce060e2cac102ab2525877e27c1 * FIX: slice crash with height_range github: 3917 Change-Id: Icdf83013213b47935b7a795ed75cc3d49057665d * FIX: ERROR_RES_BUSY text Change-Id: Ifde1a7b0c6ab915eb226c2072c46edd40f60cf9a Jira: STUDIO-6436 * ENH:Unable to send printing without selecting a device jira:[STUDIO-6850] Change-Id: Ic537579727fd1618af364db93fce8fbbe4cd635a * FIX:add exit_gizmo before slice model jira: STUDIO-5531 Change-Id: Icddc9d73b3d91bb68e9768d13e48cbae0680e58e * FIX: PrinterFileSystem report real connect error Change-Id: Id6750cfa2a98fe8325ba677dabb606a0a701b495 * FIX: add can slice judgement in slice all plates processing jira: STUDIO-6325 Change-Id: Ic7fb8cef000c03210bb77289a570ee6b60b6083e * FIX:Fixed error in displaying the name of Bambu filaments Change-Id: Ib42194c07b6eefe793eec81a588debc9d622d951 * FIX: text hidden in calibration tab jira: STUDIO-6264 Change-Id: I24fbc590638a3213d948a973422e010486113923 * FIX: logic error in PLA fan control github PR: #3948 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I28e4a673e590e83d151e92cc82caab45012aeabe * FIX:upgrade cluster algorithm to remove duplicate labels jira: none Change-Id: I4d68d8cd8e080932c7c308bc8f69e27546ffe309 * FIX: can not parse json float in ES on macOS jira: STUDIO-5889 Change-Id: I622f4b474c378d77b0e43d67a320f023be2d5811 * ENH:Clear the value of the previous nozzle type jira:[for nozzle check] Change-Id: I9a932b833fb07de6cb0a91abe6372b0e91f273f1 * ENH: update A1 gcode 1.Modify the width of extrusion compensation line jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I90543758c866d74f2154e3135d7569109def84b8 * FIX: the height range is not valid in assemble object github: 3876 Change-Id: Id38672bbf0c01bc9b9f0a3e2bf1052d945b45131 * FIX: calibration page text hidden in linux jira: STUDIO-6264 Change-Id: If210abf64057eb2e9c2c5b11d41fa33f18684c72 * ENH:clear nozzle information jira:[STUDIO-7050] Change-Id: I15ca4973d09132ddb5cb5a56bedd795ba6976b27 * update plugin version --------- Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: afriede <me@afriede.dev> Co-authored-by: Momin Al-Ghosien <momin@sanestudios.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com>
211 lines
6.8 KiB
C++
211 lines
6.8 KiB
C++
#ifndef slic3r_MultiTaskManagerPage_hpp_
|
|
#define slic3r_MultiTaskManagerPage_hpp_
|
|
|
|
#include "GUI_App.hpp"
|
|
#include "GUI_Utils.hpp"
|
|
#include "MultiMachine.hpp"
|
|
#include "DeviceManager.hpp"
|
|
#include "TaskManager.hpp"
|
|
#include "Widgets/Label.hpp"
|
|
#include "Widgets/Button.hpp"
|
|
#include "Widgets/CheckBox.hpp"
|
|
#include "Widgets/ComboBox.hpp"
|
|
#include "Widgets/ScrolledWindow.hpp"
|
|
#include "Widgets/PopupWindow.hpp"
|
|
#include "Widgets/TextInput.hpp"
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
#define CLOUD_TASK_ITEM_MAX_WIDTH 1100
|
|
#define TASK_ITEM_MAX_WIDTH 900
|
|
#define TASK_LEFT_PADDING_LEFT 15
|
|
#define TASK_LEFT_PRINTABLE 40
|
|
#define TASK_LEFT_PRO_NAME 180
|
|
#define TASK_LEFT_DEV_NAME 150
|
|
#define TASK_LEFT_PRO_STATE 170
|
|
#define TASK_LEFT_PRO_INFO 230
|
|
#define TASK_LEFT_SEND_TIME 180
|
|
|
|
class MultiTaskItem : public DeviceItem
|
|
{
|
|
public:
|
|
MultiTaskItem(wxWindow* parent, MachineObject* obj, int type);
|
|
~MultiTaskItem() {};
|
|
|
|
|
|
void OnEnterWindow(wxMouseEvent& evt);
|
|
void OnLeaveWindow(wxMouseEvent& evt);
|
|
void OnSelectedDevice(wxCommandEvent& evt);
|
|
void OnLeftDown(wxMouseEvent& evt);
|
|
void OnMove(wxMouseEvent& evt);
|
|
|
|
void paintEvent(wxPaintEvent& evt);
|
|
void render(wxDC& dc);
|
|
void doRender(wxDC& dc);
|
|
void DrawTextWithEllipsis(wxDC& dc, const wxString& text, int maxWidth, int left, int top = 0);
|
|
void post_event(wxCommandEvent&& event);
|
|
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
|
|
|
|
bool m_hover{ false };
|
|
wxString get_left_time(int mc_left_time);
|
|
|
|
ScalableBitmap m_bitmap_check_disable;
|
|
ScalableBitmap m_bitmap_check_off;
|
|
ScalableBitmap m_bitmap_check_on;
|
|
|
|
int m_sending_percent{0};
|
|
int m_task_type{0}; //0-local 1-cloud
|
|
wxString m_project_name;
|
|
wxString m_dev_name;
|
|
std::string m_dev_id;
|
|
TaskStateInfo* task_obj { nullptr };
|
|
std::string m_job_id;
|
|
//std::string m_sent_time;
|
|
|
|
Button* m_button_resume{ nullptr };
|
|
Button* m_button_cancel{ nullptr };
|
|
Button* m_button_pause{ nullptr };
|
|
Button* m_button_stop{ nullptr };
|
|
|
|
void update_info();
|
|
void onPause();
|
|
void onResume();
|
|
void onStop();
|
|
void onCancel();
|
|
};
|
|
|
|
class LocalTaskManagerPage : public wxPanel
|
|
{
|
|
public:
|
|
LocalTaskManagerPage(wxWindow* parent);
|
|
~LocalTaskManagerPage() {};
|
|
|
|
void update_page();
|
|
void refresh_user_device(bool clear = false);
|
|
bool Show(bool show);
|
|
void cancel_all(wxCommandEvent& evt);
|
|
void msw_rescale();
|
|
|
|
private:
|
|
SortItem m_sort;
|
|
std::map<int, MultiTaskItem*> m_task_items;
|
|
bool device_name_big{ true };
|
|
bool device_state_big{ true };
|
|
bool device_send_time{ true };
|
|
|
|
wxPanel* m_main_panel{ nullptr };
|
|
wxBoxSizer* m_main_sizer{ nullptr };
|
|
wxBoxSizer* page_sizer{ nullptr };
|
|
wxBoxSizer* m_sizer_task_list{ nullptr };
|
|
wxScrolledWindow* m_task_list{ nullptr };
|
|
wxStaticText* m_selected_num{ nullptr };
|
|
|
|
// table head
|
|
wxPanel* m_table_head_panel{ nullptr };
|
|
wxBoxSizer* m_table_head_sizer{ nullptr };
|
|
CheckBox* m_select_checkbox{ nullptr };
|
|
Button* m_task_name{ nullptr };
|
|
Button* m_printer_name{ nullptr };
|
|
Button* m_status{ nullptr };
|
|
Button* m_info{ nullptr };
|
|
Button* m_send_time{ nullptr };
|
|
Button* m_action{ nullptr };
|
|
|
|
// ctrl button for all
|
|
int m_sel_number{0};
|
|
wxPanel* m_ctrl_btn_panel{ nullptr };
|
|
wxBoxSizer* m_btn_sizer{ nullptr };
|
|
Button* btn_stop_all{ nullptr };
|
|
wxStaticText* m_sel_text{ nullptr };
|
|
|
|
// tip when no device
|
|
wxStaticText* m_tip_text{ nullptr };
|
|
};
|
|
|
|
class CloudTaskManagerPage : public wxPanel
|
|
{
|
|
public:
|
|
CloudTaskManagerPage(wxWindow* parent);
|
|
~CloudTaskManagerPage();
|
|
|
|
void update_page();
|
|
void refresh_user_device(bool clear = false);
|
|
std::string utc_time_to_date(std::string utc_time);
|
|
bool Show(bool show);
|
|
void update_page_number();
|
|
void start_timer();
|
|
void on_timer(wxTimerEvent& event);
|
|
|
|
void pause_all(wxCommandEvent& evt);
|
|
void resume_all(wxCommandEvent& evt);
|
|
void stop_all(wxCommandEvent& evt);
|
|
|
|
void enable_buttons(bool enable);
|
|
void page_num_enter_evt();
|
|
|
|
void msw_rescale();
|
|
|
|
private:
|
|
SortItem m_sort;
|
|
bool device_name_big{ true };
|
|
bool device_state_big{ true };
|
|
bool device_send_time{ true };
|
|
|
|
/* job_id -> sel */
|
|
std::map <std::string, MultiTaskItem*> m_task_items;
|
|
|
|
wxPanel* m_main_panel{ nullptr };
|
|
wxBoxSizer* page_sizer{ nullptr };
|
|
wxBoxSizer* m_sizer_task_list{ nullptr };
|
|
wxBoxSizer* m_main_sizer{ nullptr };
|
|
wxScrolledWindow* m_task_list{ nullptr };
|
|
wxStaticText* m_selected_num{ nullptr };
|
|
|
|
// Flipping pages
|
|
int m_current_page{ 0 };
|
|
int m_total_page{0};
|
|
int m_total_count{ 0 };
|
|
int m_count_page_item{ 10 };
|
|
bool prev{ false };
|
|
bool next{ false };
|
|
Button* btn_last_page{ nullptr };
|
|
Button* btn_next_page{ nullptr };
|
|
wxStaticText* st_page_number{ nullptr };
|
|
wxBoxSizer* m_flipping_page_sizer{ nullptr };
|
|
wxBoxSizer* m_page_sizer{ nullptr };
|
|
wxPanel* m_flipping_panel{ nullptr };
|
|
wxTimer* m_flipping_timer{ nullptr };
|
|
TextInput* m_page_num_input{ nullptr };
|
|
Button* m_page_num_enter{ nullptr };
|
|
|
|
// table head
|
|
wxPanel* m_table_head_panel{ nullptr };
|
|
wxBoxSizer* m_table_head_sizer{ nullptr };
|
|
CheckBox* m_select_checkbox{ nullptr };
|
|
Button* m_task_name{ nullptr };
|
|
Button* m_printer_name{ nullptr };
|
|
Button* m_status{ nullptr };
|
|
Button* m_info{ nullptr };
|
|
Button* m_send_time{ nullptr };
|
|
Button* m_action{ nullptr };
|
|
|
|
// ctrl button for all
|
|
int m_sel_number;
|
|
wxPanel* m_ctrl_btn_panel{ nullptr };
|
|
wxBoxSizer* m_btn_sizer{ nullptr };
|
|
Button* btn_pause_all{ nullptr };
|
|
Button* btn_continue_all{ nullptr };
|
|
Button* btn_stop_all{ nullptr };
|
|
wxStaticText* m_sel_text{ nullptr };
|
|
|
|
// tip when no device
|
|
wxStaticText* m_tip_text{ nullptr };
|
|
wxStaticText* m_loading_text{ nullptr };
|
|
};
|
|
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|
|
|
|
#endif
|