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

3154 Commits

Author SHA1 Message Date
tamasmeszaros
3c32a7c3db Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-06 12:41:09 +02:00
tamasmeszaros
db8762a93c bed shape detection works and circle shaped bed now supported with limited arrange quality. 2018-08-06 11:30:10 +02:00
bubnikv
ea163edc41 Deregister the update callback on end of the application. 
This fixes a crash on exit.
 2018-08-05 23:36:25 +02:00
bubnikv
c13cd284e4 Fix of a regression bug: Update the print bed texture when switching 
between printer profiles.
 2018-08-05 22:52:38 +02:00
bubnikv
71b1e09af9 T1 and M702 C are now evaluated by the time estimator to add the new 
"filament_load_time" and "filament_unload_time" values to match
the MK3 MMU2 behavior.

Emitting of the remaining times into the output G-code was made optional
through a new "remaining_times" configuration value, so the firmware
flavors and versions, which do not know the M73 code, will not complain.

Configuration changes:

The wipe tower default position was shifted inwards after the wipe tower
coordinate reference point was changed from the center to the left front
corner.

Added the "filament_load_time" and "filament_unload_time" values
to the MK3 MMU filament profiles.

Enabled "remaining_times" for the MK2.5, MK3 and MK3MMU2 printers.
 2018-08-04 17:38:25 +02:00
bubnikv
ac2b20b54b Merge branch 'master' into time_estimate 2018-08-03 23:04:44 +02:00
bubnikv
73ad49b9ae Merge remote-tracking branch 'origin/lm_minimal_purging_on_wt' 2018-08-03 22:55:08 +02:00
bubnikv
02d6d04185 Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d' 2018-08-03 22:38:44 +02:00
bubnikv
6a9bd540c1 Merge remote-tracking branch 'origin/lm_wipe_tower_block_improvements_merged' 2018-08-03 22:34:53 +02:00
bubnikv
0454adc194 Added support for the upstream Marlin interpretation of the M204 code. 
Fix of https://github.com/prusa3d/Slic3r/issues/1089

M204 S.. T..:
T is interpreted by the firmware and Slic3r time estimator the old way
(as acceleration when retracting) only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.

M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.

This change is in sync with the Prusa3D firmware:
dd4c4b39b4

Slic3r will now export
M204 P[machine_max_acceleration_extruding] R[machine_max_acceleration_retracting] T[machine_max_acceleration_extruding]
before the custom start G-code, which will be correctly interpreted
by both the new Prusa3D firmware and the Slic3r's time estimator.

To support our legacy MK2 firmware before we merge the commit above, we may
just insert the following line into the custom start G-code section to override
the block inserted by Slic3r automatically before the custom start G-code:
M204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]
 2018-08-03 16:26:28 +02:00
YuSanka
d4c69a6258 Tabs are completed 2018-08-03 16:21:05 +02:00
Lukas Matena
2fe26bfac7 Changed color of preliminary wipe tower block 2018-08-03 15:36:47 +02:00
tamasmeszaros
8da8ecb415 Bed shape detection in progress 2018-08-03 14:49:26 +02:00
YuSanka
38b06bb22e Merge remote-tracking branch 'origin/SLA' into SLA_ui 2018-08-03 14:41:08 +02:00
YuSanka
c30813d9a8 Added "inside tab" for SLA printer 2018-08-03 14:34:52 +02:00
bubnikv
f65aadebef Corrected initialization of the SLA presets with their default values. 2018-08-03 14:14:25 +02:00
YuSanka
cce0e9e501 First prototype for "SLA materials" Tab 2018-08-03 13:04:41 +02:00
tamasmeszaros
e7e212cb52 Added a spatial index to speed up alignment score calculation. 2018-08-03 12:37:27 +02:00
tamasmeszaros
8e516bc3e4 reduce accuracy to acceptable performance 2018-08-02 19:25:19 +02:00
tamasmeszaros
9172a69e27 Nlopt build fix 2018-08-02 19:17:27 +02:00
tamasmeszaros
588456a5d9 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-02 17:51:47 +02:00
tamasmeszaros
c8370b5408 New approach to big items with calculating the best alignment with other big items. 2018-08-02 17:51:11 +02:00
Lukas Matena
cc24861042 Added a threshold for purging on the wipe tower (before it goes into infill/sacrificial object) 2018-08-02 15:14:12 +02:00
Lukas Matena
751fe864e2 Bugfix: priming lines for MM print were shown in preview even when disabled 2018-08-02 14:04:50 +02:00
Lukas Matena
f694600054 Merge branch 'lm_wipe_tower_block_improvements' into lm_wipe_tower_block_improvements_merged 2018-08-02 13:29:39 +02:00
tamasmeszaros
66d1eb9b9d Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-02 13:16:11 +02:00
tamasmeszaros
a7ba51bd11 Fixing the "last item doesn't fit" problem. 2018-08-02 13:15:30 +02:00
Lukas Matena
7683870350 New perl callback to force reloading of 3d scene after Purging volumes are changed 
After the changes in previous commit, the 3D scene must be reloaded after the wipe tower
is invalidated. This can mostly be done on the C++ side, but reloading after Purging volumes
are changed required this C++ -> Perl call
 2018-08-02 11:04:47 +02:00
