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
tamasmeszaros
ddb4945586
Fix crash on Linux when arranging
2018-07-02 11:22:47 +02:00
tamasmeszaros
952068f282
Autocenter finally disabled. Progress indication works.
2018-06-29 17:46:21 +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
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
tamasmeszaros
d337b69407
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 17:44:33 +02:00
Enrico Turri
7ff22b9413
Time estimate emitted to gcode at requested interval
2018-06-27 15:35:47 +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
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
5c32347449
1st attempt to fix opengl on ubuntu
2018-06-27 11:31:11 +02:00
tamasmeszaros
c28b602465
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 09:36:05 +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
bubnikv
645cc65d2b
When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe
...
Do some magic to get the perl interpreter path.
2018-06-26 15:29:23 +02:00
YuSanka
c1724f45c9
Fixed post-merge bugs
2018-06-26 13:34:25 +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
Enrico Turri
87c1654e31
Fixed bed update when changing selected printer
2018-06-26 12:19:19 +02:00
Enrico Turri
a754de4c32
Fixed panning in Layers view
2018-06-26 11:17:30 +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
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
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
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
f9e6bcf872
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:26:14 +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
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
ac7d21b50a
Geometry info updated while using gizmos
2018-06-22 11:19:38 +02:00
Enrico Turri
4fcbb73141
Cleanup of perl code
2018-06-21 12:21:51 +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