Commit Graph

479 Commits

Author SHA1 Message Date
Vojtech Kral
214ad2925b Merge branch 'master' into updating 2018-04-16 17:32:58 +02:00
Vojtech Kral
7710b541da Merge branch 'config_snapshots' into updating 2018-04-16 17:00:31 +02:00
Vojtech Kral
c733e3151b Updating: Detect legacy datadir, remove conflicting presets 2018-04-16 16:55:24 +02:00
YuSanka
6e870e8466 Merge remote-tracking branch 'origin/cpp_ui_optimization' into profile_changes_reset 2018-04-16 14:30:10 +02:00
YuSanka
5d39126989 Changes to performance. 2018-04-16 13:43:01 +02:00
bubnikv
c18b28e27c Implemented caching of often rendered bitmaps on the Tab UI. 2018-04-16 11:03:08 +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
bubnikv
c5af8bfe78 Merged with Vojtech's branch 2018-04-13 16:19:27 +02:00
bubnikv
6d25ed2b00 Version's compatibility with Slic3r extended with pre-release
compatibility check:
A release Slic3r is not compatible with alpha and beta configs,
a beta Slic3r is not compatible with alpha configs, but is compatible
with beta configs etc.
2018-04-13 16:15:30 +02:00
Vojtech Kral
7dbb2ed6a3 Configuration updates downloading 2018-04-13 15:24:55 +02:00
bubnikv
82890ec815 Removed some obsolete Perl binding.
Added Version Index "version" method.
Implemented automatic selection of default_print_profile and
default_filament_profile, when the print / filament profiles are
not compatible with the selected printer profile.
Fixed selection of a printer profile, if the currently selected
printer profile becomes invisible.
2018-04-13 14:49:33 +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
Vojtech Kral
b49b59cbb2 Configuration update application at startup 2018-04-13 11:04:39 +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
bubnikv
0f6fc689aa Merge remote-tracking branch 'remotes/origin/updating' into config_snapshots 2018-04-12 11:24:48 +02:00
bubnikv
9ab38f416d Improvement of the snapshot dialog, fixed storing of the snapshot "reason"
field.
2018-04-12 11:24:03 +02:00
Vojtech Kral
b030791384 Semver fixes, misc fixes 2018-04-12 09:33:17 +02:00
Vojtech Kral
12b3132b1a Perform init_vendors at startup 2018-04-11 18:05:21 +02:00
Vojtech Kral
31ea03feb0 ConfigWizard: Make bundle installation more intelligent, fixes 2018-04-11 18:05:12 +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
bubnikv
aaa8f133c0 Fixed parsing of the config index. 2018-04-11 15:17:41 +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
bubnikv
da2878958b Wizard runs from the new Config menu,
snapshots could be rolled back / forward.
2018-04-11 12:21:15 +02:00
bubnikv
4275b15dcd Merge remote-tracking branch 'origin/updating' into config_snapshots 2018-04-10 16:46:15 +02:00
bubnikv
0694fad016 Initial implementation of the config snapshot dialog. 2018-04-10 16:27:42 +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
bubnikv
32c4cddb91 Ported the AboutDialog to C++, thanks @alexrj for the work.
New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 17:03:37 +02:00
YuSanka
674ddcd73a Show preset_tree according to preset inheritance 2018-04-09 16:50:17 +02:00
Vojtech Kral
b8a06d728a Fixes in 2DBed 2018-04-09 16:24:34 +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
Vojtech Kral
57f6601c9d ConfigWizard: Fix logo rendering 2018-04-09 11:07:15 +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
Vojtech Kral
90a8ef8e9f Cleanup 2018-04-06 15:17:02 +02:00
YuSanka
e4b767e840 Experiment with own ComboCtrl for preset_choice. 2018-04-06 13:37:00 +02:00
Vojtech Kral
9dcec6662e ConfigWizard: Other vendor sample data, minor fixes 2018-04-06 13:24:02 +02:00
Vojtech Kral
d1c1dcbe8f ConfigWizard: Factor out a PrinterPicker widget, finalize other vendors page 2018-04-06 13:24:02 +02:00
Vojtech Kral
8422cf93c0 ConfigWizard: Finalize custom setup 2018-04-06 13:24:02 +02:00
Vojtech Kral
e53949f2c8 Apply printer model / variant preferences when loading presets 2018-04-06 13:24:02 +02:00
Vojtech Kral
57e47a3296 AppConfig: Support for vendor / model / variant enable state 2018-04-06 13:24:02 +02:00
Vojtech Kral
3fcf194e39 ConfigWizard: Basic structure / WIP 2018-04-06 13:23:49 +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
bubnikv
be8acc5ac4 Moved "wiping_volumes_extruders", "wiping_volumes_matrix" from
print settings to project settings.
2018-04-04 10:18:26 +02:00
YuSanka
d54425a901 Added show/hide of "Purging volumes" button depending on a state of "wipe_tower" 2018-04-03 22:07:59 +02:00
Lukas Matena
6fd3f38717 Warning to show before ramming adjustements, vertical text in wiping dialog positioned better 2018-03-29 14:23:45 +02:00
Lukas Matena
572008546d Vertical label in wiping matrix dialog 2018-03-29 12:04:09 +02:00
Lukas Matena
c73d564004 Merge branch 'wipe_tower_ui' into wipe_tower_improvements 2018-03-29 09:47:12 +02:00
YuSanka
c61ffe9f6b Corrected UI for RammingDialog 2018-03-28 20:31:36 +02:00
Lukas Matena
1b4dc685f4 Connected filament_ramming_parameters to respective dialog, other minor changes 2018-03-28 15:37:10 +02:00
YuSanka
4da6085ef8 Corrected UI for WipingDialog 2018-03-28 02:17:51 +02:00
Lukas Matena
56fef5302c Added axis-labels to RammingChart 2018-03-27 14:42:47 +02:00
Lukas Matena
7d9e892edc Added a button to open purging volumes dialog directly from Plater 2018-03-27 13:44:18 +02:00
Enrico Turri
c166af5cce GCode Preview - Fixed z values set on sliders 2018-03-27 11:35:48 +02:00
YuSanka
e7edb512b8 Saved bed_shape changes.
*code review
2018-03-23 17:27:43 +01:00
YuSanka
77f5ed6851 Fixed bugs from SPE-180 2018-03-23 12:52:37 +01:00
YuSanka
53e100b890 Changed PrusaResearch.ini.
*(Uncommented "printer_model","printer_vendor", "printer_variant", "default_filament_profile")
* Added msg "It's system preset" to Dependencies
2018-03-23 09:41:52 +01:00
Lukas Matena
3fdd182f0c Parameters describing cooling tubes position etc moved to separate page in Printer Settings 2018-03-22 16:13:41 +01:00
YuSanka
08a8fe84a4 Merge remote-tracking branch 'origin/master' into profile_changes_reset 2018-03-22 14:18:48 +01:00
YuSanka
57b61470a3 "Advanced" options alignment 2018-03-22 14:12:29 +01:00
Enrico Turri
4b8bd48663 AMF and 3MF export - Export of print config customizable by user in the select file dialog 2018-03-22 13:49:48 +01:00
Lukas Matena
985b414c64 Removed parameter 'wipe_tower_per_color_wipe' from UI and configuration layer 2018-03-22 13:37:01 +01:00
Lukas Matena
036e41ae69 Wiping dialog - first experiments with sizers 2018-03-22 13:07:45 +01:00
YuSanka
44b711953f Added preset parent description line to Dependencies 2018-03-22 11:46:15 +01:00
YuSanka
d7e2305686 "Undo"-buttons work 2018-03-22 10:56:57 +01:00
YuSanka
78208620c0 Correct updating of "Undo"-buttons according to the option changes 2018-03-22 09:37:42 +01:00
YuSanka
82f4e16a27 "Decorated" UI for options groups.
* Added prototype of undo-buttons for options groups;
* Fixed bugs with "decoration" updating after preset changing;
* Fixed wrong Ukrainian translation.
2018-03-21 22:21:37 +01:00
Lukas Matena
9519fae490 Partial refactoring of wipe tower code (got rid of global constants, etc) 2018-03-21 15:57:17 +01:00
Lukas Matena
e30405d672 Merge branch 'master' into wipe_tower_improvements 2018-03-21 11:33:37 +01:00
Lukas Matena
1a1be94c99 Purging volume parameters normalization - minor changes 2018-03-21 10:20:36 +01:00
Enrico Turri
4a179c81d2 GCode Preview - Added visualization of volumetric flow rate 2018-03-21 10:03:10 +01:00
Lukas Matena
ac9db81820 Normalization of purging volume parameters when number of extruders is changed 2018-03-21 09:36:27 +01:00
Lukas Matena
a782424d5f Wipe tower generator connected to purging volumes from the configuration layer 2018-03-20 15:07:18 +01:00
Lukas Matena
a923062167 Purging volume dialog improved and connected to configuration layer 2018-03-20 13:50:51 +01:00
Enrico Turri
f99aaa1191 Out of bed detection - New colors for out of bed state 2018-03-20 13:01:50 +01:00
Enrico Turri
1f3f109263 Out of bed detection - Fixed false detection due to float precision 2018-03-20 09:31:42 +01:00
Enrico Turri
99f7bd90db Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-03-20 08:33:53 +01:00
YuSanka
f72bb89521 Reset to system value works for Extruders too 2018-03-19 17:21:37 +01:00
Lukas Matena
76b280c64c Removed parameter 'wipe_tower_adhesion', it will always be true 2018-03-19 15:53:49 +01:00
Lukas Matena
349a8a88ae Bug fix: speed for finish_layer was not properly set 2018-03-19 15:35:31 +01:00
Lukas Matena
e41eff9186 Wiping volumes options temporarily added to Print Settings 2018-03-19 15:30:54 +01:00
bubnikv
bfc9678839 why is strlen() defined by different include on different systems? 2018-03-16 19:26:13 +01:00
bubnikv
f353b098e5 Missing include on Linux/GCC 2018-03-16 19:11:08 +01:00
bubnikv
34a0f87395 Fixed the previous commit on Linux: The older GCC we are using
on our Debian build server does not support C++11 <codecvt>,
so the utf8 to utf16 conversion was replaced with Boost counterparts.
2018-03-16 18:56:01 +01:00
bubnikv
0bd9918643 Implements SPE-159 "substitute accented letters with non-accented ones" 2018-03-16 18:20:47 +01:00
YuSanka
7e6887cca8 Completed UI for system value changes 2018-03-16 17:25:11 +01:00
Lukas Matena
3d6f6530c0 Merge branch 'master' into wipe_tower_improvements 2018-03-16 14:06:23 +01:00
Lukas Matena
b556cec42d Got rid of wipe_tower_advanced option 2018-03-16 13:58:58 +01:00
YuSanka
7f5bfe3ddc First visualization of system value changes 2018-03-16 12:56:03 +01:00
Vojtech Kral
c88d2780ce Octoprint (#796)
* Octoprint: GUI for CA file, improvements

* Octoprint: Add GUI for Bonjour lookup, bugfixes

* Octoprint: Bonjour browser: Cleanup Perl interaction

* Octoprint: Bonjour: Perform several broadcast, UI fixes

* Octoprint: Add files to localization list

* Http: Disable CA File setting on SSL backends that don't support it
2018-03-15 18:06:26 +01:00
Lukas Matena
e864238609 Merge branch 'project_specific_config' into wipe_tower_improvements 2018-03-15 14:05:45 +01:00
Lukas Matena
67009d80fd Ramming parameters reduced to one and connected to the wipe tower generator again 2018-03-15 14:04:12 +01:00
YuSanka
d97a8f5740 Merge remote-tracking branch 'origin/master' into profile_changes_reset 2018-03-15 10:24:54 +01:00
YuSanka
c3ec40c3cc Added prototype of an "Undo to system" button 2018-03-15 09:55:31 +01:00
YuSanka
a41e55a773 Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset 2018-03-14 16:34:51 +01:00
bubnikv
757b0788ae Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-03-14 16:16:18 +01:00
bubnikv
ab654f6319 Merge branch 'scene_manipulators' 2018-03-14 16:15:26 +01:00
Lukas Matena
9f18b639a8 Added filament_ramming_parameters and filament_ramming_buttons into configuration layer 2018-03-14 15:48:37 +01:00
YuSanka
639f2bc2f3 Update m_initial_extruders_count after preset changing 2018-03-14 15:38:54 +01:00
YuSanka
15b2522ed9 Update "fill_density" to initial preset value instead of to 40% 2018-03-14 15:10:16 +01:00
bubnikv
56c2267d19 Merge branch 'gui_improvements' 2018-03-14 13:33:53 +01:00
bubnikv
e680658cf5 Fixed selection of sensible active print / filament / printer profile
after the initial wizard run.
2018-03-14 13:29:50 +01:00
bubnikv
1969a8b2c1 Fixed crash on start of the application in case there is no
profile available.
2018-03-14 13:12:17 +01:00
bubnikv
5f28b89ae0 Added a project specific config to the PresetBundle class.
This project specific config will be stored into the config.ini,
into .3mf and .amf and .gcode,
and recover it from the same files.
2018-03-14 11:54:11 +01:00
YuSanka
6d5d38eb6a Fixed bug_2 with update infill parameters 2018-03-14 11:45:31 +01:00
YuSanka
d9e2e37da7 Fixed bug with update infill parameters 2018-03-14 10:14:48 +01:00
YuSanka
30f6e33656 Completed update of frequently changed parameters 2018-03-13 16:14:36 +01:00
Lukas Matena
cf5dfb9673 Started to move ramming dialog into filament settings 2018-03-13 15:54:29 +01:00
bubnikv
729d879b0e Added the Prusa's vendor specific Config Bundle.
Added the "unlocked lock" icon when the system profile gets modified.
2018-03-13 09:45:04 +01:00
YuSanka
5bb736daf2 Infill(Plater) updates with Infill (Print Settings).
*Updated some fuctions
2018-03-12 16:52:21 +01:00
bubnikv
30c859ac7f Added a lock icon to the list of filaments, added some
helper methods to PresetBundle.
2018-03-12 16:04:32 +01:00
Lukas Matena
27ab8ff4e1 Configuration layer changes (cooling_time, bridging, adhesion moved from dedicated dialog to filament/print settings) 2018-03-12 15:41:25 +01:00
YuSanka
e8adbd7303 First prototype of adding of UI for frequently changed parameters 2018-03-09 18:34:30 +01:00
YuSanka
d5e136a6d5 Fixed bug with updating of the value of "Wipe while retracting" CheckBox. 2018-03-09 17:17:51 +01:00
bubnikv
f55becd43c Introduced the system profiles.
The Config Wizard now just copies the Vendor's Config Bundle
into user_dir/vendor/ directory and Slic3r uses the configs
from the bundles found in user_dir/vendor directly.
2018-03-09 16:37:33 +01:00
Lukas Matena
1c6fa6660e Merge branch 'master' into wipe_tower_improvements 2018-03-09 15:10:15 +01:00
Enrico Turri
50d74dfd20 Out of bed detection - Fixed compile on MacOS 2018-03-09 14:50:25 +01:00