Lukas Matena
d5f042b4b8 Wipe tower postprocessing, wipe tower block on 3D plate improved. 
- it renders red with one egde as indeterminate, the front edge is where the wipe tower will start
- changing width changes depth of the block (as requested)
- the block shows the brim of the wipe tower
- after slicing, the block is rendered in usual dark green and takes the exact shape of the tower (also with brim)
- moving or rotationg the block after slicing does not invalidate the wipe tower (and hence the exact block dimensions are preserved)
- changing anything that invalidates the wipe tower reverts the block back to the "indeterminate" shape
- the block is not shown after slicing, if the wipe tower is not actually generated (printing single color object with the wipe tower enabled)

This required changes in the wipe tower generator, which now generates the tower
at origin with no rotation. Resulting gcode is postprocessed and transformed during
gcode export. This means the wipe tower needs not be invalidated when it is moved or rotated.
 2018-08-02 11:04:04 +02:00
YuSanka
6fb4ced410 Fix for previous commit 2018-08-01 15:54:56 +02:00
YuSanka
ed5f5239aa Added tooltips for objects list 
Updated icons with transparency
 2018-08-01 14:17:31 +02:00
bubnikv
a76cb3bd67 Merge remote-tracking branch 'remotes/origin/wipe_tower_no_priming' 2018-08-01 13:16:49 +02:00
bubnikv
3e2aedaaf0 Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88' 2018-08-01 13:16:30 +02:00
bubnikv
884f1ff4c0 Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88' into SLA 2018-08-01 13:09:05 +02:00
Vojtech Kral
675e4cfd24 FirmwareDialog: Fix dialog resizing 2018-08-01 12:18:19 +02:00
Vojtech Kral
b6d70f5fe8 FirmwareDialog: UI improvements, bugfixes 2018-08-01 12:18:19 +02:00
bubnikv
4e193555ae Adding the SLA printer profiles, WIP 2018-08-01 11:09:51 +02:00
Enrico Turri
c9d23d0ac0 Font for warning texture set to bold 2018-07-31 15:32:16 +02:00
Enrico Turri
e7cc3c5f4a Code cleanup 2018-07-31 15:31:24 +02:00
YuSanka
19411df0e4 Correct split for the parts too 2018-07-31 15:31:12 +02:00
bubnikv
f0c1c15b62 Integration of SLA parameters, WIP 2018-07-31 15:09:57 +02:00
Enrico Turri
a03d5178eb Legend texture use square power of two image 2018-07-31 14:32:59 +02:00
Enrico Turri
e234973ab4 Warning texture use square power of two image and bigger font size 2018-07-31 14:20:16 +02:00
Enrico Turri
1c0fa19824 3D scene toolbar uses a single texture 2018-07-31 12:25:00 +02:00
YuSanka
128d0f7708 Correct object splitting to parts (sub-objects) 2018-07-31 12:04:01 +02:00
YuSanka
14c9ff174d Add variable name to tooltips 2018-07-31 10:42:37 +02:00
bubnikv
fa6a72ab2d Changed the filament_load_time / filament_unload_time defaults to zero. 2018-07-31 09:46:39 +02:00
bubnikv
f49f871992 Added filament_load_time and filament_unload_time parameters 
to define the filament load / unload times spent in the MMU2.0 unit
when performing the tool change code (the T code).
 2018-07-31 09:44:29 +02:00
Enrico Turri
55e7a1af46 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-31 08:34:34 +02:00
YuSanka
814d255c77 Added split-function for the object in list. 
Updated adding of amf-objects.
 2018-07-30 17:03:14 +02:00
tamasmeszaros
6cdec7ac9a Prepare integration for arbitrary shaped print beds. 2018-07-30 16:41:35 +02:00
tamasmeszaros
d136d61edd linest2d ready for arbitrary shaped beds. 2018-07-30 15:16:44 +02:00
YuSanka
2142070331 Fixed Linux-bug : "Add part" => segmentation fault. 
Deleted experimental code
 2018-07-30 14:25:09 +02:00
