3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-24 21:35:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: the current temp has been set twice

Browse source 
jira: [none]
Change-Id: I46f313e8f3bee49be708feb4dc6475a60ab1cea6
(cherry picked from commit 091430018192e530dbfe52677383b90ece167dc6)
This commit is contained in:
xin.zhang 2025-02-11 12:05:06 +08:00 • committed by Noisyfox
parent 078fa9d220
commit 0e1a930e10
1 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/slic3r/GUI/StatusPanel.cpp
View file

@ -2467,32 +2467,6 @@ void StatusPanel::update(MachineObject *obj)
m_parts_btn->Show();
//support edit chamber temp
if (obj->is_support_chamber_edit) {
m_tempCtrl_chamber->SetReadOnly(false);
m_tempCtrl_chamber->Enable();
m_tempCtrl_chamber->SetMinTemp(obj->chamber_temp_edit_min);
m_tempCtrl_chamber->SetMaxTemp(obj->chamber_temp_edit_max);
wxCursor cursor(wxCURSOR_IBEAM);
m_tempCtrl_chamber->GetTextCtrl()->SetCursor(cursor);
} else {
m_tempCtrl_chamber->SetReadOnly(true);
wxCursor cursor(wxCURSOR_ARROW);
m_tempCtrl_chamber->GetTextCtrl()->SetCursor(cursor);
if (obj->get_printer_series() == PrinterSeries::SERIES_X1) {
m_tempCtrl_chamber->SetTagTemp(TEMP_BLANK_STR);
}if (obj->get_printer_series() == PrinterSeries::SERIES_P1P)
{
m_tempCtrl_chamber->SetLabel(TEMP_BLANK_STR);
m_tempCtrl_chamber->GetTextCtrl()->SetValue(TEMP_BLANK_STR);
}
//m_tempCtrl_chamber->Disable();
}
if (!obj->dev_connection_type.empty()) {
auto iter_connect_type = m_print_connect_types.find(obj->dev_id);
if (iter_connect_type != m_print_connect_types.end()) {
@ -2794,13 +2768,43 @@ void StatusPanel::update_temp_ctrl(MachineObject *obj)
}
}
m_tempCtrl_chamber->SetCurrTemp(obj->chamber_temp);
// update temprature if not input temp target
if (m_temp_chamber_timeout > 0) {
m_temp_chamber_timeout--;
// support current temp for chamber
if (obj->get_printer_series() == PrinterSeries::SERIES_X1)
{
m_tempCtrl_chamber->SetCurrTemp(obj->chamber_temp);
}
else {
if (!cham_temp_input && obj->is_support_chamber_edit) { m_tempCtrl_chamber->SetTagTemp(obj->chamber_temp_target); }
else
{
m_tempCtrl_chamber->SetCurrTemp(TEMP_BLANK_STR);
}
// support edit chamber temp
if (obj->is_support_chamber_edit)
{
m_tempCtrl_chamber->SetReadOnly(false);
m_tempCtrl_chamber->Enable();
m_tempCtrl_chamber->SetMinTemp(obj->chamber_temp_edit_min);
m_tempCtrl_chamber->SetMaxTemp(obj->chamber_temp_edit_max);
wxCursor cursor(wxCURSOR_IBEAM);
m_tempCtrl_chamber->GetTextCtrl()->SetCursor(cursor);
if (m_temp_chamber_timeout > 0)
{
m_temp_chamber_timeout--;
}
else
{
/*update temprature if not input temp target*/
if (!cham_temp_input) { m_tempCtrl_chamber->SetTagTemp(obj->chamber_temp_target); }
}
}
else
{
m_tempCtrl_chamber->SetReadOnly(true);
m_tempCtrl_chamber->SetTagTemp(TEMP_BLANK_STR);
wxCursor cursor(wxCURSOR_ARROW);
m_tempCtrl_chamber->GetTextCtrl()->SetCursor(cursor);
}
if ((obj->chamber_temp_target - obj->chamber_temp) >= TEMP_THRESHOLD_VAL) {