From c4ec6b9c84bf10081e1d815773c19c3a544548e3 Mon Sep 17 00:00:00 2001 From: rtyr <36745189+rtyr@users.noreply.github.com> Date: Wed, 6 Jan 2021 20:35:37 +0100 Subject: [PATCH 1/6] TriLAB 0.0.6 - Added material TPU 93A --- resources/profiles/TriLAB.idx | 3 ++- resources/profiles/TriLAB.ini | 47 +++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/resources/profiles/TriLAB.idx b/resources/profiles/TriLAB.idx index 6eacacb3602..4a097ed6aed 100644 --- a/resources/profiles/TriLAB.idx +++ b/resources/profiles/TriLAB.idx @@ -1,7 +1,8 @@ min_slic3r_version = 2.3.0-alpha3 +0.0.6 Added material TPU 93A (SMARTFIL) 0.0.5 Removed obsolete host keys. 0.0.4 Added PLA, PETG profiles for 0.8 nozzle, update print materials 0.0.3 Added DeltiQ 2, DeltiQ 2 Plus printers, 0.10mm, 0.20mm FLEX print profiles, updated print materials, flexprint extension support min_slic3r_version = 2.3.0-alpha0 0.0.2 Added 0.15mm print profile -0.0.1 Initial TriLAB bundle \ No newline at end of file +0.0.1 Initial TriLAB bundle diff --git a/resources/profiles/TriLAB.ini b/resources/profiles/TriLAB.ini index 49ba73f6cd8..d31461510d2 100644 --- a/resources/profiles/TriLAB.ini +++ b/resources/profiles/TriLAB.ini @@ -6,7 +6,7 @@ name = TriLAB # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 0.0.5 +config_version = 0.0.6 # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/TriLAB/ # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -22,7 +22,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -default_materials = DeltiQ - PLA - Generic; DeltiQ - PETG - Generic; DeltiQ - ABS - Generic; DeltiQ - PLA - ExtraFill (Fillamentum); DeltiQ - PETG (Devil Design); DeltiQ - ABS - ExtraFill (Fillamentum); DeltiQ - ASA - ExtraFill (Fillamentum); DeltiQ - CPE - HG100 (Fillamentum); DeltiQ FP2 - PLA - Generic; DeltiQ FP2 - PETG - Generic; DeltiQ FP2 - ABS - Generic; DeltiQ FP2 - PLA - ExtraFill (Fillamentum); DeltiQ FP2 - PETG (Devil Design); DeltiQ FP2 - ABS - ExtraFill (Fillamentum); DeltiQ FP2 - ASA - ExtraFill (Fillamentum); DeltiQ FP2 - CPE - HG100 (Fillamentum); DeltiQ FP2 - FLEX - Generic; DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum); DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle +default_materials = DeltiQ - PLA - Generic; DeltiQ - PETG - Generic; DeltiQ - ABS - Generic; DeltiQ - PLA - ExtraFill (Fillamentum); DeltiQ - PETG (Devil Design); DeltiQ - ABS - ExtraFill (Fillamentum); DeltiQ - ASA - ExtraFill (Fillamentum); DeltiQ - CPE - HG100 (Fillamentum); DeltiQ FP2 - PLA - Generic; DeltiQ FP2 - PETG - Generic; DeltiQ FP2 - ABS - Generic; DeltiQ FP2 - PLA - ExtraFill (Fillamentum); DeltiQ FP2 - PETG (Devil Design); DeltiQ FP2 - ABS - ExtraFill (Fillamentum); DeltiQ FP2 - ASA - ExtraFill (Fillamentum); DeltiQ FP2 - CPE - HG100 (Fillamentum); DeltiQ FP2 - FLEX - Generic; DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 93A (SMARTFIL); DeltiQ - PLA - ExtraFill (Fillamentum) @0.8 nozzle [printer_model:DQ2P] name = DeltiQ 2 Plus @@ -40,7 +40,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -default_materials = DeltiQ FP2 - PLA - Generic; DeltiQ FP2 - PETG - Generic; DeltiQ FP2 - ABS - Generic; DeltiQ FP2 - PLA - ExtraFill (Fillamentum); DeltiQ FP2 - PETG (Devil Design); DeltiQ FP2 - ABS - ExtraFill (Fillamentum); DeltiQ FP2 - ASA - ExtraFill (Fillamentum); DeltiQ FP2 - CPE - HG100 (Fillamentum); DeltiQ FP2 - FLEX - Generic; DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum) +default_materials = DeltiQ FP2 - PLA - Generic; DeltiQ FP2 - PETG - Generic; DeltiQ FP2 - ABS - Generic; DeltiQ FP2 - PLA - ExtraFill (Fillamentum); DeltiQ FP2 - PETG (Devil Design); DeltiQ FP2 - ABS - ExtraFill (Fillamentum); DeltiQ FP2 - ASA - ExtraFill (Fillamentum); DeltiQ FP2 - CPE - HG100 (Fillamentum); DeltiQ FP2 - FLEX - Generic; DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 93A (SMARTFIL) [printer_model:DQ2P+FP2] name = DeltiQ 2 Plus + FlexPrint 2 @@ -49,7 +49,7 @@ technology = FFF family = DeltiQ 2 bed_model = dq2_bed.stl bed_texture = dq2_bed_texture.svg -default_materials = DeltiQ FP2 - PLA - Generic; DeltiQ FP2 - PETG - Generic; DeltiQ FP2 - ABS - Generic; DeltiQ FP2 - PLA - ExtraFill (Fillamentum); DeltiQ FP2 - PETG (Devil Design); DeltiQ FP2 - ABS - ExtraFill (Fillamentum); DeltiQ FP2 - ASA - ExtraFill (Fillamentum); DeltiQ FP2 - CPE - HG100 (Fillamentum); DeltiQ FP2 - FLEX - Generic; DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum) +default_materials = DeltiQ FP2 - PLA - Generic; DeltiQ FP2 - PETG - Generic; DeltiQ FP2 - ABS - Generic; DeltiQ FP2 - PLA - ExtraFill (Fillamentum); DeltiQ FP2 - PETG (Devil Design); DeltiQ FP2 - ABS - ExtraFill (Fillamentum); DeltiQ FP2 - ASA - ExtraFill (Fillamentum); DeltiQ FP2 - CPE - HG100 (Fillamentum); DeltiQ FP2 - FLEX - Generic; DeltiQ FP2 - TPU 92A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 98A - FlexFill (Fillamentum); DeltiQ FP2 - TPU 93A (SMARTFIL) [printer_model:DQ2+FP] name = DeltiQ 2 + FlexPrint @@ -376,7 +376,7 @@ temperature = 215 [filament:DeltiQ - PETG - Generic] inherits = *DeltiQ common* -bed_temperature = 90 +bed_temperature = 80 bridge_fan_speed = 50 cooling = 1 fan_always_on = 1 @@ -394,7 +394,7 @@ filament_retract_lift = 0.2 filament_retract_speed = 45 filament_type = PET filament_wipe = 1 -first_layer_bed_temperature = 90 +first_layer_bed_temperature = 80 first_layer_temperature = 240 max_fan_speed = 50 min_fan_speed = 30 @@ -695,6 +695,37 @@ filament_retract_length = 2.5 filament_retract_speed = 20 filament_type = TPU98A +[filament:DeltiQ FP2 - TPU 93A (SMARTFIL)] +inherits = DeltiQ FP2 - FLEX - Generic +bed_temperature = 50 +bridge_fan_speed = 80 +cooling = 1 +disable_fan_first_layers = 3 +extrusion_multiplier = 1.00 +fan_always_on = 1 +fan_below_layer_time = 10 +filament_vendor = Smartfil +filament_cost = 1209 +filament_density = 1.21 +filament_deretract_speed = nil +filament_max_volumetric_speed = 2.5 +filament_retract_before_travel = 2 +filament_retract_before_wipe = nil +filament_retract_layer_change = 0 +filament_retract_length = 2.9 +filament_retract_lift = 0.2 +filament_retract_restart_extra = nil +filament_retract_speed = 35 +filament_type = TPU93A +filament_wipe = 0 +first_layer_bed_temperature = 50 +first_layer_temperature = 235 +max_fan_speed = 70 +min_fan_speed = 30 +min_print_speed = 10 +slowdown_below_layer_time = 4 +temperature = 235 + # DeltiQ Printer # @@ -723,7 +754,7 @@ printer_model = printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_TRILAB\nPRINTER_FAMILY_DQ\nPRINTER_MODEL_DQL printer_settings_id = printer_variant = -printer_vendor = TriLAB Group s.r.o. +printer_vendor = TriLAB Group s.r.o. remaining_times = 0 retract_before_travel = 3 retract_before_wipe = 100% @@ -807,7 +838,7 @@ printer_variant = 0.4 max_print_height = 500 [printer:DeltiQ 2 Plus - 0.8 nozzle] -inherits = DeltiQ 2 Plus +inherits = DeltiQ 2 Plus printer_variant = 0.8 max_layer_height = 0.4 min_layer_height = 0.4 From 6efe7e777795fc49f74e538d2f59c3ce9f369a69 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 7 Jan 2021 09:56:43 +0100 Subject: [PATCH 2/6] Fix of #5568 - Unselecting more than 10 copies stops at copy 10 But really bug was: incorrectly interrupted DnD. --- src/slic3r/GUI/GUI_ObjectList.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 78af3ff11c5..3d08b26f12a 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1197,7 +1197,7 @@ void ObjectList::OnBeginDrag(wxDataViewEvent &event) **/ m_prevent_list_events = true;//it's needed for GTK - /* Under GTK, DnD requires to the wxTextDataObject been initialized with some valid value, + /* Under GTK, DnD requires to the wxTextDataObject been initialized with some valid vaSome textlue, * so set some nonempty string */ wxTextDataObject* obj = new wxTextDataObject; @@ -1229,8 +1229,10 @@ void ObjectList::OnDropPossible(wxDataViewEvent &event) { const wxDataViewItem& item = event.GetItem(); - if (!can_drop(item)) + if (!can_drop(item)) { event.Veto(); + m_prevent_list_events = false; + } } void ObjectList::OnDrop(wxDataViewEvent &event) @@ -1255,7 +1257,7 @@ void ObjectList::OnDrop(wxDataViewEvent &event) // It looks like a fixed in current version of the wxWidgets // #ifdef __WXGTK__ // /* Under GTK, DnD moves an item between another two items. -// * And event.GetItem() return item, which is under "insertion line" +// * And event.GetItem() return item, which is under "insertion line"Some text // * So, if we move item down we should to decrease the to_volume_id value // **/ // if (to_volume_id > from_volume_id) to_volume_id--; From 8c8e2b6ddd953770e2e58f7f0591d12a5139d9c8 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 7 Jan 2021 12:26:16 +0100 Subject: [PATCH 3/6] Fix of #5698 - When editing presets, list items are always green even if values have changed compared to preset or defaults --- src/slic3r/GUI/Tab.cpp | 8 ++++---- src/slic3r/GUI/Tab.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 0656c7e0d5d..a0d7d17f2a7 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -501,7 +501,7 @@ void Tab::update_labels_colour() if (opt.first == "bed_shape" || opt.first == "filament_ramming_parameters" || opt.first == "compatible_prints" || opt.first == "compatible_printers" ) { if (m_colored_Label_colors.find(opt.first) != m_colored_Label_colors.end()) - *m_colored_Label_colors.at(opt.first) = *color; + m_colored_Label_colors.at(opt.first) = *color; continue; } @@ -540,7 +540,7 @@ void Tab::decorate() if (opt.first == "bed_shape" || opt.first == "filament_ramming_parameters" || opt.first == "compatible_prints" || opt.first == "compatible_printers") - colored_label_clr = (m_colored_Label_colors.find(opt.first) == m_colored_Label_colors.end()) ? nullptr : m_colored_Label_colors.at(opt.first); + colored_label_clr = (m_colored_Label_colors.find(opt.first) == m_colored_Label_colors.end()) ? nullptr : &m_colored_Label_colors.at(opt.first); if (!colored_label_clr) { field = get_field(opt.first); @@ -3553,8 +3553,8 @@ void Tab::create_line_with_widget(ConfigOptionsGroup* optgroup, const std::strin line.widget = widget; line.label_path = path; - m_colored_Label_colors[opt_key] = &m_default_text_clr; - line.full_Label_color = m_colored_Label_colors[opt_key]; + m_colored_Label_colors[opt_key] = m_default_text_clr; + line.full_Label_color = &m_colored_Label_colors[opt_key]; optgroup->append_line(line); } diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index 04aa9a0ef6f..927787933e3 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -246,7 +246,7 @@ public: // map of option name -> wxColour (color of the colored label, associated with option) // Used for options which don't have corresponded field - std::map m_colored_Label_colors; + std::map m_colored_Label_colors; // Counter for the updating (because of an update() function can have a recursive behavior): // 1. increase value from the very beginning of an update() function From 4275190c11a692d7172b34782f97bd61580c6052 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Thu, 7 Jan 2021 12:54:53 +0100 Subject: [PATCH 4/6] wxWakeUpIdle when render timer ends to ensure idle function spawns and triggers rendering --- src/slic3r/GUI/GLCanvas3D.cpp | 1 + src/slic3r/GUI/NotificationManager.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 71517880a6c..03d6b94ce56 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2996,6 +2996,7 @@ void GLCanvas3D::on_render_timer(wxTimerEvent& evt) } //render(); m_dirty = true; + wxWakeUpIdle(); } void GLCanvas3D::request_extra_frame_delayed(int miliseconds) diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 410990ef723..5695eb62fae 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -1444,7 +1444,7 @@ void NotificationManager::update_notifications() } if (next_render == 0) - wxGetApp().plater()->get_current_canvas3D()->request_extra_frame(); + wxGetApp().plater()->get_current_canvas3D()->request_extra_framee_delayed(33); //few milliseconds to get from GLCanvas::render else if (next_render < max) wxGetApp().plater()->get_current_canvas3D()->request_extra_frame_delayed(int(next_render)); From 02486a0fd97a910dff8eceb8c30b67a75d15ddb7 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Thu, 7 Jan 2021 13:16:23 +0100 Subject: [PATCH 5/6] update notification before erasing finished ones --- src/slic3r/GUI/NotificationManager.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 5695eb62fae..64217ecf0ec 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -1387,15 +1387,19 @@ void NotificationManager::update_notifications() if (!top_level_wnd->IsActive()) return; - static size_t last_size = m_pop_notifications.size(); + //static size_t last_size = m_pop_notifications.size(); + //request frames + int64_t next_render = std::numeric_limits::max(); for (auto it = m_pop_notifications.begin(); it != m_pop_notifications.end();) { std::unique_ptr& notification = *it; + notification->set_paused(m_hovered); + notification->update_state(); + next_render = std::min(next_render, notification->next_render()); if (notification->get_state() == PopNotification::EState::Finished) it = m_pop_notifications.erase(it); else { - notification->set_paused(m_hovered); - notification->update_state(); + ++it; } } @@ -1436,16 +1440,11 @@ void NotificationManager::update_notifications() if (m_requires_render) m_requires_update = true; */ - //request frames - int64_t next_render = std::numeric_limits::max(); - const int64_t max = std::numeric_limits::max(); - for (const std::unique_ptr& notification : m_pop_notifications) { - next_render = std::min(next_render, notification->next_render()); - } + if (next_render == 0) - wxGetApp().plater()->get_current_canvas3D()->request_extra_framee_delayed(33); //few milliseconds to get from GLCanvas::render - else if (next_render < max) + wxGetApp().plater()->get_current_canvas3D()->request_extra_frame_delayed(33); //few milliseconds to get from GLCanvas::render + else if (next_render < std::numeric_limits::max()) wxGetApp().plater()->get_current_canvas3D()->request_extra_frame_delayed(int(next_render)); /* From 5cea1876ce8bae58e2061a564380f177d1459437 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Thu, 7 Jan 2021 13:33:05 +0100 Subject: [PATCH 6/6] request frame with delay when new notification pushed --- src/slic3r/GUI/NotificationManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 64217ecf0ec..98cbf1e550f 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -1233,11 +1233,11 @@ bool NotificationManager::push_notification_data(std::unique_ptractivate_existing(notification.get())) { m_pop_notifications.back()->update(notification->get_data()); - canvas.request_extra_frame(); + canvas.request_extra_frame_delayed(33); return false; } else { m_pop_notifications.emplace_back(std::move(notification)); - canvas.request_extra_frame(); + canvas.request_extra_frame_delayed(33); return true; } }