3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,256 Commits 1 Branch 1 Tag 249 MiB
5f6a8adf7c
Commit Graph

2742 Commits

Author SHA1 Message Date
Lukas Matena
4dae6cbf60 Merge branch 'master' into wipe_tower_improvements 2018-06-26 12:58:04 +02:00
Enrico Turri
bd1d70d8d3 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
bubnikv
59510c42d1 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
Enrico Turri
a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
Enrico Turri
90b0cd5cae Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 11:16:00 +02:00
Enrico Turri
69ff60b557 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 11:15:33 +02:00
bubnikv
1175dc95f6 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
YuSanka
2fae893af2 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
Enrico Turri
ecda2a6140 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 16:09:27 +02:00
YuSanka
f9b85b6700 Correct updating of "Machine limits" and "Single extruder MM setup" pages 2018-06-25 16:03:43 +02:00
Enrico Turri
714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
b6b14ef819 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +02:00
Enrico Turri
7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
YuSanka
515502e685 Fixed #994. 
Print double-type values according to "full" value instead of 2 digits after point
 2018-06-25 13:32:28 +02:00
Enrico Turri
581ed7764c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 13:21:52 +02:00
YuSanka
318212f475 Fixed crashing-bug after language changing (detected under Debug) 2018-06-25 12:27:42 +02:00
YuSanka
362a9d8eda Fixed bug #995 2018-06-25 11:40:40 +02:00
Enrico Turri
789a760fbd Fixed conflict after merge with master 2018-06-25 10:49:30 +02:00
Enrico Turri
8a4a5e487e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri
7d15a15e14 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri
3da21a4ce8 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri
f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
bubnikv
b5f97baa28 Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics 2018-06-22 17:44:12 +02:00
Enrico Turri
ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
YuSanka
54c90ee948 Updated PrintConfig default values for machine limits 
+ fixed incorrect default value setting for the TextCtrl
 2018-06-22 16:13:34 +02:00
Enrico Turri
c948ca647c Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri
2a03b90d2b Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
de540de9aa 5th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 15:11:04 +02:00
bubnikv
082ed95a94 Activate existing projects after loading AMF/3MF/Config: Initial implementation. 2018-06-22 14:17:03 +02:00
Lukas Matena
e2126c2dd6 Dedicated objects are now not ignored 2018-06-22 14:03:34 +02:00
Enrico Turri
f420ced581 Time estimators use initial data from config 2018-06-22 14:01:27 +02:00
YuSanka
3fdefbfbea Added updatin of the "Machine limits" page according to "use silent mode" 2018-06-22 13:01:41 +02:00
Enrico Turri
00ef0610a5 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri
f8982c0ca1 Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
YuSanka
c10e9a6840 Fixed crash-bug when close application after language changing 2018-06-22 12:27:56 +02:00
Enrico Turri
15c69a90ec Changed use of GL_LIGHTING logic and code cleanup 2018-06-22 12:21:43 +02:00
Enrico Turri
ac7d21b50a Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
YuSanka
bfe7896709 Try to fix uncorrect setup on Linux 2018-06-22 10:59:54 +02:00
Enrico Turri
266a4413bd 4th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 09:42:56 +02:00
YuSanka
9ba1af5834 Merge remote-tracking branch 'origin/master' into add_kinematics 2018-06-22 09:22:29 +02:00
Enrico Turri
be52647440 Smaller gizmos icons 2018-06-22 09:00:01 +02:00
Enrico Turri
4ba3cef496 3rd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 08:38:13 +02:00
YuSanka
4454c3437f "Machine limits" page is completed 2018-06-21 16:15:56 +02:00
Enrico Turri
e89083090f Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 16:08:40 +02:00
Enrico Turri
e0db2a925d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 16:08:20 +02:00
Enrico Turri
75cd436ae5 2nd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 15:43:34 +02:00
Lukas Matena
e622401599 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
Enrico Turri
b139f38784 Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 13:03:53 +02:00
Enrico Turri
8194d7713b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 12:21:11 +02:00
Enrico Turri
21e7d379b1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 12:20:52 +02:00
Vojtech Kral
7cf3922707 Http: Fix nowide fstream usage 2018-06-21 12:06:55 +02:00
Enrico Turri
8c40a962fb Shift key to move selected instances together 2018-06-21 11:14:17 +02:00
Enrico Turri
a7e9ec5757 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri
4ee365194a Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Vojtech Kral
9ee10a8779 Octoprint: Fix unicode support 2018-06-21 10:44:29 +02:00
Vojtech Kral
1ba81655e2 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
Lukas Matena
6669357c81 Merge branch 'master' into wipe_tower_improvements 2018-06-21 10:41:01 +02:00
Enrico Turri
80e4155cbc Bed textures selection using config inheritance 2018-06-21 10:24:57 +02:00
Lukas Matena
bc5bd1b42b Assigning of wiping extrusions improved 2018-06-21 10:16:52 +02:00
Enrico Turri
b386f52acc Removed error dialog when texture file does not exist 2018-06-21 09:54:43 +02:00
Enrico Turri
a3d21b6b0e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 08:39:51 +02:00
Enrico Turri
0c24a65039 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 08:39:26 +02:00
Enrico Turri
550f6e307f Faster gizmos update 2018-06-21 08:37:04 +02:00
bubnikv
8abe1b3633 Yet another fix for the OSX. 2018-06-20 19:26:19 +02:00
bubnikv
3a2b501012 Fixed compilation on OSX 2018-06-20 19:07:55 +02:00
bubnikv
ac011aec6d Removed dependencies of libslic3r on Slic3r GUI library. 2018-06-20 18:55:31 +02:00
bubnikv
02d4f3e14d Provide a callback to libslic3r to translate texts. 
Moved the "translate" functions to namespaces to avoid clashes
between the code in libslic3r and Slic3r GUI projects.
 2018-06-20 18:33:46 +02:00