Enrico Turri
2f7876b852 Fixed camera jump after object rotate 2018-07-30 13:57:05 +02:00
YuSanka
085ae68e6d +1 experiment 2018-07-30 13:19:31 +02:00
YuSanka
460021f7d0 EXPERIMENTS for Linux 2018-07-30 12:17:32 +02:00
Enrico Turri
8e433c32bf Time estimator: added placeholder to process gcode lines T 2018-07-30 12:08:26 +02:00
Enrico Turri
df201d65f4 Minimum z of object to lay on the bed after rotations. Fixes #1093 2018-07-30 11:38:36 +02:00
YuSanka
b6d1d10502 Added updating for the Z_rotation after object selection changing 2018-07-30 10:48:40 +02:00
Enrico Turri
3f6d3b903d Fixed rotation of 3D view camera after change of bed data 2018-07-30 10:35:08 +02:00
Enrico Turri
11b0325c66 Fixed calculation of bed origin in bed shape dialog 2018-07-30 10:03:17 +02:00
Enrico Turri
1882cd41a4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-30 09:10:15 +02:00
Enrico Turri
bf4871d7f8 Improved remove hovering on objects when mouse leaves 3D scene 2018-07-30 09:09:14 +02:00
Enrico Turri
22f02acc3d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-30 08:33:28 +02:00
YuSanka
c2993de6e0 Scale and rotation from scene to value updates correctly 2018-07-29 21:42:57 +02:00
bubnikv
4778312fa5 Merge branch 'master' into wipe_tower_no_priming 2018-07-27 23:26:10 +02:00
bubnikv
4a88075334 Updated change log for the Prusa3D config index, 
bumped up the version to 1.41.0-alpha3
 2018-07-27 22:31:24 +02:00
bubnikv
db8ba5fb76 New parameter "single_extruder_multi_material_priming" to be able 
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
 2018-07-27 22:19:46 +02:00
tamasmeszaros
4e901a9db7 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-27 17:46:19 +02:00
tamasmeszaros
f364bd1884 New object function considering item size categories (big and small) 2018-07-27 17:31:30 +02:00
YuSanka
54f14e7ebb +1 message 2018-07-27 16:55:42 +02:00
YuSanka
c2e09b5bcb Added "printf"s to find of an crashing place 2018-07-27 15:57:53 +02:00
Enrico Turri
e1a13e9f08 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-27 15:19:42 +02:00
Vojtech Kral
81a229045a avrdude: Fix: Stray winsock usage on Windows 2018-07-27 15:10:44 +02:00
Enrico Turri
39c326ebae Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-27 14:41:05 +02:00
Enrico Turri
c64cba8ec2 A few fixes on 3D scene toolbar 2018-07-27 14:38:19 +02:00
Vojtech Kral
a9aca4426c Fix: port friendly name encoding 2018-07-27 13:27:52 +02:00
Vojtech Kral
f729ab4b12 Fix: Race conditions 2018-07-27 13:27:52 +02:00
Vojtech Kral
a32bd17b75 FirmwareUpdater: MMU 2.0 / Caterina flashing 2018-07-27 13:27:52 +02:00
Vojtech Kral
a7eaf38853 Utils: Serial port printer communication abstraction 2018-07-27 13:27:52 +02:00
Vojtech Kral
3c2170acf8 avrdude: Standalone binary 2018-07-27 13:27:52 +02:00
Vojtech Kral
6b801f250a avrdude: use sections instead of offsets 2018-07-27 13:27:52 +02:00
tamasmeszaros
84f97e1f64 Improved libnest2d caching 2018-07-27 12:28:14 +02:00
YuSanka
575b85bfd6 Try to fix correct extruder updating on all OS 2018-07-27 12:26:14 +02:00
Enrico Turri
590773d77b Fixed conflict after merge with master 2018-07-27 12:15:35 +02:00
Enrico Turri
ddda5062c2 3D scene toolbar actions 2018-07-27 12:08:33 +02:00
YuSanka
1148c8c018 Experiment on OSX to understand events order 2018-07-27 10:52:16 +02:00
YuSanka
f7c0303acf Fixed wrong drawing of the object additional settings 2018-07-27 10:42:54 +02:00
bubnikv
987fc4c6df Merge remote-tracking branch 'origin/backspace_to_delete_on_osx' 2018-07-27 09:55:13 +02:00
bubnikv
5c1de9fdd5 Merge remote-tracking branch 'origin/scene_manipulators' 2018-07-27 09:54:39 +02:00
bubnikv
c2291e54f4 Fixes crash when loading a config with zero number of default_filament_profile 
values. Fixes SPE-427
 2018-07-27 09:53:12 +02:00
