Lukas Matena
db9580f40b
Merge branch 'master' into lm_lay_flat_round_merged_facets
2018-08-17 15:45:02 +02:00
Lukas Matena
72ba5c8ab4
Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets
2018-08-17 15:44:50 +02:00
Lukas Matena
3433e8e374
Fixed a few tooltips, changed default value for minimal purge on wipe tower
2018-08-17 15:42:46 +02:00
Lukas Matena
f9efcc36b6
Lay flat gizmo improvements - merge adjacent faces, compute and cache convex hull for entire ModelObject, refresh when moved, etc.
2018-08-17 15:40:47 +02:00
Vojtech Kral
7be24414f3
Build: Option to force generation of PDB file on MSVC Release build
2018-08-17 15:20:58 +02:00
Vojtech Kral
267712eb32
Build: Plumb perl include path
...
Thanks to @kortschak for contributing to this fix
Co-authored-by: Dan Kortschak <dan@kortschak.io>
2018-08-17 15:20:58 +02:00
Lukas Matena
48b9793d3d
Templated convex_hull function in Geometry.cpp
2018-08-17 15:20:35 +02:00
tamasmeszaros
776f555790
wall generation with different top and bottom plates.
2018-08-17 15:11:30 +02:00
bubnikv
1ba64da3fe
Removed Point::scale(),translate(),coincides_with(),distance_to(),
...
distance_to_squared(),perp_distance_to(),negative(),vector_to(),
translate(), distance_to() etc,
replaced with the Eigen equivalents.
2018-08-17 14:14:24 +02:00
tamasmeszaros
1878c79ac7
Comments mostly
2018-08-16 17:58:45 +02:00
tamasmeszaros
f297da0d01
Working curve approximation of the concave hull with clipper offset.
2018-08-16 17:47:05 +02:00
YuSanka
d10cdeb25f
Delete previous experiments
2018-08-16 16:43:16 +02:00
Enrico Turri
115744b38d
Merge branch 'convex_hull' of https://github.com/prusa3d/Slic3r into gizmos_3d
2018-08-16 13:54:56 +02:00
Enrico Turri
1fff2252bc
Detection of out of print volume disabled for wipe tower of unknown size
2018-08-16 13:42:35 +02:00
Enrico Turri
d38816bd9c
GLVolume use a pointer to ModelVolume's convex hull instead of a copy of it
2018-08-16 13:35:56 +02:00
Enrico Turri
2c9b41623a
Fixed wipe tower loosing selection after displacement
2018-08-16 13:22:02 +02:00
YuSanka
eae7752d30
Corrections for the last commit
2018-08-16 10:43:56 +02:00
YuSanka
e6fce6e1f6
Try to handle wxEVT_KEY_DOWN on OSX
2018-08-16 09:46:34 +02:00
YuSanka
5de933b77e
Try to fix evt_motion on OSX & GTK
2018-08-16 09:35:21 +02:00
YuSanka
3391ea050d
Try to handle wxEVT_CHAR_HOOK on OSX
2018-08-16 09:12:24 +02:00
Lukas Matena
3f72ca2a15
Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets
2018-08-16 08:56:18 +02:00
Enrico Turri
da42b42a6c
Merge branch 'opengl_to_cpp' of https://github.com/prusa3d/Slic3r into gizmos_3d
2018-08-15 14:39:40 +02:00
YuSanka
8c7cc73da6
Update extruder value for the object from the beginning
2018-08-15 13:59:33 +02:00
bubnikv
3b89717149
Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types:
...
Changed the Point3 / Pointf3 to derive from the Eigen Vec3crd / Vec3d.
Replaced the Point::concide_with() method calls with == operator.
Reduced some compiler warnings.
2018-08-15 13:51:40 +02:00
Enrico Turri
4d98d32199
Use of bounding box of rotated 3D convex hull for out of print volume detection
2018-08-15 12:50:06 +02:00
YuSanka
76249e5625
Fixed typo in LambdaObjectDialog. It was a reason of the wrong cube size updating for generic modifier "Cube".
...
+ some code cleaning
2018-08-15 12:47:46 +02:00
YuSanka
3e549c153d
Improvement of extruder selection for the object/part according to the actually extruders count
2018-08-15 11:18:20 +02:00
Lukas Matena
211790f8c3
Added qhull library to xs/src and cmake
2018-08-15 10:57:22 +02:00
YuSanka
f0095d19be
Some code refactoring
2018-08-15 10:09:05 +02:00
bubnikv
f34252a27b
Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types:
...
Changed the Point3 / Pointf3 to composite Eigen Vec3crd / Vec3d.
Point3 is no more derived from Point,
Pointf3 is no more derived from Pointf.
Introduced Transform2f/3f/2d/3d types as aliases to Eigen::Transform.
2018-08-14 21:33:41 +02:00
bubnikv
86da661097
Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types, first step
2018-08-14 18:33:26 +02:00
Lukas Matena
74e807f89b
New experimental parameter to adjust initial loading speed of the filament from the nozzle
2018-08-14 16:23:23 +02:00
YuSanka
3c3b8ed76f
fixed typo in update_extruder_in_config
2018-08-14 16:16:26 +02:00
YuSanka
92b578779e
Test of update_extruder_in_config()
2018-08-14 16:10:58 +02:00
YuSanka
817fb5adb3
Test of item_changed_selection(obj_idx)
2018-08-14 15:35:54 +02:00
YuSanka
79f2801d2a
One more try to understand OSX crashing on UnselectAll
2018-08-14 14:34:04 +02:00
YuSanka
a2eff85fa8
Try to fix OSX crashing on UnselectAll
2018-08-14 14:13:07 +02:00
Lukas Matena
93ce0d23b7
Simple attempt to smooth the lay flat triangles
2018-08-14 13:08:49 +02:00
YuSanka
acac6b0b44
Fixed DnD down-moving on GTK
2018-08-14 13:04:11 +02:00
tamasmeszaros
fbe415f88e
Rough base pool geometry can be generated from convex hull or from the ground slice itself.
2018-08-13 18:23:49 +02:00
Enrico Turri
6742735596
Better fix for minimum z of object to lay on the bed after rotations
2018-08-13 16:16:37 +02:00
Lukas Matena
09ce6c62ea
Retraction after ramming is now done without moving the head
2018-08-13 14:51:03 +02:00
YuSanka
13388f1caa
Drag & Drop for sub-objects (parts of the object)
2018-08-13 14:15:43 +02:00
YuSanka
73ba96381e
Drag&Drop test on Linux and OSX
2018-08-13 10:30:36 +02:00
Lukas Matena
25a6c7e30e
Created a new gizmo for flattening an object
2018-08-13 09:45:18 +02:00
Enrico Turri
bb07100a4f
Code cleanup
2018-08-13 09:23:10 +02:00
Enrico Turri
b6f6200bd5
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-08-13 08:51:58 +02:00
YuSanka
9df6804835
next try
2018-08-10 14:55:34 +02:00
YuSanka
4b8d7bd7fa
Fry to fix OSX-crashing on UnselectAll
2018-08-10 14:02:47 +02:00
YuSanka
0477d4d802
Fixed tooltip showing on Linux and OSX(maybe)
2018-08-10 12:19:35 +02:00
YuSanka
a7c29b98bd
Try to understand wxEVT_MOTION on OSX
2018-08-10 08:26:15 +02:00
tamasmeszaros
e8616b6a35
SLA base pool generation framework
2018-08-09 18:11:45 +02:00
YuSanka
1029a4c0e0
Experiments with tooltips
2018-08-09 17:53:34 +02:00
YuSanka
72c77a3592
Next experiment
2018-08-09 17:33:44 +02:00
Lukas Matena
a06b6716ea
First naive implementation of TriangleMesh convex hull calculation
2018-08-09 16:35:28 +02:00
YuSanka
fede9e95ff
Experiments with wxEVT_LEFT_DOWN/wxEVT_MOTION on OSX
2018-08-09 15:55:08 +02:00
YuSanka
dc8cdcc2ba
Added tooltips with manifold_warning information
2018-08-09 12:02:09 +02:00
tamasmeszaros
5164bec8ce
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
...
# Conflicts:
# xs/CMakeLists.txt
2018-08-09 10:53:27 +02:00
YuSanka
c1bef2f8de
Added set_default_suppressed for sla_materials.
2018-08-09 09:25:23 +02:00
YuSanka
0210dcf3b6
Fixed build crashing
2018-08-08 18:17:19 +02:00
YuSanka
5dbc8fb427
Correct UI updating for SLA tabs
2018-08-08 17:47:59 +02:00
YuSanka
adf003f0ed
Correct preset/tabs updating according to the technology
...
+ some code refactoring
2018-08-08 16:22:56 +02:00
YuSanka
da16b28c14
Correct show_preset_comboboxes
2018-08-08 11:17:56 +02:00
bubnikv
93b8f3147c
Fixed inccorect (excessive) time estimates with the MMU 2.0
2018-08-07 14:15:37 +02:00
Lukas Matena
705ccbe331
Added qhull library to xs/src and cmake
2018-08-07 12:20:15 +02:00
YuSanka
709b898eba
Correct printer pages updating according to the printer_technology
2018-08-07 11:58:27 +02:00
bubnikv
288cd58ee2
Bumped up version number.
2018-08-06 18:09:52 +02:00
YuSanka
2af2b05bd6
Correct switching between printer_technologies (show/hide according tabs)
2018-08-06 17:01:41 +02:00
Lukas Matena
a0fdcd9f47
Merge branch 'master' of http://github.com/prusa3d/Slic3r
2018-08-06 16:38:16 +02:00
Lukas Matena
a8cef5bf50
Changed checkbox labels for purge into infill/object feature
2018-08-06 16:37:41 +02:00
bubnikv
4f52601081
Minor tweaks of UI texts,
...
optimization of the wipe tower invalidation,
show collisions of the wipe tower with known dimensions.
2018-08-06 16:31:51 +02:00
YuSanka
7edc1dd577
Deleted empty line between "default value" and "variable name"
2018-08-06 15:47:03 +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
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