Vojtech Kral
f8bbfad152 avrdude: Line noise prevention on MK3 xflash boot 2018-06-20 17:31:29 +02:00
YuSanka
b6ebbdb94a Updated "Machine limits"(Kinematics) page according to the new config 2018-06-20 16:30:55 +02:00
Enrico Turri
59b6de3d01 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 14:47:23 +02:00
Enrico Turri
4803e7fc84 Fixed crash at startup on OpenGL 1.1 cards 2018-06-20 14:34:20 +02:00
YuSanka
e0bd97ab9c Merge remote-tracking branch 'origin/machine-limits-config' into add_kinematics 2018-06-20 14:26:51 +02:00
YuSanka
fd4feb689e Added prototype for "Kinematics" Page 
+ Added enum_labels to localizations
+ Added bold font for the name of Options Groups
 2018-06-20 14:20:48 +02:00
bubnikv
6b2b970b9a Added machine evelope configuration parameters 
(the MachineEnvelopeConfig class).
Added localization support for libslic3r through a callback
(the callback is not registered yet, so the localization does nothing).
Localized the Print::validate() error messages.
 2018-06-20 13:57:37 +02:00
Lukas Matena
8a47852be2 Refactoring of perimeters/infills wiping (ToolOrdering::WipingExtrusions now takes care of the agenda) 
Squashed commit of the following:

commit 931eb2684103e8571b4a2e9804765fef268361c3
Author: Lukas Matena <lukasmatena@seznam.cz>
Date:   Wed Jun 20 12:50:27 2018 +0200

    ToolOrdering::WipingExtrusions now holds all information necessary for infill/perimeter wiping

commit cc8becfbdd771f7e279434c8bd6be147e4b321ee
Author: Lukas Matena <lukasmatena@seznam.cz>
Date:   Tue Jun 19 10:52:03 2018 +0200

    Wiping is now done as normal print would be (less extra code in process_layer)

commit 1b120754b0691cce46ee5e10f3840480c559ac1f
Author: Lukas Matena <lukasmatena@seznam.cz>
Date:   Fri Jun 15 15:55:15 2018 +0200

    Refactoring: ObjectByExtruder changed so that it is aware of the wiping extrusions

