Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorenricoturri1966 <enricoturri@seznam.cz>2020-11-18 12:44:03 +0300
committerenricoturri1966 <enricoturri@seznam.cz>2020-11-18 12:44:03 +0300
commitfaff112ea8f1f3ad27537bf886208f64fb07c0e1 (patch)
tree0ba2afba8a5e76f72aa9641e6333c44953ea9035 /src/slic3r/GUI/BackgroundSlicingProcess.cpp
parent2ea00cf916526eacd0e1023a9865e25c75dc7b16 (diff)
ENABLE_GCODE_VIEWER set as default in:
3DScene hpp/cpp AboutDialog.cpp BackgroundSlicingProcess hpp/cpp BitmapCache.cpp ConfigWizard_private.hpp GUI_App hpp/cpp GUI_Init.cpp
Diffstat (limited to 'src/slic3r/GUI/BackgroundSlicingProcess.cpp')
-rw-r--r--src/slic3r/GUI/BackgroundSlicingProcess.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
index df8878cd8..66d1f551f 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -141,11 +141,7 @@ void BackgroundSlicingProcess::process_fff()
// Passing the timestamp
evt.SetInt((int)(m_fff_print->step_state_with_timestamp(PrintStep::psSlicingFinished).timestamp));
wxQueueEvent(GUI::wxGetApp().mainframe->m_plater, evt.Clone());
-#if ENABLE_GCODE_VIEWER
m_fff_print->export_gcode(m_temp_output_path, m_gcode_result, m_thumbnail_cb);
-#else
- m_fff_print->export_gcode(m_temp_output_path, m_gcode_preview_data, m_thumbnail_cb);
-#endif // ENABLE_GCODE_VIEWER
if (this->set_step_started(bspsGCodeFinalize)) {
if (! m_export_path.empty()) {
wxQueueEvent(GUI::wxGetApp().mainframe->m_plater, new wxCommandEvent(m_event_export_began_id));
@@ -433,25 +429,14 @@ Print::ApplyStatus BackgroundSlicingProcess::apply(const Model &model, const Dyn
assert(m_print != nullptr);
assert(config.opt_enum<PrinterTechnology>("printer_technology") == m_print->technology());
Print::ApplyStatus invalidated = m_print->apply(model, config);
-#if ENABLE_GCODE_VIEWER
if ((invalidated & PrintBase::APPLY_STATUS_INVALIDATED) != 0 && m_print->technology() == ptFFF &&
- !this->m_fff_print->is_step_done(psGCodeExport))
- {
+ !this->m_fff_print->is_step_done(psGCodeExport)) {
// Some FFF status was invalidated, and the G-code was not exported yet.
// Let the G-code preview UI know that the final G-code preview is not valid.
// In addition, this early memory deallocation reduces memory footprint.
if (m_gcode_result != nullptr)
m_gcode_result->reset();
}
-#else
- if ((invalidated & PrintBase::APPLY_STATUS_INVALIDATED) != 0 && m_print->technology() == ptFFF &&
- m_gcode_preview_data != nullptr && ! this->m_fff_print->is_step_done(psGCodeExport)) {
- // Some FFF status was invalidated, and the G-code was not exported yet.
- // Let the G-code preview UI know that the final G-code preview is not valid.
- // In addition, this early memory deallocation reduces memory footprint.
- m_gcode_preview_data->reset();
- }
-#endif // ENABLE_GCODE_VIEWER
return invalidated;
}