Commit Graph

5810 Commits

Author SHA1 Message Date
fe83aa8653 Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
e03b4f9a63 gcc / clang did not like backslashes inside comments 2018-06-28 21:46:23 +02:00
f9e159bdd2 Renamed the "compatible_printers_condition" and "inherits" vectors
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.

Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +02:00
b4b7904b39 Final Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 18:30:22 +02:00
68fd52678b Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
5607c9340b Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
d41ab5b173 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
cc42c8acb6 Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
3a3c54fcf0 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2018-06-28 13:53:22 +02:00
69e8c564ce Wipe tower fix - incorrect start/end position reported to the GCode generator when the tower was rotated 2018-06-28 10:22:04 +02:00
a9a33ed384 Octoprint: Improve error reporting 2018-06-27 17:00:20 +02:00
41586b7276 Simplified handling of the "compatible_printers_condition" and
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
2018-06-27 16:57:42 +02:00
59bca108d3 Fix: Http: Body size limit not properly initialized 2018-06-27 13:57:21 +02:00
80b8be31f7 ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 13:57:21 +02:00
c7b2c5359f PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 13:57:21 +02:00
aee0fd089b ConfigWizard: Fix default printer selection 2018-06-27 13:57:21 +02:00
8afaa3ee26 Fix format-security violation with croak
Missed one in https://github.com/prusa3d/slic3r/pull/802.
2018-06-27 13:54:07 +02:00
5bd0f6ab2b Code cleanup 2018-06-27 12:49:38 +02:00
c2256b2faa 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
1a5593ff10 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
537033462d 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
f6cc6e859a Fix: Http: Body size limit not properly initialized 2018-06-27 10:36:19 +02:00
b2d1255e44 ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 10:36:19 +02:00
963632ad65 PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 10:36:19 +02:00
e8dc96a06d ConfigWizard: Fix default printer selection 2018-06-27 10:36:19 +02:00
3c0e7b82ff Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
f4ee973ab7 When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe
Do some magic to get the perl interpreter path.
2018-06-26 15:29:23 +02:00
2e4ec6a72c Fixed integration tests. 2018-06-26 13:22:24 +02:00
5b32d61a69 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
f1a0aa2ca1 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +02:00
48e2828c6c When loading an archive (AMF/3MF/Config), the original name
of the profile is show in braces next to the file name.
2018-06-26 11:31:01 +02:00
f37b831c51 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-26 11:18:55 +02:00
d9088b7ad7 Updated POT-file 2018-06-26 11:17:40 +02:00
5a52f0b773 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
d157831afb Storing and recovering the "compatible_printers_condition"
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
2018-06-26 10:50:50 +02:00
57e83dcbc8 Fixed #998
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
2018-06-26 10:37:36 +02:00
fab492e951 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
1e946f3952 Fixed #994.
Print double-type values according to "full" value instead of 2 digits after point
2018-06-25 13:32:28 +02:00
9175163078 Fixed crashing-bug after language changing (detected under Debug) 2018-06-25 12:27:42 +02:00
6a66d81e76 Fixed bug #995 2018-06-25 11:40:40 +02:00
df781d0c00 Fix of #999 2018-06-25 08:48:36 +02:00
13d59bca12 Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
604098be0f Activate existing projects after loading AMF/3MF/Config: Initial implementation. 2018-06-22 14:17:03 +02:00
13711a878b Wipe tower bugfix - the tower was printed incorrectly when the rotation angle was close to 90 degrees 2018-06-21 14:05:07 +02:00
d075429fd0 Http: Fix nowide fstream usage 2018-06-21 12:06:55 +02:00
cac8ec7351 Octoprint: Fix unicode support 2018-06-21 10:44:29 +02:00
88e400a0c0 Octoprint: Add a dialog for setting the filename/path
and a "print now" option
cf. #880, #245, #55, #87
2018-06-21 10:44:29 +02:00
6580dae24e Force update when changing selected printer using the GUI 2018-06-21 10:43:01 +02:00
18af0552c8 Bed textures selection using config inheritance 2018-06-21 10:24:57 +02:00
eedad95f72 Removed error dialog when texture file does not exist 2018-06-21 09:54:43 +02:00