commit 1641e326bb5e0a0c69d6bfc6efa23153dc2e4543
Author: Lukas Matena <lukasmatena@seznam.cz>
Date:   Thu Jun 14 12:22:18 2018 +0200

    Refactoring: new class WipingExtrusion in ToolOrdering.hpp
 2018-06-20 12:52:00 +02:00
Enrico Turri
fa9014fc8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
Vojtech Kral
725b8524f2 avrdude: Fix error handling in arduino, fix various outputs 2018-06-19 18:46:37 +02:00
Vojtech Kral
635bb1e484 Firmware updater: Add support for l10n firmware images 2018-06-19 18:46:37 +02:00
Vojtech Kral
15f943938b avrdude: add file offset to update operation spec, refactoring 2018-06-19 18:46:37 +02:00
bubnikv
7863412687 Firwmare updater for the Einsy external flash memory, 
to be used as a storage for localization strings.

Hacked into the avrdude Arduino STK500 (not STK500v2) protocol.
 2018-06-19 18:46:37 +02:00
Vojtech Kral
5414f7379d FirmwareDialog: Fix progress display 2018-06-19 18:46:37 +02:00
Vojtech Kral
2a07f3a0d5 Firmware updater: Fix filename encoding on Windows 2018-06-19 18:46:37 +02:00
Vojtech Kral
1602ddd56c avrdude: Reduce retries to make timeout time more reasonable 2018-06-19 18:46:37 +02:00
Vojtech Kral
478488972c Updating bugfixes (#973) 
* ConfigWizard: Fix MM legacy profile detect

* Remove Perl BedShapeDialog

* PresetUpdater: Look for updates in resources as well

* ConfigWizard: Startup condition based on printer profiles only rather than all profiles
Previously wizard would not run if there was a leftover filament profile but no printer profiles

* ConfigWizard: Fix button labels

* ConfigWizard: Pick the very first printer variant by default
 2018-06-19 18:26:38 +02:00
bubnikv
27faaa27f6 Merge remote-tracking branch 'remotes/origin/3mf_io' 2018-06-19 16:14:57 +02:00
bubnikv
6fef5a07ab Merge remote-tracking branch 'remotes/origin/scene_manipulators' 
Disabled the gizmos.
 2018-06-19 16:12:36 +02:00
bubnikv
5a56f08aad Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv
734273a33a Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00
Enrico Turri
b9ce19b07c Object updated by rotate gizmo 2018-06-19 09:46:26 +02:00
Enrico Turri
a3949b9f01 Object updated by scale gizmo 2018-06-18 15:07:17 +02:00
Enrico Turri
53f8706805 Rotate gizmo interaction with mouse 2018-06-15 16:16:55 +02:00
Enrico Turri
6874949556 Scale gizmo interaction with mouse 2018-06-15 14:10:28 +02:00
tamasmeszaros
230c681482 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-06-15 11:06:37 +02:00
Enrico Turri
52a7d7ed09 Partial perl code cleanup 2018-06-14 16:09:36 +02:00
Enrico Turri
c624d6bb0a Hover on gizmo grabbers rendering 2018-06-14 15:32:26 +02:00
Enrico Turri
4d405977dd Keep selection when panning/rotating 3D view 2018-06-14 12:34:19 +02:00
Enrico Turri
7fb6e2aa03 Use mipmaps for bed textures 2018-06-14 10:37:28 +02:00
Enrico Turri
bc5640eef4 Rotate gizmo rendering 2018-06-14 10:00:59 +02:00
Enrico Turri
3a19b81cef Scale gizmo rendering 2018-06-13 15:44:04 +02:00
Enrico Turri
099d59ad27 Selection on gizmo overlay 2018-06-13 13:14:17 +02:00
Lukas Matena
29dd305aaa Wiping into perimeters - bugfix (wrong order of perimeters and infills) 2018-06-13 11:48:43 +02:00
Enrico Turri
c657654c02 Hovering on gizmo overlay 2018-06-13 10:49:59 +02:00
Enrico Turri
6079fed951 Fixed compile on Linux 2018-06-13 09:26:58 +02:00
Enrico Turri
b2cf576bf3 1st installment of gizmos 2018-06-13 09:12:16 +02:00
Enrico Turri
0faaef76e8 C++ code cleanup 2018-06-12 12:18:16 +02:00
Enrico Turri
7a08e665bc Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-12 11:56:16 +02:00
Enrico Turri
f8664fce71 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-12 11:55:57 +02:00
bubnikv
303ed0e6c9 Bumped up the version number to a final. 2018-06-12 11:53:09 +02:00
Enrico Turri
64104c8f1f Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-12 11:08:36 +02:00
Enrico Turri
756064810c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-12 11:08:16 +02:00
YuSanka
b134fb8c39 Fixed typo bug 2018-06-12 11:01:14 +02:00
Enrico Turri
af3d07bb05 Attempt to workaround bug in wxWidgets IsShownOnScreen() method 2018-06-12 09:18:25 +02:00
Enrico Turri
ac8004f28e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-12 08:32:55 +02:00
Enrico Turri
5f02669d2d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-12 08:32:34 +02:00
Vojtech Kral
a194d28b14 ConfigWizard: Use scrollbars on smaller screens 2018-06-11 18:52:18 +02:00
Vojtech Kral
7426291e9f PresetUpdater: Fix of the fix 2018-06-11 18:30:40 +02:00
Vojtech Kral
a54e587751 Fix: PresetUpdater: Set bundle & index file permissions #962 (#970) 2018-06-11 17:34:06 +02:00
bubnikv
7b6a0ba9ad Merge remote-tracking branch 'origin/ys_master_bug_fixes' 2018-06-11 16:58:46 +02:00
bubnikv
49cd06407a There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/Slic3r/issues/898 and https://github.com/prusa3d/Slic3r/issues/952. 
The issue apparently manifests when Show()ing a window with overlay scrollbars while the UI is frozen. For this reason,
we will Thaw the UI prematurely on Linux. This means destroing the no_updates object prematurely.
 2018-06-11 16:56:35 +02:00
YuSanka
fba1bf7afc Fixed bug from issue #969 2018-06-11 16:23:10 +02:00
Enrico Turri
44220530cb Use a single gl context created in c++ 2018-06-11 15:49:04 +02:00
Enrico Turri
a02ea39525 GLCanvas3D volumes as a stack variable 2018-06-11 15:13:13 +02:00
Enrico Turri
085110c4d9 Removed 3DScene volumes from perl 2018-06-11 13:48:02 +02:00
Enrico Turri
9a4e250c33 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-11 13:46:55 +02:00
Enrico Turri
efe6a29032 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-11 13:46:35 +02:00
Enrico Turri
7b4870d1cb Fixed selection and rendering in object settings dialog 2018-06-11 11:40:11 +02:00
bubnikv
6cafc7f121 Fix of a regression issue, which was certainly in 1.34.0, probably 
even longer. An infill / perimeter overlap was not applied
when defined with absolute coordinates.
Fixes https://github.com/prusa3d/Slic3r/issues/964
 2018-06-11 10:59:02 +02:00
Enrico Turri
7b1187992c Added bed texture for Prusa printers 2018-06-11 10:46:32 +02:00
Enrico Turri
96d9879d72 class 3D on_select callback moved to c++ 2018-06-08 11:37:07 +02:00
Enrico Turri
bf2fd54578 reload_scene method of 3D class moved to c++ 2018-06-08 09:40:00 +02:00
Enrico Turri
8867e8ca60 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-08 08:31:21 +02:00
Enrico Turri
f4a687703c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-08 08:30:55 +02:00
bubnikv
95047c1953 Fixed typos from the previous commit. 2018-06-07 22:54:26 +02:00
bubnikv
2b5a1f3e60 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2018-06-07 22:10:49 +02:00
bubnikv
7dfe2e2595 Fixed mangling of UTF characters when converted implicitely to 
wxString on Windows through the + operator.
 2018-06-07 22:10:23 +02:00
Lukas Matena
b6455b66bd Wiping into infill/objects - invalidation of the wipe tower, bugfixes 2018-06-07 16:19:57 +02:00
Enrico Turri
766d1d52a9 Fixed import of model rotated clockwise from 3mf 2018-06-07 16:13:32 +02:00
Vojtech Kral
aef0c489e3 Fix: Dialog initialization ordering on OS X 
Perform update_check after MainFrame is created
 2018-06-07 15:41:36 +02:00
Vojtech Kral
2e061994d4 Fix: GCodeSender: Line number resynchronisation 2018-06-07 15:41:34 +02:00
Enrico Turri
a8500d6bae class 3D callbacks moved to c++ 2018-06-07 11:18:28 +02:00
Enrico Turri
ff86407840 Key down and char event handlers of class 3D moved to c++ 2018-06-07 09:22:19 +02:00
Lukas Matena
73452fd79d More progress on 'wipe into dedicated object' feature (e.g. new value in object settings) 2018-06-06 18:24:42 +02:00
bubnikv
ce6a23ef3b Repair by the netfabb service: Implemented progress dialog and cancelation. 2018-06-06 15:19:06 +02:00
Enrico Turri
66b4620d9b Fixed runtime error on Linux when removing canvases 2018-06-06 14:33:04 +02:00
Enrico Turri
8192580b5f Removed DestroyGL method from 3DScene 2018-06-06 14:19:28 +02:00
Enrico Turri
e79037c44d 3DScene member variables moved to c++ 2018-06-06 12:36:52 +02:00
Enrico Turri
71d750c1b8 Remaining time gcode line exported only for Marlin firmware 2018-06-06 12:21:24 +02:00
Enrico Turri
2d34843943 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-06 12:19:12 +02:00
Enrico Turri
2dee4d1a83 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-06 12:18:52 +02:00
Enrico Turri
b2b95d590f Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-06 12:17:16 +02:00
bubnikv
92875709e1 Fixed a bug reporting incorrect compatible_printers and 
compatible_printers_condition inside the Config Bundle.
 2018-06-06 12:01:11 +02:00
Enrico Turri
4009fdcc18 Finalized format for gcode line containing remaining printing time 2018-06-06 11:00:36 +02:00
Enrico Turri
c6e44509e0 3DScene load_object method moved to c++ 2018-06-06 10:16:58 +02:00
Enrico Turri
40bb0b6f55 Fixed overflow in Polygon::area() 2018-06-05 16:07:09 +02:00
Enrico Turri
a8254e0053 Generation of preview paths moved to c++ 2018-06-05 14:09:36 +02:00
Lukas Matena
4830593cac Started to work on the 'wipe into dedicated object feature' 2018-06-05 12:50:34 +02:00
Enrico Turri
f262ec9094 Modified logic to finalize volumes geometry 2018-06-05 12:24:26 +02:00
tamasmeszaros
34c850fa9d initial NFP method with convex polygons working. 2018-06-05 12:02:45 +02:00
Enrico Turri
5392008916 Generation of gcode paths moved to c++ 2018-06-05 10:56:55 +02:00
Enrico Turri
e8b32fa1df Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-05 10:54:35 +02:00
Enrico Turri
fe3f5471e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-05 10:54:25 +02:00
Enrico Turri
1f79713c15 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-05 10:54:15 +02:00
Enrico Turri
489bce5a18 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-05 10:53:20 +02:00
bubnikv
d05d3cb652 Initial working implementation of the "Fix by Netfabb" function. 2018-06-04 21:22:42 +02:00
bubnikv
e65fac5e84 Added initial implementation of fixing 3MFs through the Netfabb 
API provided through the Windows 10 Universal Windows Platform API.
 2018-06-04 17:27:33 +02:00
bubnikv
03518d2ff2 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-04 15:47:51 +02:00
bubnikv
03fea392d5 Merge remote-tracking branch 'remotes/origin/wipe_tower_gcode_preview' 2018-06-04 15:45:10 +02:00
Enrico Turri
d74b85f3fe Another set of 3DScene methods moved to c++ 2018-06-04 15:42:34 +02:00
Enrico Turri
9729c71691 Fixed opengl initialization on linux 2018-06-04 14:38:41 +02:00
Enrico Turri
af8e869880 3rd attempt to fix opengl initialization on linux 2018-06-04 14:28:59 +02:00
Enrico Turri
fa60917580 Fixed Linux compile 2018-06-04 13:18:04 +02:00
Enrico Turri
ac47ba5864 1st attempt to fix opengl initialization on linux 2018-06-04 13:15:28 +02:00
Enrico Turri
adca3035f9 Fixed Linux compile 2018-06-04 12:32:23 +02:00
Enrico Turri
676210d6f4 Fixed typo 2018-06-04 12:30:40 +02:00
Enrico Turri
95e7d96f52 3DScene paint event handler moved to c++ 2018-06-04 12:26:39 +02:00
Enrico Turri
4672a18b49 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-04 12:25:25 +02:00
Enrico Turri
34a944bd1c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-04 12:25:14 +02:00
Enrico Turri
109dde00b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-04 12:25:04 +02:00
Enrico Turri
78c32bdf9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-06-04 12:24:14 +02:00
Lukas Matena
7c9d594ff6 Fixed behaviour of infill wiping for multiple copies of an object 2018-06-04 12:15:59 +02:00
YuSanka
16a5029d58 Fixed issue #875 and updated Slic3rPE.pot 2018-06-04 12:13:07 +02:00
Enrico Turri
8911cf6051 OpenGL info moved to c++ 2018-06-04 10:14:09 +02:00
Enrico Turri
8dc3a73571 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-04 09:29:16 +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
Lukas Matena
bdaa1cbdfd Wiping into infill - no infills are now inadvertedly printed twice (hopefully) 2018-06-01 15:43:22 +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
Lukas Matena
2d24bf5f73 Wipe into infill - copies of one object are properly processed 2018-05-31 16:21:10 +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
Enrico Turri
5a8d1ffdba Prototype for exporting estimated remaining time into gcode for default and silent mode 2018-05-30 12:08:03 +02:00
Lukas Matena
8bdbe41505 Wiping into infill should respect infill_first setting, marking moved to separate function 2018-05-30 11:56:30 +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
549351bbb4 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:32:04 +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
Lukas Matena
c72ecb382d Reduction is now correctly calculated for each region, soluble filament excluded from infill wiping 2018-05-28 15:33:19 +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
Lukas Matena
bfe4350a89 Calculation of wipe tower reduction corrected, new config option (wipe into infill) 2018-05-25 16:11:55 +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
Lukas Matena
132a67edb2 Wipe tower changes to reduce wiping volumes where appropriate 2018-05-24 17:24:37 +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
Lukas Matena
95795f249a First steps in reorganizing infill order (to use infill instead of the wipe tower) 2018-05-24 14:05:51 +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
Lukas Matena
1d1c69f300 Merge branch 'master' into wipe_tower_improvements 2018-05-23 19:34:33 +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
tamasmeszaros
fd829580e9 Working arrange_objects with DJD selection heuristic and a bottom-left placement strategy. 2018-05-17 10:37:26 +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
Lukas Matena
1f62978251 Merge branch 'master' into wipe_tower_improvements 2018-05-15 11:22:58 +02:00
Enrico Turri
75f1f832aa 3DScene bed origin moved to c++ 2018-05-15 11:07:32 +02:00
Enrico Turri
7519e34507 3DScene zoom functions moved to c++ 2018-05-15 10:32:38 +02:00
Enrico Turri
f4303ebdb8 1st attempt of perl callback from c++ for 3DScene 2018-05-15 09:50:01 +02:00
Enrico Turri
0155f4a7f7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 08:41:59 +02:00