Merge remote-tracking branch 'origin/et_layer_time_preview' into et_preview_layout
This commit is contained in:
commit
5cf48d1ecf
5 changed files with 192 additions and 43 deletions
src/slic3r/GUI
|
@ -221,6 +221,10 @@ bool Preview::init(wxWindow* parent, Model* model)
|
|||
m_choice_view_type->Append(_L("Fan speed"));
|
||||
m_choice_view_type->Append(_L("Temperature"));
|
||||
m_choice_view_type->Append(_L("Volumetric flow rate"));
|
||||
#if ENABLE_PREVIEW_LAYER_TIME
|
||||
m_choice_view_type->Append(_L("Layer time (linear)"));
|
||||
m_choice_view_type->Append(_L("Layer time (logarithmic)"));
|
||||
#endif // ENABLE_PREVIEW_LAYER_TIME
|
||||
m_choice_view_type->Append(_L("Tool"));
|
||||
m_choice_view_type->Append(_L("Color Print"));
|
||||
m_choice_view_type->SetSelection(0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue