Commit Graph

353 Commits

Author SHA1 Message Date
Lukas Matena
ec2d37451b Merge branch 'master' into wipe_tower_improvements 2018-04-24 13:10:33 +02:00
Lukas Matena
8c77b9645c Loading, unloading and cooling reworked, new filament parameters regarding cooling were added 2018-04-24 13:02:08 +02:00
Lukas Matena
d7dc04eb57 Removed parameter filament_cooling_time (fixed value of 14s for now) 2018-04-17 08:18:12 +02:00
Lukas Matena
a154fd34ee Added parameter extra_loading_move, prevented high feedrate moves during loading 2018-04-16 14:26:57 +02:00
bubnikv
eb58e29245 Merge remote-tracking branch 'origin/profile_changes_reset' 2018-04-13 18:31:19 +02:00
YuSanka
215c2082d3 Decorated "bed_shape" and "compatible_printers" labels 2018-04-13 18:22:06 +02:00
bubnikv
913cdef297 Merge remote-tracking branch 'origin/scene_manipulators' 2018-04-13 16:54:22 +02:00
bubnikv
b79692c35e Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-04-13 16:43:35 +02:00
YuSanka
64976c249d Added @bubnikv's changes to BitmapCache 2018-04-13 12:49:12 +02:00
YuSanka
120c1978ae Cleaned code 2018-04-13 12:35:04 +02:00
Enrico Turri
acd8d2df98 Fixed layer height profile editing for multipart objects 2018-04-13 09:01:48 +02:00
YuSanka
d82505984a Rollback changes in BitmapCache 2018-04-12 16:46:17 +02:00
YuSanka
3bc7580e8c Merge remote-tracking branch 'origin/master' into profile_changes_reset 2018-04-12 15:58:46 +02:00
YuSanka
723bd22b96 Changed icons for lock/unlock filament_presets on Plater tab
Experiment with filament_presets transparency on GTK
2018-04-11 15:35:04 +02:00
YuSanka
762306d985 Added preset grouping to all presets ComboBoxes
Changed icons for action_undo, sys_lock and sys_unlock.
There are used same icons for all OS now.

Deleted/Commented temporarily used wxDataViewTreeCtrl
2018-04-11 13:56:37 +02:00
YuSanka
e7520c3d18 Don't use select_preset on OS X 2018-04-10 14:52:03 +02:00
YuSanka
c1d25ba259 Experiments with wxDataViewTreeCtrl 2018-04-10 14:00:48 +02:00
Enrico Turri
e92cf311db Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-04-10 11:46:51 +02:00
Vojtech Kral
a541f5dfe1 Fix of the fix 2018-04-10 11:43:04 +02:00
Lukas Matena
f49a7be90c An attempt to get RammingChart background colour consistent with its parent(s) on all platforms 2018-04-10 10:50:18 +02:00
YuSanka
fa4462514b Added preset grouping to PresetCollection::update_tab_ui 2018-04-10 10:31:58 +02:00
Enrico Turri
30a1fea8a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-04-10 08:52:12 +02:00
YuSanka
0cca7bb5e7 Dont use select_preset from preset_tree... 2018-04-09 17:09:00 +02:00
YuSanka
674ddcd73a Show preset_tree according to preset inheritance 2018-04-09 16:50:17 +02:00
Lukas Matena
bbbb5c9a93 Ramming chart is now drawn with double-buffering 2018-04-09 14:49:32 +02:00
Vojtech Kral
388deb71ab Adapt settings label colors to light vs dark UI themes 2018-04-09 14:46:19 +02:00
YuSanka
affaeef2ab Default presets are visible only if it's selected from Preferences 2018-04-09 12:41:25 +02:00
YuSanka
e33db203d8 Next try to use wxDataViewTreeCtrlComboPopup on macOS and Linux:
Added: m_cc_presets_choice->UseAltPopupWindow();
       m_cc_presets_choice->EnablePopupAnimation(false);
like for wxCheckListBoxComboPopup
2018-04-09 09:55:24 +02:00
bubnikv
601185f113 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-04-06 16:49:59 +02:00
bubnikv
670061ac33 Initial implementation of configuration snapshotting. 2018-04-06 16:49:33 +02:00
YuSanka
004f9ba1e5 Added update_tab_presets functions to m_cc_preset_choise filling 2018-04-06 15:42:52 +02:00
YuSanka
e4b767e840 Experiment with own ComboCtrl for preset_choice. 2018-04-06 13:37:00 +02:00
Lukas Matena
7253028d79 Merge branch 'master' into wipe_tower_improvements 2018-04-06 12:33:12 +02:00
Enrico Turri
b4efff1d95 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-04-06 08:40:38 +02:00
bubnikv
e37cbdfcfc Merge remote-tracking branch 'remotes/origin/profile_changes_reset' 2018-04-05 19:53:53 +02:00
Vojtech Kral
2b8da333ef Semver: Semantic version parsing and arithmetics 2018-04-05 14:22:11 +02:00
YuSanka
6053c8f54d Try to fix bug with CheckBox selection if cursor is in TextCtrl. 2018-04-05 13:52:30 +02:00
Enrico Turri
76beaa6421 Objects colored by extruder color 2018-04-05 12:52:29 +02:00
YuSanka
28b6d222f2 Next try to fix bug with CheckBox selection if cursor is in SpinCtrl. 2018-04-05 12:12:35 +02:00
Lukas Matena
6af45362ce Purging volumes button is only shown when the wipe tower is enabled and we have single extruder MM printer with more than one extruder 2018-04-05 10:44:31 +02:00
YuSanka
2eee3a64b7 First try to fix bug with CheckBox selection if cursor is in SpinCtrl. 2018-04-04 20:37:37 +02:00
Lukas Matena
290e3e66c0 Merge correction 2018-04-04 14:41:23 +02:00
Lukas Matena
eb9917536c Merge branch 'master' into wipe_tower_improvements 2018-04-04 13:06:46 +02:00
Lukas Matena
597e8650a6 Fixed incorrect redraw of Purging volumes button in certain cases 2018-04-04 12:49:16 +02:00
Lukas Matena
1afe0af343 Merge branch 'wipe_tower_ui' into wipe_tower_improvements 2018-04-04 12:28:46 +02:00
Vojtech Kral
b0840065ed Octoprint (#804)
* Octoprint progress dialog

* Fix curl version on Windows
2018-04-04 11:18:22 +02:00
YuSanka
1b08bc94f0 Added g_wiping_dialog_button status update to update_frequently_changed_parameters() 2018-04-04 11:13:28 +02:00
bubnikv
00324a14b8 Merge remote-tracking branch 'origin/scene_manipulators' 2018-04-04 11:06:45 +02:00
bubnikv
261f391ee3 Merge remote-tracking branch 'origin/3mf_io' 2018-04-04 11:05:29 +02:00
bubnikv
2f6fbfb338 Fix of SPE-183: Incorrect z values set into GCode Preview sliders.
Rework to replace layer top heights with averages of EPSILON intervals.
2018-04-04 11:00:25 +02:00