3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build when tech ENABLE_GCODE_VIEWER is disabled

Browse Source
This commit is contained in:
enricoturri1966 2020-10-16 14:08:24 +02:00
parent 0f85777a79
commit ccd8e3644e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PrusaSlicer.cpp
View File

@ -577,17 +577,17 @@ int CLI::run(int argc, char **argv)
// #ifdef USE_WX // #ifdef USE_WX
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
GUI::GUI_App* gui = new GUI::GUI_App(start_as_gcodeviewer ? GUI::GUI_App::EAppMode::GCodeViewer : GUI::GUI_App::EAppMode::Editor); GUI::GUI_App* gui = new GUI::GUI_App(start_as_gcodeviewer ? GUI::GUI_App::EAppMode::GCodeViewer : GUI::GUI_App::EAppMode::Editor);
if (gui->get_app_mode() != GUI::GUI_App::EAppMode::GCodeViewer) { // gcode viewer is currently not performing instance check
bool gui_single_instance_setting = gui->app_config->get("single_instance") == "1";
if (Slic3r::instance_check(argc, argv, gui_single_instance_setting)) {
//TODO: do we have delete gui and other stuff?
return -1;
}
}
#else #else
GUI::GUI_App *gui = new GUI::GUI_App(); GUI::GUI_App *gui = new GUI::GUI_App();
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
if(gui->get_app_mode() != GUI::GUI_App::EAppMode::GCodeViewer){ // gcode viewer is currently not performing instance check
bool gui_single_instance_setting = gui->app_config->get("single_instance") == "1";
if (Slic3r::instance_check(argc, argv, gui_single_instance_setting)) {
//TODO: do we have delete gui and other stuff?
return -1;
}
}
// gui->autosave = m_config.opt_string("autosave"); // gui->autosave = m_config.opt_string("autosave");
GUI::GUI_App::SetInstance(gui); GUI::GUI_App::SetInstance(gui);
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER

2
src/slic3r/GUI/GUI_App.cpp
View File

@ -1578,8 +1578,10 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
PreferencesDialog dlg(mainframe); PreferencesDialog dlg(mainframe);
dlg.ShowModal(); dlg.ShowModal();
app_layout_changed = dlg.settings_layout_changed(); app_layout_changed = dlg.settings_layout_changed();
#if ENABLE_GCODE_VIEWER
if (dlg.seq_top_layer_only_changed()) if (dlg.seq_top_layer_only_changed())
this->plater_->refresh_print(); this->plater_->refresh_print();
#endif // ENABLE_GCODE_VIEWER
} }
if (app_layout_changed) { if (app_layout_changed) {
// hide full main_sizer for mainFrame // hide full main_sizer for mainFrame

2
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -541,7 +541,9 @@ void Preview::refresh_print()
return; return;
load_print(true); load_print(true);
#if ENABLE_GCODE_VIEWER
m_moves_slider->set_lower_editable(get_app_config()->get("seq_top_layer_only") == "0"); m_moves_slider->set_lower_editable(get_app_config()->get("seq_top_layer_only") == "0");
#endif // ENABLE_GCODE_VIEWER
} }
void Preview::msw_rescale() void Preview::msw_rescale()