Enrico Turri
3a1ec8285e Reddish background when detected out of print volume toolpaths 2018-07-27 09:38:39 +02:00
Enrico Turri
c2ab8c2ae3 Out of print volume detection for extrusion toolpaths only 2018-07-27 08:49:58 +02:00
YuSanka
c19fe985e8 Del information msg 2018-07-26 17:22:10 +02:00
YuSanka
36e8544df2 Added DATAVIEW_ITEM_VALUE_CHANGED event for Linux and OSX 2018-07-26 16:51:18 +02:00
YuSanka
ca1a11742b After merging bug fixes 2018-07-26 15:47:18 +02:00
Enrico Turri
b5b7894a6f Fixed color of all toolpaths when detected as out of print bed volume 2018-07-26 13:12:09 +02:00
tamasmeszaros
c430f57187 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-26 12:58:52 +02:00
tamasmeszaros
629108265b Fix for SPE-421 and emergency fix for SPE-422 (needs further investigation) 2018-07-26 12:57:47 +02:00
Enrico Turri
dd014136b0 Remove hovering on objects when mouse leaves 3D scene 2018-07-26 12:51:31 +02:00
Enrico Turri
828d3ddabc Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-26 12:46:59 +02:00
YuSanka
e0bb6bafd5 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-07-26 11:27:25 +02:00
YuSanka
da18e25dfb Added callback for 3dScene updating after extruder changing 2018-07-26 10:59:03 +02:00
YuSanka
ef0d667d6c Extruder updating 2018-07-25 17:48:15 +02:00
tamasmeszaros
93ae3a0f1a Flip Y changed back to BOTTOM_LEFT 
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
 2018-07-25 17:27:02 +02:00
YuSanka
ac9ba61f06 Correct updating for settings list of the object/part 2018-07-25 16:14:28 +02:00
Enrico Turri
efbc1cce25 Fixed rotate gizmo update with multimaterial objects 2018-07-25 11:49:38 +02:00
Enrico Turri
93a05c4946 Use wxWidgets tooltip for 3D scene toolbar 2018-07-25 10:01:17 +02:00
Enrico Turri
dd724e9dab M73 lines emitted to gcode only for Marlin firmare. Fixes #1071 2018-07-25 09:19:20 +02:00
Enrico Turri
2107ea7702 Fixed selection of multimaterial objects 2018-07-25 08:40:34 +02:00
Enrico Turri
23e51cd941 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-25 08:35:13 +02:00
Enrico Turri
496a83bb28 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-25 08:35:05 +02:00
YuSanka
60224415de Prototype for adding object/part settings to panel 2018-07-24 18:39:40 +02:00
Enrico Turri
d8f5daf345 Fixed selection of object modified by gizmo 2018-07-24 15:32:44 +02:00
Vojtech Kral
b49bfadd87 PresetUpdater: Fail harder on bundle version not present in index 2018-07-24 15:29:37 +02:00
Enrico Turri
d4adcd4077 Out of print volume detection for toolpaths 2018-07-24 13:39:17 +02:00
Enrico Turri
4db75d08a9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 12:29:43 +02:00
Lukas Matena
21a59ce710 Shifted the MM priming lines inside a bit (for the out-of-bed detection) 2018-07-24 12:17:26 +02:00
YuSanka
97a25cf608 Work with model objects like reference (from/to perl side) 2018-07-24 12:15:36 +02:00
Lukas Matena
c5448514ac Fixed an issue with MM and supports layering 2018-07-24 11:20:29 +02:00
Enrico Turri
8bf3e63f75 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
Enrico Turri
bbe5586c15 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-24 10:03:45 +02:00
YuSanka
36f8050d7b Added popup menu with multiple choice of settings 2018-07-23 17:35:50 +02:00
Enrico Turri
cac4b29153 Fixed crash when generating gcode of multimaterial objects with some object out of the bed 2018-07-23 15:58:08 +02:00
YuSanka
dd088ba0cc Localized the (modified) profile indicator 2018-07-23 15:44:01 +02:00
Vojtech Kral
1842520ea6 ConfigWizard: Fix: Don't check the default printer if the wizard is requested by user or re-configure 2018-07-23 15:04:21 +02:00
Vojtech Kral
3e65b4410b PresetUpdater: Fix reloading of profiles after reconfigure and update 
Fix #1060
Fix #985
 2018-07-23 15:02:13 +02:00
Enrico Turri
1c6d3c9c69 Added xml escape characters detection when exporting object and volumes names to 3mf files 2018-07-23 14:39:50 +02:00
Enrico Turri
4294510ed7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-23 13:56:26 +02:00
Enrico Turri
0bd8affab9 Attempt to fix #1067 2018-07-23 13:54:43 +02:00
Enrico Turri
c68bcb9e60 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
Vojtech Kral
1c58c3e153 PresetUpdater: Fix incompatible bundle requirements display 2018-07-23 12:34:07 +02:00
Vojtech Kral
abe7a71f85 ConfigWizard: Wrap printer model titles 2018-07-23 11:43:06 +02:00
Enrico Turri
33175a02f3 Added xml escape characters detection when exporting object and columes names to amf files 2018-07-23 10:58:39 +02:00
Enrico Turri
df36de0d35 Fixed status of Slice now and Export G-Code buttons after object import 2018-07-23 10:16:56 +02:00
YuSanka
ee4f2cf549 Try to fix #977 2018-07-23 09:59:04 +02:00
bubnikv
68cd51435f Bumped up the version number. 2018-07-21 17:39:26 +02:00
bubnikv
88bf7c852c Fixed upgrade of vendor profile from the application resources 
after an upgrade of the application.
 2018-07-21 09:32:45 +02:00
