From db4067a9dc95ab5e2354a9b1dfd92a12fa0c9ce2 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Thu, 8 Dec 2022 10:43:54 +0800 Subject: [PATCH] ENH: adjust funtions for P1P Change-Id: Id8ce17f6cae523f9e6a0ccd9903df6ebefda934e Signed-off-by: Stone Li --- resources/config.json | 3 ++- src/slic3r/GUI/DeviceManager.cpp | 6 ++++++ src/slic3r/GUI/DeviceManager.hpp | 1 + src/slic3r/GUI/PrintOptionsDialog.cpp | 9 +-------- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/resources/config.json b/resources/config.json index 7c48012fa..71ecd48e9 100644 --- a/resources/config.json +++ b/resources/config.json @@ -7,16 +7,17 @@ "FUNC_FIRSTLAYER_INSPECT": false, "FUNC_AI_MONITORING": false, "FUNC_BUILDPLATE_MARKER_DETECT": false, - "FUNC_AUTO_RECOVERY_STEP_LOSS": false, "FUNC_FLOW_CALIBRATION": false, "FUNC_MONITORING": false, "FUNC_TIMELAPSE": false, "FUNC_MEDIA_FILE": false, "FUNC_REMOTE_TUNNEL": false, "FUNC_LOCAL_TUNNEL": true, + "FUNC_VIRTUAL_CAMERA" : false, "FUNC_PRINT_WITHOUT_SD": false, "FUNC_ALTER_RESOLUTION": false, "FUNC_AUTO_SWITCH_FILAMENT": false, + "FUNC_CHAMBER_FAN" : false, "FUNC_SEND_TO_SDCARD": false }, "camera_resolution":["720p"], diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index e21c88d3c..946c75663 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1984,6 +1984,12 @@ bool MachineObject::is_function_supported(PrinterFunction func) case FUNC_AUTO_SWITCH_FILAMENT: func_name = "FUNC_AUTO_SWITCH_FILAMENT"; break; + case FUNC_VIRTUAL_CAMERA: + func_name = "FUNC_VIRTUAL_CAMERA"; + break; + case FUNC_CHAMBER_FAN: + func_name = "FUNC_CHAMBER_FAN"; + break; default: return true; } diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 5b897b91b..3e768c389 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -84,6 +84,7 @@ enum PrinterFunction { FUNC_ALTER_RESOLUTION, FUNC_SEND_TO_SDCARD, FUNC_AUTO_SWITCH_FILAMENT, + FUNC_CHAMBER_FAN, FUNC_MAX }; diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index ee08b2e53..902636634 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -3,8 +3,6 @@ #include "GUI_App.hpp" #include "libslic3r/Utils.hpp" -#define DLG_SIZE (wxSize(FromDIP(360), FromDIP(160))) - static const wxColour STATIC_BOX_LINE_COL = wxColour(238, 238, 238); static const wxColour STATIC_TEXT_CAPTION_COL = wxColour(100, 100, 100); @@ -18,9 +16,6 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent) SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); - - this->SetMinSize(DLG_SIZE); - this->SetSize(DLG_SIZE); auto m_options_sizer = create_settings_group(this); this->SetSizer(m_options_sizer); @@ -71,8 +66,6 @@ PrintOptionsDialog::~PrintOptionsDialog() void PrintOptionsDialog::on_dpi_changed(const wxRect& suggested_rect) { - this->SetMinSize(DLG_SIZE); - this->SetSize(DLG_SIZE); Fit(); } @@ -140,7 +133,6 @@ void PrintOptionsDialog::update_options(MachineObject* obj_) } this->Freeze(); - auto test1 = obj_->xcam_first_layer_inspector; auto test2 = obj_->xcam_buildplate_marker_detector; auto test3 = obj_->xcam_auto_recovery_step_loss; @@ -158,6 +150,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_) update_ai_monitor_status(); this->Thaw(); + Layout(); } wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)