Commit Graph

2338 Commits

Author SHA1 Message Date
Enrico Turri
8911cf6051 OpenGL info moved to c++ 2018-06-04 10:14:09 +02:00
Enrico Turri
ac3408a4ab Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-04 09:29:07 +02:00
Enrico Turri
7d56b38e40 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-04 09:28:55 +02:00
Enrico Turri
2e710289eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-04 09:28:05 +02:00
Enrico Turri
56f0c8fe93 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-04 09:25:12 +02:00
Enrico Turri
dab2652cb5 Fixed preference dialog behavior 2018-06-04 09:24:48 +02:00
Vojtech Kral
4df0b94b79 Beta bugfixes (#931)
* Fix: Function signature in avrdude

* Fix: Remove mockup vendor bundles

* Fix: Make ConfigWizard error handling more friendly

* Fix: Opening the datadir in AppImage-based Slic3r
2018-06-04 09:07:29 +02:00
Enrico Turri
364134515b Refactoring and cleanup 2018-06-01 15:54:41 +02:00
Enrico Turri
2bccb43122 Attempt to fix 3DScene key event on Linux 2018-06-01 09:18:10 +02:00
Enrico Turri
94d608c6c1 3DScene mouse event handler move to c++ completed 2018-06-01 09:00:30 +02:00
Enrico Turri
6bf009edee 3DScene mouse event handler partially moved to c++ - part 2 2018-05-31 16:04:59 +02:00
Enrico Turri
276533e236 3DScene mouse event handler partially moved to c++ 2018-05-31 13:51:50 +02:00
Enrico Turri
cf8e7475ca Removed unused methods from 3DScene 2018-05-31 08:44:39 +02:00
Enrico Turri
30a3b2179b 3DScene timer and _variable_layer_thickness_action method moved to c++ 2018-05-30 15:18:45 +02:00
Lukas Matena
db22b2f504 Bugfix: first color of the wipe tower preview was incorrect with some models 2018-05-30 11:02:00 +02:00
Enrico Turri
2f773a89df 3DScene set_viewport_from_scene method moved to c++ 2018-05-29 15:36:09 +02:00
Lukas Matena
b95a6f2626 Fix of previous commit 2018-05-29 15:29:20 +02:00
Enrico Turri
df14a3c399 3DScene update_volumes_colors_by_extruder method moved to c++ 2018-05-29 15:07:06 +02:00
Enrico Turri
5ee5465f94 3DScene mark_volumes_for_layer_height method moved to c++ 2018-05-29 14:34:45 +02:00
Enrico Turri
c3b1eca2c7 Fixed a crash 2018-05-29 14:09:02 +02:00
Enrico Turri
ece27ac6f8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-29 13:56:53 +02:00
Enrico Turri
5c745485e1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-29 13:56:41 +02:00
Enrico Turri
38d0c964d8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-05-29 13:55:46 +02:00
Enrico Turri
363a964ebb 3DScene render method partially moved to c++ 2018-05-29 13:54:34 +02:00
Lukas Matena
cb5f5c65b0 Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width) 2018-05-29 12:41:40 +02:00
Lukas Matena
e4aff5b08a Feedrate on the first layer of the wipe tower properly set (bugfix) 2018-05-29 09:07:23 +02:00
Enrico Turri
db260a669c 3DScene mouse wheel event moved to c++ 2018-05-28 15:23:01 +02:00
Enrico Turri
aacdcd4add 3DScene layers editing mouse containment methods moved to c++ 2018-05-28 14:39:59 +02:00
Enrico Turri
994222c317 3DScene _first_selected_object_id_for_variable_layer_height_editing method moved to c++ 2018-05-28 14:10:02 +02:00
Enrico Turri
951e8528b4 3DScene layers editing parameters moved to c++ 2018-05-28 13:43:29 +02:00
Enrico Turri
a8311bd1bd 3DScene layer_editing_allowed method moved to c++ 2018-05-25 16:28:24 +02:00
Enrico Turri
c51ce63b9b 3DScene layer editing overlay completely moved to c++ 2018-05-25 15:56:14 +02:00
Enrico Turri
455076231b Layers editing shader moved to c++ 2018-05-25 14:05:08 +02:00
Enrico Turri
bdbc86167c 3DScene volume selection methods moved to c++ 2018-05-25 09:03:55 +02:00
Enrico Turri
c2e38fc6fe Fixed compile on Linux 2018-05-24 15:22:53 +02:00
Enrico Turri
70664122af 3DScene layer height profile rendering moved to c++ 2018-05-24 15:17:01 +02:00
Enrico Turri
f31c55ceed 3DScene layer editing overlay textures rendering moved to c++ 2018-05-24 13:46:17 +02:00
Enrico Turri
157a34bcd9 AMF I/O - Automatic detection if open file is zip archive or xml format 2018-05-24 09:57:12 +02:00
Enrico Turri
751b41b94b 3DScene picking pass moved to c++ 2018-05-23 15:35:11 +02:00
Enrico Turri
6519b1dde8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-23 15:33:48 +02:00
Enrico Turri
486180c422 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 15:33:25 +02:00
Enrico Turri
90c50b281a 3DScene mouse variables moved to c++ 2018-05-23 13:56:54 +02:00
bubnikv
a9499ae45c Fix of a crash intruduced with e8247c5646 2018-05-23 13:19:25 +02:00
Enrico Turri
91b9b8aebf Fixed wrong layer height texture updates when using multiple objects 2018-05-23 12:49:56 +02:00
Enrico Turri
b36243ba10 Objects rendering moved to c++ 2018-05-23 11:14:49 +02:00
Enrico Turri
b4beb7aae9 3DScene plain shader moved to c++ 2018-05-23 09:57:44 +02:00
Enrico Turri
37ab7594fc Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 08:38:29 +02:00
bubnikv
076b293fec Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself. 2018-05-22 15:18:38 +02:00
Enrico Turri
85b6784dcb Merge with master 2018-05-22 15:03:40 +02:00
Vojtech Kral
360b34944d ErrorDialog: Fix size and message encoding 2018-05-22 14:33:37 +02:00
bubnikv
306d77559e Merge remote-tracking branch 'remotes/origin/scene_manipulators' 2018-05-22 14:32:07 +02:00
bubnikv
e8247c5646 When loading a config bundle, make sure a config value is not accepted
if it is placed in a wrong group (for example, max_print_height
does not belong to print settings, but a printer settings, so Slic3r
will now complain about it being in print settings, and it will
remove the value from the print settings).
2018-05-22 14:17:27 +02:00
Enrico Turri
ae394ca97d Fixed remember output directory default value set to true 2018-05-22 13:57:28 +02:00
Enrico Turri
4e29147756 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 11:48:45 +02:00
bubnikv
eef1d500ec Merge remote-tracking branch 'remotes/origin/brim_width_calculation' 2018-05-22 11:08:37 +02:00
Lukas Matena
e2f44a231e A fix to use correct spacing with multiloop skirts 2018-05-22 10:50:38 +02:00
Enrico Turri
451c58d58f 3DScene's enable_picking variable moved to c++ 2018-05-22 09:02:42 +02:00
Enrico Turri
59af3fb866 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
bubnikv
b694f1ac89 One day I will fix it! 2018-05-21 23:40:17 +02:00
bubnikv
512b6dfd88 Yet another fix of the previous commit. 2018-05-21 23:24:18 +02:00
bubnikv
6b4fe7975f Fix of the previous commit: When asking the operating system to open
the datadir using the platform specific file explorer, enquote
and escape the path.
2018-05-21 22:10:38 +02:00
bubnikv
7b4aeef40c Moved the "Flash firmware" menu to "Configuration",
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
2018-05-21 21:04:03 +02:00
Vojtech Kral
5697754c5e avrdude: Fix exit hook not being adapted properly 2018-05-21 18:59:15 +02:00
Vojtech Kral
ee5a5df2a7 Serial port friendly name on Linux 2018-05-21 18:59:13 +02:00
bubnikv
3307dbc0fb Another fix for linux & osx 2018-05-21 18:58:22 +02:00
bubnikv
1e8a0b69b2 Yet another fix for OSX 2018-05-21 18:58:22 +02:00
bubnikv
0a328789ef Fixed compilation on Linux. 2018-05-21 18:58:22 +02:00
bubnikv
8917f18ef1 Fix of previous commit, fix of compilation on OSX. 2018-05-21 18:58:22 +02:00
bubnikv
d4e939fd04 Serial port fix, get description for serial ports on OSX. 2018-05-21 18:58:22 +02:00
bubnikv
33f21422e6 Added friendly names to serial ports, added automatic selection of Prusa's printers in the firmware updater dialog 2018-05-21 18:58:22 +02:00
Vojtech Kral
7f8265e2be FirmwareDialog: Fix log clearing 2018-05-21 18:58:22 +02:00
Vojtech Kral
a43e72f696 Firmware updater: rework cancelling 2018-05-21 18:58:22 +02:00
bubnikv
4f4649d046 avrdude: Fix serial I/O timeout on Windows 2018-05-21 18:58:22 +02:00
Vojtech Kral
4723a99b15 FirmwareDialog: Fix dialog sizing 2018-05-21 18:58:22 +02:00
Vojtech Kral
e1930d57f3 Firmware updater: Disable dictionary flashing menu entry for the time being 2018-05-21 18:58:22 +02:00
Vojtech Kral
fd00ea0ca7 Firmware updater: Add cancelation 2018-05-21 18:58:22 +02:00
Vojtech Kral
98ae20c3df Firmware updater: Perform work in a background thread 2018-05-21 18:58:22 +02:00
Vojtech Kral
a54672fb54 Firmware updater: Make the GUI less scary 2018-05-21 18:58:22 +02:00
Vojtech Kral
c5f1acfbfb FirmwareUpdater: Disable dialog close while flashing 2018-05-21 18:58:22 +02:00
Vojtech Kral
fe21ca5510 avrdude: Build fixes 2018-05-21 18:58:22 +02:00
Vojtech Kral
404fdbcfdf avrdude: Fixes in error handling 2018-05-21 18:58:22 +02:00
Vojtech Kral
97b3c38148 avrdude: Fix h_addr 2018-05-21 18:58:22 +02:00
Vojtech Kral
839c0451f7 avrdude: Fix PATH_MAX 2018-05-21 18:58:22 +02:00
Vojtech Kral
4ac17daad2 avrdude: Use C99, fix alloca include in stk500 2018-05-21 18:58:22 +02:00
Vojtech Kral
af360d7097 Firmware updater GUI 2018-05-21 18:58:22 +02:00
Vojtech Kral
3d09f2a980 avrdude: bugfixes 2018-05-21 18:58:22 +02:00
Vojtech Kral
07817c8ee5 avrdude: Compilation on Windows/MSVC 2018-05-21 18:58:22 +02:00
Vojtech Kral
53b42bf921 CMake: Fix C compiler warning about C++ flags 2018-05-21 18:58:22 +02:00
Vojtech Kral
11a00b025f avrdude integration basics (WIP) 2018-05-21 18:58:20 +02:00
Vojtech Kral
1caeab913b avrdude base 2018-05-21 18:55:03 +02:00
Enrico Turri
ae53c7cb2e Volumes rendering moved to c++ 2018-05-21 15:57:03 +02:00
Enrico Turri
0f035d0bae Background rendering moved to c++ 2018-05-21 15:24:52 +02:00
Enrico Turri
bf7b9eb3e7 Legend texture moved to c++ 2018-05-21 14:57:43 +02:00
Enrico Turri
3fdc5e20a7 Warning texture moved to c++ 2018-05-21 14:40:09 +02:00
YuSanka
c4478ccffa Fixed wrong updating of the options group tree 2018-05-21 14:36:09 +02:00
Enrico Turri
7cff6ef6db Shaders loaded from files 2018-05-21 13:08:02 +02:00
Enrico Turri
3fb96ff636 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 13:06:16 +02:00
Enrico Turri
308a0b5709 Remember output directory default value set to true 2018-05-21 11:50:48 +02:00
Enrico Turri
3291cbfdad Fix of #889 2018-05-21 11:19:03 +02:00
Enrico Turri
01b6bc1dc8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-21 08:38:05 +02:00
Enrico Turri
05dcda8ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 08:37:53 +02:00
YuSanka
deabeaaa7f Aligned frequently changing parameters according to presets settings on the Plater tab.
Fixed missing adding of the Filaments preset settings(for multy material case) to the right_panel
2018-05-20 23:58:09 +02:00
Vojtech Kral
fd43e53aeb PresetUpdater: Add some more logging 2018-05-18 14:59:24 +02:00
Enrico Turri
a7fc57a176 3DScene reset_object method moved to c++ 2018-05-18 14:08:59 +02:00
Enrico Turri
5fc8fdee11 3DScene axes moved to c++ 2018-05-18 13:02:47 +02:00
Lukas Matena
99293011e6 Corrected brim generation (width), enabling continuity with skirt 2018-05-18 12:19:54 +02:00
Enrico Turri
1e0a8de5b1 3DScene cutting plane moved to c++ 2018-05-18 11:05:48 +02:00
Enrico Turri
0584990b65 Fixed z layers indices under 3D preview sliders 2018-05-18 10:14:47 +02:00
Enrico Turri
5224acad59 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 09:55:30 +02:00
Enrico Turri
6c6b8ccc42 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 09:55:21 +02:00
bubnikv
3f08ef70f1 Fix of extraneous infill over thin walls.
Fixes https://github.com/prusa3d/Slic3r/issues/670
and some of https://github.com/prusa3d/Slic3r/issues/895

