3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: print button enable status [STUDIO-3136]

Browse source 
on all plates stats page, should disable print button

Change-Id: I27dbc87c6a3ffda8f58a8544aae71618bffb3272
This commit is contained in:
liz.li 2023-06-13 15:09:32 +08:00 • committed by Lane.Wei
parent 059ea09353
commit 373152c78a
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1615,6 +1615,8 @@ void GLCanvas3D::enable_main_toolbar(bool enable)
void GLCanvas3D::reset_select_plate_toolbar_selection() { void GLCanvas3D::reset_select_plate_toolbar_selection() {
if (m_sel_plate_toolbar.m_all_plates_stats_item) if (m_sel_plate_toolbar.m_all_plates_stats_item)
m_sel_plate_toolbar.m_all_plates_stats_item->selected = false; m_sel_plate_toolbar.m_all_plates_stats_item->selected = false;
if (wxGetApp().mainframe)
wxGetApp().mainframe->update_slice_print_status(MainFrame::eEventSliceUpdate, true, true);
} }
void GLCanvas3D::enable_select_plate_toolbar(bool enable) void GLCanvas3D::enable_select_plate_toolbar(bool enable)

1
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -724,6 +724,7 @@ public:
const GLVolumeCollection& get_volumes() const { return m_volumes; } const GLVolumeCollection& get_volumes() const { return m_volumes; }
void reset_volumes(); void reset_volumes();
ModelInstanceEPrintVolumeState check_volumes_outside_state() const; ModelInstanceEPrintVolumeState check_volumes_outside_state() const;
bool is_all_plates_selected() { return m_sel_plate_toolbar.m_all_plates_stats_item && m_sel_plate_toolbar.m_all_plates_stats_item->selected; }
const float get_scale() const; const float get_scale() const;
//BBS //BBS

8
src/slic3r/GUI/MainFrame.cpp
View file

@ -1672,7 +1672,7 @@ bool MainFrame::get_enable_print_status()
PartPlateList &part_plate_list = m_plater->get_partplate_list(); PartPlateList &part_plate_list = m_plater->get_partplate_list();
PartPlate *current_plate = part_plate_list.get_curr_plate(); PartPlate *current_plate = part_plate_list.get_curr_plate();
bool is_all_plates = wxGetApp().plater()->get_preview_canvas3D()->is_all_plates_selected();
if (m_print_select == ePrintAll) if (m_print_select == ePrintAll)
{ {
if (!part_plate_list.is_all_slice_results_ready_for_print()) if (!part_plate_list.is_all_slice_results_ready_for_print())
@ -1686,6 +1686,7 @@ bool MainFrame::get_enable_print_status()
{ {
enable = false; enable = false;
} }
enable = enable && !is_all_plates;
} }
else if (m_print_select == eExportGcode) else if (m_print_select == eExportGcode)
{ {
@ -1693,6 +1694,7 @@ bool MainFrame::get_enable_print_status()
{ {
enable = false; enable = false;
} }
enable = enable && !is_all_plates;
} }
else if (m_print_select == eSendGcode) else if (m_print_select == eSendGcode)
{ {
@ -1700,6 +1702,7 @@ bool MainFrame::get_enable_print_status()
enable = false; enable = false;
if (!can_send_gcode()) if (!can_send_gcode())
enable = false; enable = false;
enable = enable && !is_all_plates;
} }
else if (m_print_select == eUploadGcode) else if (m_print_select == eUploadGcode)
{ {
@ -1707,6 +1710,7 @@ bool MainFrame::get_enable_print_status()
enable = false; enable = false;
if (!can_send_gcode()) if (!can_send_gcode())
enable = false; enable = false;
enable = enable && !is_all_plates;
} }
else if (m_print_select == eExportSlicedFile) else if (m_print_select == eExportSlicedFile)
{ {
@ -1714,6 +1718,7 @@ bool MainFrame::get_enable_print_status()
{ {
enable = false; enable = false;
} }
enable = enable && !is_all_plates;
} }
else if (m_print_select == eSendToPrinter) else if (m_print_select == eSendToPrinter)
{ {
@ -1721,6 +1726,7 @@ bool MainFrame::get_enable_print_status()
{ {
enable = false; enable = false;
} }
enable = enable && !is_all_plates;
} }
else if (m_print_select == eSendToPrinterAll) else if (m_print_select == eSendToPrinterAll)
{ {