bubnikv
e19a74865b Bumped up the version number. 2018-07-20 17:57:21 +02:00
Lukas Matena
167060e470 Added some profilling macros into GCodeTimeEstimator 2018-07-20 16:14:23 +02:00
Enrico Turri
95bd2bb8f9 Faster time estimate for multimaterial 2018-07-20 15:54:11 +02:00
Enrico Turri
4b8e10a05c Slightly faster time estimation 2018-07-20 12:05:08 +02:00
Enrico Turri
c1d1721dae Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-20 10:31:53 +02:00
tamasmeszaros
ed0f073ef3 Small objects can now fit inside free space surrounded by objects. 2018-07-20 09:01:24 +02:00
Enrico Turri
aaa592bab9 Another fix in gizmos update 2018-07-19 16:06:46 +02:00
Enrico Turri
feb0f76279 Better fix for gizmo update when deleting objects 2018-07-19 13:43:33 +02:00
Enrico Turri
63fe2a9fb9 Warning and legend textures moved from _3DScene class to GLCanvas3D class 2018-07-19 13:18:19 +02:00
Enrico Turri
5ff26bce50 Fixed update of gizmo when deleting all objects 2018-07-19 11:39:51 +02:00
Enrico Turri
678be2b317 Fixed update of rotate gizmo when selecting objects 2018-07-19 11:24:04 +02:00
Enrico Turri
7b551171e8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-19 08:31:59 +02:00
tamasmeszaros
170034dd15 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-18 16:45:20 +02:00
tamasmeszaros
1745e5cff9 Small objects can now fit inside free space surrounded by objects. 2018-07-18 16:37:44 +02:00
Enrico Turri
7f267987cb Code cleanup 2018-07-18 15:52:20 +02:00
Enrico Turri
be7b786fee Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:11:23 +02:00
Enrico Turri
13ced87089 Fixed depth test when rendering the picking texture 2018-07-18 15:09:26 +02:00
bubnikv
b57418f81d Reordered the fields on the new "Machine limits" page. 2018-07-18 15:08:55 +02:00
Enrico Turri
4579b71a66 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:07:56 +02:00
Enrico Turri
3fac0d92cd Unified opengl textures 2018-07-18 15:07:52 +02:00
Enrico Turri
c1dc46bb8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:19 +02:00
Enrico Turri
b69e23ce73 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:09 +02:00
Enrico Turri
6f18e58d13 Fixed compile on Linux and Mac 2018-07-18 14:38:02 +02:00
Enrico Turri
d805c8ac3b Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
bubnikv
f7390c7ad6 The acceleration G-codes (M204 Sxxx) emited for Marlin are now 
clamped by the maximum acceleration when extruding.

The machine envelope values are only set at the time estimator
from the Printer parameters for the Marlin firmware.
 2018-07-18 14:00:42 +02:00
bubnikv
17df029c9d Fixed a previous commit. 2018-07-18 12:04:56 +02:00
bubnikv
b6fe90cbdc Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-07-18 11:58:19 +02:00
bubnikv
9d027a558e Implemented clamping of the acceleration when extruding for the Marlin 
firmware, both for the G-code export and the time estimator.
 2018-07-18 11:58:02 +02:00
Lukas Matena
51b6557ada Merge branch 'master' into wipe_tower_improvements 2018-07-18 11:06:37 +02:00
Lukas Matena
eb6936888e Filament following a soluble one must be wiped on the wipe tower 2018-07-18 11:05:39 +02:00
tamasmeszaros
eeeced1d6b Merge newest master 2018-07-18 10:26:03 +02:00
tamasmeszaros
9559ad77e5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
tamasmeszaros
b82bc5feba Rasterizer fix to flip Y axis if it's coordinate origin is in the TOP_LEFT corner. 2018-07-18 09:46:55 +02:00
Enrico Turri
d672a69554 Slice only objects contained into the print volume 2018-07-18 09:37:25 +02:00
bubnikv
c596c05765 With the Marlin flavor, a "machine envelope limits" G-code section 
is emitted, which breaks some of the automatic tests.

Changed the default firmware flavor to RepRap,
so that the automatic tests will run.
 2018-07-17 20:37:15 +02:00
bubnikv
36c1483ec5 Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d' 2018-07-17 19:42:02 +02:00
bubnikv
0660862058 For the Marlin firmware, the machine envelope G-code is emitted 
based on the Slic3r printer profile.

Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.

Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
 2018-07-17 19:37:24 +02:00