PerimeterGenerator was using an unsafe clipper offset function,
which performed offset for both a contour and its holes together.
With this commit the offsets were replaced with their safe counterparts,
though these safe counterparts may be somehow slower
(performing offset on ExPolygon or ExPolygons, piece by piece).

Also there was a bug, where if the infill & gap fill consumed
everything of the polygon, a polygon one onion shell above was still
used for infill.
2018-05-18 09:52:09 +02:00
Enrico Turri
f34250ea6a Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 09:29:14 +02:00
Enrico Turri
255bec7432 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 09:29:05 +02:00
bubnikv
651c4ab0ae Fixed a typo in AppConfig 2018-05-18 08:46:33 +02:00
Enrico Turri
d56b543ff8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-18 08:32:19 +02:00
Enrico Turri
d85fd5501c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 08:32:09 +02:00
bubnikv
19221b749c Fix of https://github.com/prusa3d/Slic3r/issues/869 2018-05-18 08:21:24 +02:00
Vojtech Kral
5fd2164612 ConfigWizard: Fix incorrent wizard run after a language change 2018-05-17 17:19:33 +02:00
Vojtech Kral
e783e00578 AppConfig: Remember previous Slic3r version 2018-05-17 16:19:58 +02:00
Enrico Turri
7ca9f46b9c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 14:43:27 +02:00
Enrico Turri
f26bce2538 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 14:43:18 +02:00
bubnikv
37c498d6dc Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-17 14:09:08 +02:00
bubnikv
35bf4aee7d Fixed loading of configuraton values octoprint_host, support_material_threshold
They were incorrectly handled by the handle_legacy() function, which has been
ported from the upstream Slic3r without inspecting its content.
2018-05-17 14:08:50 +02:00
Vojtech Kral
96c7c4a58b PresetUpdater: Remove obsolete presets 2018-05-17 13:48:11 +02:00
Enrico Turri
15f35a9e9e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 12:12:27 +02:00
Enrico Turri
74b0ed4b23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 12:12:18 +02:00
Lukas Matena
d98dec3a7c Merge branch 'gcode_preview_dropdown_ui' 2018-05-17 11:22:38 +02:00
bubnikv
c5dc47c647 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-17 10:30:24 +02:00
bubnikv
e3d84407e0 Fix of https://github.com/prusa3d/Slic3r/issues/896
Fixed a bug in parsering a Point from a config file.
2018-05-17 10:30:20 +02:00
Lukas Matena
6f792b7ffb Horrible workaround to make the gcode preview dropdown (show feature types) work on all platforms 2018-05-17 10:23:02 +02:00
Enrico Turri
24b5d61eb3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 09:53:46 +02:00
Enrico Turri
4a4f4db6a5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 09:53:36 +02:00
Enrico Turri
e13564cb19 Fixed shell visualization in g-code preview 2018-05-17 09:50:40 +02:00
Enrico Turri
7a6d83e7eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 08:33:32 +02:00
Enrico Turri
853ebf6ad2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 08:33:16 +02:00
bubnikv
e329f6f5f2 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-16 16:34:19 +02:00
bubnikv
687c91d6e9 Parsing of obsolete presets from Config Bundle to remove them
from user's profile when upgrading to a new configuration structure.
2018-05-16 16:34:07 +02:00
YuSanka
b8fe48c563 Modification of the AboutDialog to be correct showing on dark theme of Linux 2018-05-16 13:56:03 +02:00
Vojtech Kral
a97226ae54 PresetUpdater: Fix: Don't offer updates on legacy datadir 2018-05-16 10:15:05 +02:00
bubnikv
5c44453ced Fixed loading of configuration files after reverting to a snapshot
storing the old configuration format.
2018-05-16 10:11:00 +02:00
Enrico Turri
41c51d7614 3DScene's char event handler moved to c++ 2018-05-15 16:09:04 +02:00
Enrico Turri
2b4829a4b9 3DScene bed variables moved to c++ 2018-05-15 15:38:25 +02:00
bubnikv
4b87f71bbc Fix of the previous commmit. gcc and clang rightfully complained about a typo. 2018-05-15 14:20:32 +02:00
bubnikv
868b400120 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-15 14:04:49 +02:00
bubnikv
7645e9cb7a Added layer_num, layer_z variables to the end_gcode, end_filament_gcode,
added min(.,.), max(.,.) functions to the placeholder parser syntax.
2018-05-15 14:04:29 +02:00
Enrico Turri
c60bf694ef Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 12:22:44 +02:00
Enrico Turri
43784f3409 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-15 12:22:35 +02:00
Enrico Turri
a612b5b648 Replacement of xml escape characters when exporting to amf 2018-05-15 12:19:43 +02:00
Enrico Turri
f0d1888ca9 3DScene select_view() function moved to c++ 2018-05-15 11:30:11 +02:00
Enrico Turri
75f1f832aa 3DScene bed origin moved to c++ 2018-05-15 11:07:32 +02:00