Enrico Turri
4b25d3924b
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-08-27 14:01:03 +02:00
Enrico Turri
fef5a5252e
Fixed conflicts after merging with master
2018-08-27 14:00:53 +02:00
tamasmeszaros
d749080261
Merge remote-tracking branch 'origin/dev' into sla_base_pool
2018-08-27 09:53:52 +02:00
bubnikv
fec2545033
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-08-24 16:58:53 +02:00
Lukas Matena
a4176ef933
Bugfix - dialog that changes number of copies deleted the object when cancelled
2018-08-24 16:52:06 +02:00
YuSanka
02a325556d
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
2018-08-24 16:28:34 +02:00
YuSanka
90fcdd4e5f
Fixed post-commit compilation problems
2018-08-24 16:20:19 +02:00
Enrico Turri
cda135ada7
Removed scale and rotate actions from toolbar
2018-08-24 15:08:19 +02:00
YuSanka
8b148a4fe4
Merge remote-tracking branch 'origin/new_main_page_ui' into dev
2018-08-24 15:01:26 +02:00
YuSanka
ada6970053
Merge remote-tracking branch 'origin/SLA_ui' into dev
2018-08-24 12:20:24 +02:00
Enrico Turri
66ce638439
Fixed conflicts after merging with branch eigenize
2018-08-23 15:37:38 +02:00
YuSanka
2ec045a0fb
Added SetSliderValues and GetActiveValue functions
2018-08-23 14:44:49 +02:00
Enrico Turri
a5fcdeec23
Merge branch 'gizmos_3d' of https://github.com/prusa3d/Slic3r into dev
2018-08-23 09:45:04 +02:00
Lukas Matena
85ae2d0d2f
Merge branch 'master' into lm_lay_flat_round_merged_facets
2018-08-22 14:03:17 +02:00
Lukas Matena
0b21042606
Lay flat minor bugfix (ObjectCutDialog called a changed function using the old signature)
2018-08-22 14:02:32 +02:00
Vojtech Kral
0c984c7584
Print host bugfixes / refactoring
2018-08-21 15:47:29 +02:00
Lukas Matena
86b67bbd42
Lay flat - rotation is now done in one go directly about the necessary axis
2018-08-21 15:40:11 +02:00
tamasmeszaros
6e77307880
Merge remote-tracking branch 'origin/eigenize' into sla_base_pool
2018-08-21 13:50:09 +02:00
Martin Loidl
d4b73701d9
some code formatting
2018-08-21 11:12:53 +02:00
Martin Loidl
dd1fd66a47
Added possibility for upload to Duet
...
Further changes:
- Added new configuration option Host Type
- Added abstract base class for future printer hosts
- Moved location of upload dialog (also made it a little bit more configureable)
- added possibility to send file via postfield instead a new frame
2018-08-21 11:12:53 +02:00
Lukas Matena
b0dd328fde
Lay flat - icons and invalidation improvement
2018-08-20 11:27:25 +02:00
bubnikv
ab60d8adb4
Replaced coincides_with(const Line &line) with operator==
2018-08-17 18:27:07 +02:00
bubnikv
9e7634b6e8
Merged with master
2018-08-17 18:07:45 +02:00
bubnikv
5b94f53cd7
Removed the Point::wkt() and Point::dump_perl() methods.
...
Added to_string() for the basis Eigen vector types.
2018-08-17 16:54:07 +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
Enrico Turri
296c53e336
Merge branch 'convex_hull' of https://github.com/prusa3d/Slic3r into gizmos_3d
2018-08-17 10:36:42 +02:00
Enrico Turri
048f3a03fe
Fixed scale to size of objects with multiple instances
2018-08-17 10:12:43 +02:00
Enrico Turri
b6e0458201
Fixed lost selection of imported objects
2018-08-17 09:16:34 +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
Enrico Turri
6b4d8ac934
Removed plater's toolbar
2018-08-15 13:19:58 +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
a2eff85fa8
Try to fix OSX crashing on UnselectAll
2018-08-14 14:13:07 +02:00
Enrico Turri
168d38df2b
Fixed object sinking into print bed after parts import
2018-08-14 09:33:58 +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
4b8d7bd7fa
Fry to fix OSX-crashing on UnselectAll
2018-08-10 14:02:47 +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
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
YuSanka
2af2b05bd6
Correct switching between printer_technologies (show/hide according tabs)
2018-08-06 17:01: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
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
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
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
Enrico Turri
55e7a1af46
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-31 08:34:34 +02:00
Enrico Turri
09de343e65
Fixed slice info after re-export of gcode. Fixes #1081
2018-07-30 13:54:54 +02:00
YuSanka
c2993de6e0
Scale and rotation from scene to value updates correctly
2018-07-29 21:42:57 +02:00
Enrico Turri
c64cba8ec2
A few fixes on 3D scene toolbar
2018-07-27 14:38:19 +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
bubnikv
987fc4c6df
Merge remote-tracking branch 'origin/backspace_to_delete_on_osx'
2018-07-27 09:55:13 +02:00
Enrico Turri
3a1ec8285e
Reddish background when detected out of print volume toolpaths
2018-07-27 09:38:39 +02:00
YuSanka
ca1a11742b
After merging bug fixes
2018-07-26 15:47:18 +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
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
Enrico Turri
4243c7d84a
Removed 2D panel
2018-07-25 09:42:03 +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
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
YuSanka
97a25cf608
Work with model objects like reference (from/to perl side)
2018-07-24 12:15:36 +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
Vojtech Kral
dfb70ec6e6
Fix application shutdown on incompatible profile exit
2018-07-24 10:50:27 +02:00
Enrico Turri
bbe5586c15
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r
2018-07-24 10:03:45 +02:00
bubnikv
077680b806
Fix of https://github.com/prusa3d/Slic3r/issues/1068
...
Fixed reloading of an object, which contains non-ASCII7 characters
in its file name or path.
2018-07-24 09:23:19 +02:00
Enrico Turri
c68bcb9e60
1st installment of 3D scene toolbar
2018-07-23 13:49:48 +02:00
YuSanka
40b55a3818
Allow delete button in object list
2018-07-23 11:33:13 +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
Enrico Turri
86caf83721
Update objects' list after scaling using gizmo
2018-07-23 08:57:00 +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
Enrico Turri
1a6fdb668f
Fixed print info
2018-07-19 13:58:25 +02:00
bubnikv
a46bdb1d81
Reworked the "Sliced info" box on the platter to only show the
...
"silent mode" print time if it is available.
2018-07-18 14:52:19 +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
bubnikv
3bebe9f954
Restored the "Fix STL through Netfabb" functionality, which has been
...
lost during some merge process.
2018-07-17 21:31:54 +02:00
Enrico Turri
5c90746914
Merge with master + resolved conflicts
2018-07-17 10:44:23 +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
tamasmeszaros
67d69830e8
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-16 16:08:28 +02:00
Enrico Turri
a80ef7201b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-13 14:45:51 +02:00
Enrico Turri
4805df6037
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-13 14:45:15 +02:00
Enrico Turri
d99b484ac6
Fixed update of sliders' texts into object settings dialog
2018-07-13 14:41:49 +02:00
tamasmeszaros
eefa1678db
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-13 11:28:02 +02:00
Enrico Turri
ee67b2c7c3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-13 11:27:56 +02:00
Enrico Turri
06613e4792
Fixed 3D preview not updated after g-code export
2018-07-13 11:16:28 +02:00
Enrico Turri
7caada244a
Attempt to fix SPE-356
2018-07-13 08:58:28 +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
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
38768a7bda
Replaced Object list before Object(Part) Settings
2018-07-04 12:38:34 +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
797c812f31
Stop the ongoing slicing process when attempting to export.
2018-07-03 13:12:15 +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