tamasmeszaros
f54fd553fe Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-17 16:36:59 +02:00
tamasmeszaros
50424e33c6 Safety check for firstfit for larger objects than the print bed. 2018-07-17 16:35:48 +02:00
tamasmeszaros
86ba75d692 New objectfunction that makes a proper circle shaped pile on arrange. 2018-07-17 12:04:06 +02:00
Enrico Turri
08529189c9 Changed time estimator default values 2018-07-17 10:50:15 +02:00
Enrico Turri
c9827bb4cf Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-17 10:46:34 +02:00
Enrico Turri
5c90746914 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
bubnikv
c34a713c8c Simplification of 
1.40.1-rc2 fails to save the modified AMF settings #1035
 2018-07-17 10:41:17 +02:00
bubnikv
161a2bc6f8 Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf' 2018-07-17 09:47:49 +02:00
bubnikv
3339623db6 Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx' 2018-07-17 09:40:19 +02:00
bubnikv
83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
bubnikv
c7f59aca7d Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-07-17 09:20:19 +02:00
Enrico Turri
8175c9d306 Merge with master 2018-07-17 08:54:17 +02:00
bubnikv
210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
tamasmeszaros
266ff2ad93 Build fix for linux 2018-07-16 16:37:14 +02:00
tamasmeszaros
6bcd735655 Change to firstfit selection because DJD needs further testing. 2018-07-16 16:07:29 +02:00
Lukas Matena
3dfd6e64d9 Enabled inflill/object wiping for the first layer 2018-07-13 13:16:38 +02:00
Lukas Matena
9966f8d88d Respect perimeter-infill order for purging only objects 2018-07-13 11:53:50 +02:00
Enrico Turri
75cf4e0947 Generate M73 lines for silent mode only for MK3 printers 2018-07-13 11:32:50 +02:00
tamasmeszaros
eefa1678db Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-13 11:28:02 +02:00
tamasmeszaros
256d44cc43 Disabling reverse order checks in DJD selection. It causes unacceptable running times for large number of objects. 2018-07-13 11:26:59 +02:00
Lukas Matena
103c7eda8a Trying to make sure infill_first (or otherwise) is respected 2018-07-13 11:25:22 +02:00
Enrico Turri
0f5ce827a1 Rotate gizmo radius changed only when moving one of multiple instances 2018-07-12 15:19:43 +02:00
Enrico Turri
3839d26e9b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 15:17:08 +02:00
Enrico Turri
b2d9877cd5 Fixed crash on MAC when selecting system info 2018-07-12 13:34:39 +02:00
Enrico Turri
76d4b9dbb8 Attempt to fix SPE-352 2018-07-12 13:10:18 +02:00
Enrico Turri
63ab713585 Added debug output to investigate SPE-352 2018-07-12 12:15:30 +02:00
Enrico Turri
0e9ac1679f Keep fixed radius of rotate gizmo 2018-07-12 11:26:13 +02:00
Enrico Turri
b6e55a521e Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:42:08 +02:00
Enrico Turri
a8691bc083 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:32:42 +02:00
Enrico Turri
1356a9977e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-12 08:32:18 +02:00
Lukas Matena
1a2223a0a5 WipingExtrusions functions now don't need a reference to LayerTools 2018-07-11 14:46:13 +02:00
Lukas Matena
2454c566ff Changing number of copies invalidates the wipe tower (and thus forces recalculation of the purging extrusions) 2018-07-10 15:39:47 +02:00
Lukas Matena
e44480d61f Supports were printed twice if synchronized with object layers, added always-on settings in ObjectSettingDialog 2018-07-10 13:02:43 +02:00
YuSanka
a6b1e8466d Added popupmenu for add_settings 2018-07-09 16:42:31 +02:00
Lukas Matena
4c823b840f Fix of previous commit 2018-07-09 14:43:32 +02:00
Lukas Matena
bb80774e74 Infill purging - added fifth extruder into default setttings, cosmetic changes 2018-07-09 13:44:41 +02:00
YuSanka
fcc781195b Added updating of the is_external value for edited_preset after loading preset from (.ini, .gcode, .amf, .3mf etc) 2018-07-09 12:10:57 +02:00
Lukas Matena
92d36df903 Merge branch 'master' into wipe_tower_improvements 2018-07-09 09:28:26 +02:00
bubnikv
fa86d776cb Bumped up the version number to final. 2018-07-05 15:27:48 +02:00
YuSanka
182e4232b2 Added error icon before object if errors auto-repaire was detected 
+ Added size object updating (in the object setting panel)
 2018-07-04 16:32:01 +02:00
YuSanka
60f703e7c7 Added function for the sidetext changing 
+ some code reorganization
 2018-07-04 14:52:36 +02:00
tamasmeszaros
b26d1ef5bf Some comments 2018-07-04 14:36:14 +02:00
tamasmeszaros
0b914c5ea3 Customized object function for arrange algorithm to arrange into a circle. 
Now we optimize for smallest diameter of the circle around the arranged pile of items. This implies that we can forget about pack efficiency but the result will be better for the heat characteristics of the print bed.
 2018-07-04 14:11:21 +02:00
