GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 04:12:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

try fix cog

Browse Source
This commit is contained in:
remi durand 2021-06-11 19:42:58 +02:00
parent e67181d2d4
commit fbd9f1506f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode/CoolingBuffer.cpp
View File

@ -284,7 +284,7 @@ finished:
float time_stretch_final = 0.f; float time_stretch_final = 0.f;
for (auto it = it_begin; it != it_end; ++ it) for (auto it = it_begin; it != it_end; ++ it)
time_stretch_final += (*it)->time_stretch_when_slowing_down_to_feedrate(new_feedrate); time_stretch_final += (*it)->time_stretch_when_slowing_down_to_feedrate(new_feedrate);
assert(std::abs(time_stretch - time_stretch_final) < EPSILON); //assert(std::abs(time_stretch - time_stretch_final) < EPSILON);
} }
#endif /* NDEBUG */ #endif /* NDEBUG */

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

@ -696,7 +696,14 @@ bool PlaterPresetComboBox::switch_to_tab()
wxGetApp().tab_panel()->SetSelection(page_id); wxGetApp().tab_panel()->SetSelection(page_id);
// Switch to Settings NotePad // Switch to Settings NotePad
wxGetApp().mainframe->select_tab(MainFrame::ETabType::LastSettings); if(m_type == Preset::Type::TYPE_PRINT || m_type == Preset::Type::TYPE_SLA_PRINT)
wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrintSettings);
else if (m_type == Preset::Type::TYPE_FILAMENT || m_type == Preset::Type::TYPE_SLA_MATERIAL)
wxGetApp().mainframe->select_tab(MainFrame::ETabType::FilamentSettings);
else if (m_type == Preset::Type::TYPE_PRINTER)
wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrinterSettings);
else
wxGetApp().mainframe->select_tab(MainFrame::ETabType::LastSettings);
return true; return true;
} }