mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: adjust funtions for P1P 

Change-Id: Id8ce17f6cae523f9e6a0ccd9903df6ebefda934e
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-12-08 10:43:54 +08:00 committed by Lane.Wei
parent 22780a0be4
commit db4067a9dc
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/config.json
View File

@ -7,16 +7,17 @@
"FUNC_FIRSTLAYER_INSPECT": false, "FUNC_FIRSTLAYER_INSPECT": false,
"FUNC_AI_MONITORING": false, "FUNC_AI_MONITORING": false,
"FUNC_BUILDPLATE_MARKER_DETECT": false, "FUNC_BUILDPLATE_MARKER_DETECT": false,
"FUNC_AUTO_RECOVERY_STEP_LOSS": false,
"FUNC_FLOW_CALIBRATION": false, "FUNC_FLOW_CALIBRATION": false,
"FUNC_MONITORING": false, "FUNC_MONITORING": false,
"FUNC_TIMELAPSE": false, "FUNC_TIMELAPSE": false,
"FUNC_MEDIA_FILE": false, "FUNC_MEDIA_FILE": false,
"FUNC_REMOTE_TUNNEL": false, "FUNC_REMOTE_TUNNEL": false,
"FUNC_LOCAL_TUNNEL": true, "FUNC_LOCAL_TUNNEL": true,
"FUNC_VIRTUAL_CAMERA" : false,
"FUNC_PRINT_WITHOUT_SD": false, "FUNC_PRINT_WITHOUT_SD": false,
"FUNC_ALTER_RESOLUTION": false, "FUNC_ALTER_RESOLUTION": false,
"FUNC_AUTO_SWITCH_FILAMENT": false, "FUNC_AUTO_SWITCH_FILAMENT": false,
"FUNC_CHAMBER_FAN" : false,
"FUNC_SEND_TO_SDCARD": false "FUNC_SEND_TO_SDCARD": false
}, },
"camera_resolution":["720p"], "camera_resolution":["720p"],

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

@ -1984,6 +1984,12 @@ bool MachineObject::is_function_supported(PrinterFunction func)
case FUNC_AUTO_SWITCH_FILAMENT: case FUNC_AUTO_SWITCH_FILAMENT:
func_name = "FUNC_AUTO_SWITCH_FILAMENT"; func_name = "FUNC_AUTO_SWITCH_FILAMENT";
break; break;
case FUNC_VIRTUAL_CAMERA:
func_name = "FUNC_VIRTUAL_CAMERA";
break;
case FUNC_CHAMBER_FAN:
func_name = "FUNC_CHAMBER_FAN";
break;
default: default:
return true; return true;
} }

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

@ -84,6 +84,7 @@ enum PrinterFunction {
FUNC_ALTER_RESOLUTION, FUNC_ALTER_RESOLUTION,
FUNC_SEND_TO_SDCARD, FUNC_SEND_TO_SDCARD,
FUNC_AUTO_SWITCH_FILAMENT, FUNC_AUTO_SWITCH_FILAMENT,
FUNC_CHAMBER_FAN,
FUNC_MAX FUNC_MAX
}; };

9
src/slic3r/GUI/PrintOptionsDialog.cpp
View File

@ -3,8 +3,6 @@
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "libslic3r/Utils.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_BOX_LINE_COL = wxColour(238, 238, 238);
static const wxColour STATIC_TEXT_CAPTION_COL = wxColour(100, 100, 100); 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)); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE); SetBackgroundColour(*wxWHITE);
this->SetMinSize(DLG_SIZE);
this->SetSize(DLG_SIZE);
auto m_options_sizer = create_settings_group(this); auto m_options_sizer = create_settings_group(this);
this->SetSizer(m_options_sizer); this->SetSizer(m_options_sizer);
@ -71,8 +66,6 @@ PrintOptionsDialog::~PrintOptionsDialog()
void PrintOptionsDialog::on_dpi_changed(const wxRect& suggested_rect) void PrintOptionsDialog::on_dpi_changed(const wxRect& suggested_rect)
{ {
this->SetMinSize(DLG_SIZE);
this->SetSize(DLG_SIZE);
Fit(); Fit();
} }
@ -140,7 +133,6 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
} }
this->Freeze(); this->Freeze();
auto test1 = obj_->xcam_first_layer_inspector; auto test1 = obj_->xcam_first_layer_inspector;
auto test2 = obj_->xcam_buildplate_marker_detector; auto test2 = obj_->xcam_buildplate_marker_detector;
auto test3 = obj_->xcam_auto_recovery_step_loss; auto test3 = obj_->xcam_auto_recovery_step_loss;
@ -158,6 +150,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
update_ai_monitor_status(); update_ai_monitor_status();
this->Thaw(); this->Thaw();
Layout();
} }
wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)