YuSanka
38768a7bda Replaced Object list before Object(Part) Settings 2018-07-04 12:38:34 +02:00
tamasmeszaros
4b9a504c04 Solution for SPE-347 (scale is not fed into the arrange alg) 2018-07-04 11:19:11 +02:00
tamasmeszaros
a5d6064ad6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-04 10:26:04 +02:00
tamasmeszaros
fa7ca09e57 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-04 10:22:49 +02:00
tamasmeszaros
d337fec8af Proper fix for SPE-324 2018-07-04 10:21:44 +02:00
YuSanka
54298c8e61 First right-panel reorganization: 
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
 2018-07-04 09:03:43 +02:00
tamasmeszaros
28bc54e5b7 Patch from Lubomír for CLI parameters 2018-07-03 17:59:49 +02:00
bubnikv
bdc9b9dadd Bumped up the version number. 2018-07-03 16:46:52 +02:00
tamasmeszaros
f3591d2a85 Libnest2D test fix 2018-07-03 16:39:13 +02:00
tamasmeszaros
b4666e8174 Tryfix for Mac build... 2018-07-03 16:18:35 +02:00
tamasmeszaros
16ec625483 Eliminating signed comp warning 2018-07-03 15:09:12 +02:00
tamasmeszaros
c73f702922 Filtering invalid geometries as per: SPE-337 2018-07-03 14:58:49 +02:00
tamasmeszaros
99f2d40b53 Remove progress indicators for individual threads. 2018-07-03 13:58:35 +02:00
tamasmeszaros
797c812f31 Stop the ongoing slicing process when attempting to export. 2018-07-03 13:12:15 +02:00
bubnikv
e61b25de7c Merge branch 'master' into amf_activate_existing_presets 2018-07-03 13:04:11 +02:00
tamasmeszaros
033b7eb8ad Removing progress indicators for individual threads. 2018-07-03 12:43:17 +02:00
YuSanka
b682fb1829 Enabled "delete preset" button after current profile saving 2018-07-03 12:19:34 +02:00
tamasmeszaros
f00c17b959 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-03 11:40:35 +02:00
tamasmeszaros
10b19c8604 fix for progressindicator not being destroyed after export to png 2018-07-03 11:40:02 +02:00
tamasmeszaros
9beb767830 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-03 10:23:33 +02:00
tamasmeszaros
27b0926c19 Localization for app controller. 2018-07-03 10:22:55 +02:00
bubnikv
c7f3014d26 Fix of 
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
 2018-07-02 20:25:37 +02:00
