YuSanka
4b0fe7cba4
Implemented custom extruder(tool) change from DoubleSlider
2019-10-15 15:42:30 +02:00
Enrico Turri
e6403a74ef
ENABLE_3DCONNEXION_DEVICES tech set as default
2019-10-11 15:51:36 +02:00
YuSanka
5d9a136b8a
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
2019-10-10 16:17:09 +02:00
YuSanka
70ef0f25ef
Information from DoubleSlider is saved to Model
...
GCode creating can work with that values.
2019-10-10 16:03:58 +02:00
Enrico Turri
4d1cfda14a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-10 15:44:52 +02:00
Enrico Turri
e51d970b2e
Fixed crash in Plater::priv::can_reload_from_disk()
2019-10-10 14:44:52 +02:00
Enrico Turri
9fc1cc6f84
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-09 12:16:44 +02:00
Enrico Turri
835ee148e5
Fixed conflicts after merging with master
2019-10-09 11:17:48 +02:00
Enrico Turri
8aa33a9e05
ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver
2019-10-08 08:44:50 +02:00
tamasmeszaros
272e9f11e3
Merge branch 'tm_arrange_test_extend'
2019-10-07 17:57:34 +02:00
Vojtech Kral
fd6d32135b
Merge branch 'master' into materials
2019-10-07 17:23:37 +02:00
tamasmeszaros
72ac8d68f0
Extend libnest tests, remove some warnings, faster catch2 compilation.
...
Also, improve libnest2d::nest interface.
2019-10-07 17:16:40 +02:00
YuSanka
47a8b49f8b
Fixed get extruder color for SLA presets
2019-10-07 12:36:16 +02:00
Enrico Turri
6f85b0885a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-07 09:31:43 +02:00
tamasmeszaros
5bf3d5aabf
Merge branch 'tm_sla_tests'
2019-10-04 18:34:08 +02:00
Enrico Turri
243cb5d524
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-04 07:34:43 +02:00
Enrico Turri
587effbedf
ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D
2019-10-03 11:38:31 +02:00
YuSanka
d7ebc4de5b
Added color for extruder
2019-10-01 18:19:28 +02:00
tamasmeszaros
e675a5d5c6
Reworked pad creation algorithm with new parameters:
...
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +02:00
Vojtech Kral
eb93d2a32d
Merge branch 'master' into materials
2019-09-30 16:12:48 +02:00
Enrico Turri
eabaa21df2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:21 +02:00
YuSanka
c07a193b4e
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
YuSanka
904bbcc006
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
Enrico Turri
4b3eab0ed9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-27 14:52:30 +02:00
Enrico Turri
f958cfd2ff
ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices
...
Implemented using hidapi library (https://github.com/libusb/hidapi ) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference
Unsolved issues:
- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out
- wxWidgets does not detect devices being connected/disconnected to the pc
- Current state forces a continuous rendering
- Current state misses dependence on camera zoom
- Non intuitive movement limits
- Translation and rotation speed factors are hardcoded
- Number of device buttons hardcoded
2019-09-27 14:52:19 +02:00
YuSanka
82bc243281
Implemented possibility to set a resin cost
2019-09-26 16:36:31 +02:00
Lukas Matena
dbc51a140d
Fixed erroneous use of logical OR where bitwise OR was meant
...
Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used
2019-09-25 12:18:30 +02:00
Enrico Turri
e6604afd05
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
Enrico Turri
2dc9949a4c
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
Enrico Turri
c0576a8770
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 08:27:01 +02:00
Lukas Matena
656569b0e9
Fix of https://github.com/prusa3d/PrusaSlicer/issues/2953
...
printf-like function argument mismatch: num was long, which was obfuscated by the auto keyword
2019-09-20 16:47:10 +02:00
YuSanka
8aaff08355
Added Possibility to create "shape" as an independent object from 3dScene,
...
using right click on empty place
2019-09-20 09:57:27 +02:00
Enrico Turri
0de8245432
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-19 14:03:05 +02:00
Enrico Turri
355a7d6a8c
Fixed empty filename when trying to export a plate where no object is selected and no object is printable
2019-09-19 14:01:17 +02:00
Enrico Turri
74747226f7
ENABLE_ENHANCED_RELOAD_FROM_DISK
...
1) Modified .zip.amf import/export to save/load volume matrices and source data
2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00
YuSanka
584b37513f
Implemented possibility to create "shape" as an object ( #2865 )
2019-09-19 12:30:16 +02:00
bubnikv
80c5eaacdf
Merge remote-tracking branch 'remotes/origin/dev' into vk-materials
2019-09-19 11:49:49 +02:00
Enrico Turri
3a40565d03
Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK
...
1) Reworked void Plater::priv::reload_from_disk() to be more general
2) Added source data to class ModelVolume
3) Modified .3mf import/export to save/load volume matrices and source data
4) Incremented .3mf version to 2
2019-09-19 09:09:11 +02:00
Lukas Matena
76a657ce52
Plater.cpp - better added a range-check when selecting filament color in purging volumes dialog
2019-09-18 12:54:21 +02:00
Lukas Matena
741e98804c
Purging volumes dialog now uses filament colour in case extruder color is undefined
2019-09-18 11:47:19 +02:00
Vojtech Kral
dba9925c4e
Move ConfigWizard instance in GUI_App, lazy-initialized,
...
add filament/material installation item in Sidebar combo boxes
2019-09-17 13:20:06 +02:00
Enrico Turri
a93e63e296
Fixed object shifted after saving to/reloading from .3mf and .zip.amf a multivolume object with printable parts moved by user
2019-09-17 12:50:54 +02:00
Enrico Turri
7fe691f14e
Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-12 10:46:32 +02:00
Enrico Turri
724cc19ae5
Fixed object position after reload from disk
2019-09-12 10:44:38 +02:00
bubnikv
b4f2df6a98
Merge remote-tracking branch 'remotes/origin/master' into dev
2019-09-12 10:19:09 +02:00
Enrico Turri
c55a463c93
Do not show intermediate states in objects list while reloading from disk
2019-09-11 15:31:30 +02:00
Enrico Turri
26f3af4b16
Fixed modifiers after reload from disk
2019-09-11 15:02:57 +02:00
tamasmeszaros
c37ec7463f
Add new config values to SL1 zip file config.ini
...
All requested config values are written into SL1 ini file inside the zip
* TIme.hpp and Time.cpp is now part of libslic3r instead of libslic3r_gui
* Updated time manipulation function: separate timestamp_local_str and timestamp_utc_str
* timestamp_utc_str is used in header_slic3r_generated(). Gcode now contains UTC timestamps
2019-09-11 13:10:23 +02:00
Enrico Turri
b383d9581a
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-11 09:01:44 +02:00
Lukas Matena
86b258f727
Fixed many warnings in following files:
...
src/slic3r/Config/Snapshot.cpp
src/slic3r/GUI/Field.cpp
src/slic3r/GUI/GLToolbar.cpp
src/slic3r/GUI/GUI_ObjectList.cpp
src/slic3r/GUI/GUI_ObjectList.hpp
src/slic3r/GUI/Plater.cpp
src/slic3r/GUI/Plater.hpp
src/slic3r/GUI/PresetBundle.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/wxExtensions.cpp
2019-09-10 12:08:43 +02:00
Enrico Turri
27f01bb09e
Fixed instance printable property after reload from disk
2019-09-10 11:16:59 +02:00
bubnikv
6ba43ebacb
Merge remote-tracking branch 'remotes/origin/master' into dev
2019-09-09 17:49:07 +02:00
Enrico Turri
6507b7bf39
Fixed gizmos update after objects loading
2019-09-09 15:55:04 +02:00
Enrico Turri
e6366894da
Fixed object settings after reload from disk
2019-09-06 17:26:08 +02:00
Enrico Turri
abd170fbf4
Follow-up of 6c3aae8f89
-> Fixed update of objects list when object has a unique instance
2019-09-06 15:50:54 +02:00
Enrico Turri
6c3aae8f89
Fixed update of instances in objects list after reload from disk
2019-09-06 15:10:07 +02:00
Enrico Turri
4f1747d5f6
Keep correct instance selection after reload from disk
2019-09-06 14:36:47 +02:00
Enrico Turri
fe07bde385
Do not render intermediate states while reload from disk action is taking place
2019-09-06 13:49:15 +02:00
Enrico Turri
a7a01bfc72
Keep selection after reload from disk
2019-09-06 13:11:20 +02:00
YuSanka
c960c2cf27
Code clean in Tab.cpp and Fixed couple of Mac-warnings in :
...
GUI.cpp
GUI_App.cpp
GUI_ObjectList.cpp
MainFrame.hpp
Plater.cpp
PresetBundle.cpp
PresetHints.cpp
Tab.cpp
Tab.hpp
wxExtensions.cpp
wxExtensions.hpp
2019-09-03 10:29:17 +02:00
Lukas Matena
7d54b04699
Merge branch 'lm_wiping_dialog_colors' into dev
2019-09-02 16:31:22 +02:00
Enrico Turri
d0513fc2da
Fixed update of application's title bar when trying to import a non compatible .3mf or .amf project
2019-09-02 15:15:28 +02:00
Enrico Turri
05c4976232
Do not automatically start slicing when switching to gcode preview if the Slice Now button is disabled
2019-08-29 15:38:21 +02:00
bubnikv
2b7a4973a8
Reworded the "Add / remove instance / set number of instances".
2019-08-28 15:35:01 +02:00
bubnikv
048ed74318
Another round of translation adjustments.
2019-08-28 15:12:55 +02:00
tamasmeszaros
c2b9980488
Mirror pad_around_object for 'Pad' page on 'Supports' page
2019-08-28 11:33:04 +02:00
bubnikv
86b2817da5
Fix of a regression issue since ee38d80318
...
1) load object
2) Switch FFF to SLA or vice versa
3) Undo -> Crash
Fixed by deselecting the side panel before loading profiles
of the other technology.
2019-08-27 12:15:29 +02:00
bubnikv
1e11eab620
Improved wording of some UI texts and tooltips.
2019-08-27 11:39:51 +02:00
YuSanka
8f019e5fa9
Set bigger scroll step for sidebar
2019-08-23 16:05:18 +02:00
bubnikv
6adebb9c78
When synchronizing the front end with the back end after Undo / Redo
...
jump, postpone error messages, so they are displayed after
the Undo / Redo jump has been fully performed.
Otherwise there would be a message box opening, taking over the message
queue, and possibly performing actions as rendering on an inconsistent
application state.
2019-08-23 15:53:45 +02:00
YuSanka
6b4f6f43dd
Merge remote-tracking branch 'origin/master' into lm_wiping_dialog_colors
2019-08-23 14:27:25 +02:00
bubnikv
93c6915e9d
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-08-23 13:26:47 +02:00
Enrico Turri
c7cdb2fd3e
Added version check for .3mf and .amf project files. PrusaSlicer will refuse to import files with newer version numbers.
2019-08-23 13:12:31 +02:00
Lukas Matena
52933d1bab
Recalculate SLA supports after undo/redo in case SLA gizmo was active and had supports when the snapshot was taken
2019-08-23 01:42:59 +02:00
Lukas Matena
b55a140ad4
SLA gizmo takes snapshots on opening and closing
2019-08-23 01:42:59 +02:00
bubnikv
c6604ff55d
Merge remote-tracking branch 'remotes/origin/et_toolpaths_export'
2019-08-22 15:02:02 +02:00
YuSanka
448d773da0
Fixed default transparency for ColorPicker from sidebar (was appeared under OSX for empty extruder color).
...
+ Fixed wrong getting of instance printable value inside add_object_to_list()
2019-08-20 15:27:51 +02:00
Enrico Turri
da00b7bfa5
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 11:34:18 +02:00
Enrico Turri
58473f84ee
Check for existence of gcode toolpaths that can be exported to obj file
2019-08-20 11:33:58 +02:00
YuSanka
7706a5be3e
Fixed #2738
...
+ Added update for plater config option "filament_colour", when we have multiple extruder print.
2019-08-20 09:52:01 +02:00
Enrico Turri
a99a89a831
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 09:51:44 +02:00
Enrico Turri
1f6aab312b
1st installment of export of gcode toolpaths to obj file
2019-08-20 09:01:09 +02:00
Lukas Matena
c8ac46df43
Fixed some memory leaks related to heap-allocated wxDialogs
...
Some correctly destroyed dialogs were also converted to stack-allocated
2019-08-15 12:52:56 +02:00
YuSanka
0a9c5a9433
Fixed extra "Add_Selection" snapshot on call context menu from scene
...
+ Added take_snapshot for toggle_instance_printable_state
2019-08-09 09:49:10 +02:00
bubnikv
23b2b4c59f
Merge remote-tracking branch 'remotes/origin/vb_picking_fix'
2019-08-08 09:50:02 +02:00
tamasmeszaros
b8bfe001c0
WIP: Pad quick-menu
2019-08-06 18:16:02 +02:00
YuSanka
8a2362587d
Save/load printable flag to/from 3mf and amf
2019-08-06 16:27:56 +02:00
YuSanka
0520da3241
Merge remote-tracking branch 'origin' into ys_printable_property
2019-08-06 10:31:17 +02:00
YuSanka
b43f7c3880
Generated new POT-file
...
Fixed lines with translation of the empty strings
2019-08-06 10:01:10 +02:00
bubnikv
cf2f16d864
Fixed Model::convert_multipart_object() for STLs (regression from 8e2af5151dcf6f102b65981ff5aa56c2dfda5a2a).
...
Removed Model::s_auto_extruder_id and related, as it is a Perl interfacing legacy.
Fixed a typo in asserts introduced in the preceding commit.
2019-08-05 17:49:21 +02:00
YuSanka
825446d145
Merge remote-tracking branch 'origin/master' into ys_printable_property
2019-08-05 08:45:47 +02:00
Enrico Turri
c791ba776f
Added absolute time to estimated time for color print and fixed a bug in showing estimated times for print color for silent mode
2019-08-02 12:05:02 +02:00
YuSanka
885da35544
Merge remote-tracking branch 'origin/master' into ys_printable_property
2019-08-01 15:15:18 +02:00
Lukas Matena
aeb29b1184
SLA points on all objects are assigned Generating status before the background processing starts
2019-07-31 13:00:35 +02:00
Enrico Turri
0647d3ac1e
Code cleanup
2019-07-31 11:12:50 +02:00
Enrico Turri
03820a38cf
Render non printable instances with a darker color
2019-07-31 11:01:50 +02:00
Enrico Turri
b1a1ed6394
Toggle instance printable member by 3D scene context menu
2019-07-31 10:12:13 +02:00
bubnikv
ca1c78b3fc
Merge remote-tracking branch 'remotes/origin/et_custom_bed'
2019-07-30 16:48:47 +02:00
bubnikv
08a90b8c1b
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-26 13:44:41 +02:00
bubnikv
30d4bfd410
New Undo / Redo stack for the gizmos. The Gizmo specific stack is
...
entered with Plater::enter_gizmos_stack(), and left with
Plater::enter_gizmos_stack(). Other than that, the 2nd Undo / Redo
stack is transparent to the user of the Plater.
WIP: Currently the Gizmo stack takes a snapshot of the whole scene on
Plater::enter_gizmos_stack(). While it should work, it may be cheaper
to modify the Undo/Redo stack to only take a snapshot of the gizmos
in the Gizmo mode.
2019-07-26 13:44:33 +02:00