Vojtech Kral
617b5158bd Fix: Leak in Tab.cpp in serial port test 2018-07-02 19:00:36 +02:00
tamasmeszaros
ec571aec44 Scale correction revert in case of exception. 2018-07-02 16:36:30 +02:00
tamasmeszaros
478dd2a93f Proper localization of AppController 2018-07-02 16:15:21 +02:00
tamasmeszaros
4f27f6c6dc Fixing crash on linux. Exporting png in the UI thread. 2018-07-02 14:50:54 +02:00
YuSanka
07b28b2a8c Bug-fixes of the OSX crashing 2018-07-02 13:51:50 +02:00
tamasmeszaros
ddb4945586 Fix crash on Linux when arranging 2018-07-02 11:22:47 +02:00
tamasmeszaros
86726b15b4 Pull build fixes from libnest2d and allow reverse order checks in DJD placement for better quality results. 2018-07-02 10:45:06 +02:00
tamasmeszaros
6ffdea1457 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-06-29 17:46:55 +02:00
tamasmeszaros
952068f282 Autocenter finally disabled. Progress indication works. 2018-06-29 17:46:21 +02:00
YuSanka
678498bed6 Typo fixed 2018-06-29 14:00:22 +02:00
YuSanka
f8ab8b43de Experiment with Toolpits of selected preset on OSX 2018-06-29 13:07:58 +02:00
Lukas Matena
5bf795ec6f Overriddable infills that were not overridden are now printed according to infill_first 2018-06-29 12:26:22 +02:00
YuSanka
16e42b0226 Added tooltips for selected Preset 2018-06-29 11:29:23 +02:00
bubnikv
d4b0d1b773 bumped up the version number 2018-06-29 10:59:58 +02:00
bubnikv
6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
bubnikv
082f88ad5f gcc / clang did not like backslashes inside comments 2018-06-28 21:46:23 +02:00
bubnikv
26b003073b 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
tamasmeszaros
d3b19382fe AppController reachable trough Plater.pm 2018-06-28 19:16:36 +02:00
tamasmeszaros
85474e5803 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-28 18:50:39 +02:00
tamasmeszaros
ad4d95f60c AppController integration 2018-06-28 18:47:18 +02:00
YuSanka
2cbf5b75db Final Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce Code cleaning 2018-06-28 18:14:34 +02:00
YuSanka
896d898124 Resizing panel to 1 px 2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7 Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0 And last try.. 2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8 Addition to last commit 2018-06-28 16:50:06 +02:00
tamasmeszaros
5446b9f1e5 Incorporating performance optimizations from libnest2d 2018-06-28 16:14:17 +02:00
YuSanka
0b1833a2af Try to fix tooltips on OSX 2018-06-28 16:01:06 +02:00
bubnikv
aae6cfc696 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
Enrico Turri
dc25df7b32 Faster remaining times export 2018-06-28 13:57:28 +02:00
bubnikv
acd712cdbc Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
tamasmeszaros
18bfe4f2dc ExpTime incorporated. Some refactor as welll. 2018-06-28 13:21:24 +02:00
YuSanka
5605835ba9 Use silent_mode only with MK3 printer 2018-06-28 12:40:27 +02:00
Lukas Matena
19f5863d75 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
Enrico Turri
7d61b2076f Faster remaining time calculation 2018-06-28 09:24:07 +02:00
Enrico Turri
9725966f38 Time estimate uses G1 lines containing E parameter for remaining time calculations 2018-06-28 08:52:07 +02:00
tamasmeszaros
8497289650 Execution abstraction and build fix for linux and mac 2018-06-27 18:23:53 +02:00
tamasmeszaros
d337b69407 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 17:44:33 +02:00
tamasmeszaros
ac9d81cfa0 Refactor and extensions to png export dialog. 2018-06-27 17:43:54 +02:00
Vojtech Kral
5787c495d6 Octoprint: Improve error reporting 2018-06-27 17:00:20 +02:00
bubnikv
80b430ad94 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
Lukas Matena
bb288f2a1b Fixed a crash when complete_objects was turned on 2018-06-27 15:49:02 +02:00
Enrico Turri
7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
de28d4edeb Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 15:32:47 +02:00
Enrico Turri
3dba0be81e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Lukas Matena
54bd0af905 Infill wiping turned off by default and in some automatic tests 2018-06-27 15:07:37 +02:00
Lukas Matena
c11a163e08 Correct extruder is used for dontcare extrusions 2018-06-27 14:08:46 +02:00
Vojtech Kral
930a2f1d12 Fix: Http: Body size limit not properly initialized 2018-06-27 13:57:21 +02:00
Vojtech Kral
6706c3b71f ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 13:57:21 +02:00
Vojtech Kral
e00125d866 PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 13:57:21 +02:00
Vojtech Kral
3229574a39 ConfigWizard: Fix default printer selection 2018-06-27 13:57:21 +02:00
Enrico Turri
d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Chow Loong Jin
8eb8a8b1f6 Fix format-security violation with croak 
Missed one in https://github.com/prusa3d/slic3r/pull/802.
 2018-06-27 13:54:07 +02:00
Enrico Turri
48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
06f44a9e4b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
23d10fdadc 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
Enrico Turri
5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
tamasmeszaros
30e177d986 PngExportDialog fix on Windows 2018-06-27 11:21:14 +02:00
tamasmeszaros
a9e2950ad0 PngExportDialog size fix on Linux 2018-06-27 11:13:40 +02:00
bubnikv
68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
tamasmeszaros
8eb8d4f0c5 Patch from Lubomír Bláha applied. Polished comments and PngExportDialog. 2018-06-27 10:28:44 +02:00
tamasmeszaros
c28b602465 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
Lukas Matena
fe0f0fe6af Merge branch 'master' into wipe_tower_improvements 2018-06-27 08:56:08 +02:00
Enrico Turri
dc223066d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
db95460154 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
tamasmeszaros
d2c6190cc5 Comments and refactoring 2018-06-26 17:02:46 +02:00
tamasmeszaros
df625a0c4b File saving to new file fixed. 2018-06-26 16:08:58 +02:00
tamasmeszaros
ae682b9cd3 Export dialog ready 2018-06-26 15:53:43 +02:00
Lukas Matena
f8388abe17 'Dontcare' extrusions now don't force a toolchange + code reorganization 2018-06-26 14:12:25 +02:00
YuSanka
c1724f45c9 Fixed post-merge bugs 2018-06-26 13:34:25 +02:00
bubnikv
22463343a7 Fixed integration tests. 2018-06-26 13:22:24 +02:00
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
YuSanka
0371f368a4 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
3efe6675cb Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-25 17:14:29 +02:00
tamasmeszaros
99f6866a1d Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png 
# Conflicts:
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppController.hpp
 2018-06-25 17:13: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
tamasmeszaros
f26cb9ebd6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-25 13:24:37 +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
Tamás Mészáros
6737506b14 Separating wx and the app controller. 2018-06-25 12:40:01 +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