YuSanka
63f31ce4db
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-10-02 22:51:18 +02:00
YuSanka
b3603a09fc
Fixed a bug: Wrong save of a preset if the preset is already exist.
...
Step to repro:
1. Select system "Some_preset" preset
2. Make some changes
3. Save preset with "Some_preset - Copy" name.
=> "Some_preset - Copy" is selected, there is/are marked option(s) only different from system preset.
repeate 1-3 steps
=> "Some_preset - Copy" is selected, there is/are marked option(s) different from DEFAULT preset.
2019-10-02 22:50:55 +02:00
YuSanka
8bc569284e
Corrected editor position and size
2019-10-02 16:14:40 +02:00
YuSanka
9e01740db6
More improvements
2019-10-02 15:02:13 +02:00
tamasmeszaros
d5dcba00b1
Time conversion functions with tests.
...
Fixes issue with incorrect characters in time strings on UI.
Fix platform dependency
Fix return value with incorrect strings.
Just use strptime and strftime on all platforms.
Emulate strptime on msvc... because they don't have it and their get_time is buggy.
2019-10-02 14:44:11 +02:00
YuSanka
4171a6a80d
Improvements for 15902766d0
2019-10-02 14:08:36 +02:00
YuSanka
d87f2d11ae
Fix OSX build
2019-10-02 12:17:02 +02:00
YuSanka
15902766d0
Workaround for extruder editing under OSX
2019-10-02 11:53:50 +02:00
Enrico Turri
fbe38fb2a4
#3008 - Generate all mipmaps up to size 1x1
2019-10-02 10:57:07 +02:00
YuSanka
a0b46a4019
Merge remote-tracking branch 'origin/master' into ys_extruders_color
2019-10-01 18:20:59 +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
tamasmeszaros
710adca6fe
Don't disable pad around object parameters if supports are disabled.
2019-10-01 14:57:37 +02:00
YuSanka
45b81f1805
Fixed "unhandled unknown exception", when try to change an extruder count.
...
Side effect after 86b258f727
.
2019-10-01 14:27:51 +02:00
bubnikv
93a157e26c
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-09-30 16:25:31 +02:00
bubnikv
272479826f
Refactoring of the G-code preview for lower memory allocation
...
and for separation of concerns:
The final G-code preview no more uses ExtrusionPaths structure
to hold the G-code path data extracted by parsing the G-code.
Instead, the ExtrusionPath class has been trimmed down back to
the original size before the G-code preview was introduced,
and a new GCodePreviewData::Extrusion::Path class was created to hold
the additional path data as the extruder ID, color change ID
and fan speed.
2019-09-30 16:25:26 +02:00
Vojtech Kral
eb93d2a32d
Merge branch 'master' into materials
2019-09-30 16:12:48 +02:00
YuSanka
c07a193b4e
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
YuSanka
f5593c05aa
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-30 14:04:45 +02:00
YuSanka
904bbcc006
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
bubnikv
b425ee50a9
Merge remote-tracking branch 'remotes/origin/et_pull_2922'
2019-09-30 10:23:16 +02:00
Lukas Matena
5ded376fe2
An attempt to fix #2997
...
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
YuSanka
1a03b664b9
Some changes for alignments in manipulation panel
2019-09-25 15:04:39 +02:00
Enrico Turri
6f8a9bc1ff
Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar
2019-09-25 13:05:18 +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
YuSanka
efb9ef37f6
Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw
2019-09-25 11:33:19 +02:00
Enrico Turri
fdbe339622
Fixed gizmo scale for objects added to scene using the new context menu
2019-09-25 11:25:14 +02:00
YuSanka
6faf67d90c
Add binding for ManipulationEditors
2019-09-25 11:25:05 +02:00
Lukas Matena
7861fa5086
Whitespace changes to supress misleading indentation warnings
...
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
YuSanka
b2e7081d31
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:33:20 +02:00
YuSanka
9607fbeb6d
Fix of SPE-1027
2019-09-24 14:32:59 +02:00
Enrico Turri
2fd5044460
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:13:22 +02:00
Enrico Turri
7c1706f7ee
Follow-up of f4910cafed
-> Fix extended to Mac
2019-09-24 14:13:03 +02:00
Lukas Matena
c1e3be9b27
MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane
2019-09-24 12:58:12 +02:00
Enrico Turri
a68a72a660
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 09:11:43 +02:00
Enrico Turri
e6604afd05
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
YuSanka
a234193dea
Fixed localization for "Configuration Wizard" menu item
2019-09-23 16:29:07 +02:00
Enrico Turri
2dc9949a4c
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
Enrico Turri
82a52e8b21
#2922 - Port of commit: f42edd35ce
by jschuh
2019-09-23 14:56:27 +02:00
YuSanka
d90a27d5f8
Merge remote-tracking branch 'origin' into ys_manipulation_panel_rw
2019-09-23 14:37:06 +02:00
YuSanka
c0c937425f
Added missed comment to 7e060f84bd
2019-09-23 14:24:53 +02:00
Enrico Turri
4a45c1aa41
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 12:34:18 +02:00
YuSanka
4e22761f95
Fix of #2977
2019-09-23 10:17:53 +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
89ebf1f1e8
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-20 11:30:53 +02:00
YuSanka
7e060f84bd
Forcing of explicit SetWidth for the columns under OSX, as an attempt to fix a narrow column width on 4(5)K monitors under OSX
2019-09-20 11:30:29 +02:00
Enrico Turri
d66bf7e1e1
Follow-up of 8aaff08355
-> Do not show the new context menu when the user pans the scene + cleanup
2019-09-20 11:19:06 +02:00
YuSanka
a27026aa03
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-20 09:58:33 +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
9e09c52ab0
#2948 - Max zoom takes in account custom bed model size
2019-09-20 09:53:35 +02:00
bubnikv
110d5b9d56
Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev
2019-09-19 17:16:43 +02:00
bubnikv
6ce1011a09
Slic3r -> PrusaSlicer in config snapshot dialog.
2019-09-19 17:16:37 +02:00
YuSanka
e34ef1dd07
Merge remote-tracking branch 'origin/dev' into ys_manipulation_panel_rw
2019-09-19 15:39:13 +02:00
YuSanka
29f3c938e6
Fix of SPE-1026 (Height range value works differently if you press enter and if you leave textbox)
...
Related to GH #2946
2019-09-19 15:28:36 +02:00
YuSanka
381735581b
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-19 14:12:12 +02:00
YuSanka
ddf37d3b01
Fix under OSX for 584b37513f
2019-09-19 14:11:56 +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
YuSanka
67d7809418
Fixed font size and layouts for ObjectManipulation panel under OSX
2019-09-19 08:44:19 +02:00
YuSanka
c9c407cc2b
Rewrote UI for ObjectManipulation without using of OptionsGrope
2019-09-18 15:10:36 +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
107ff6fd36
Materials: Cleanup
2019-09-17 17:16:15 +02:00
Vojtech Kral
cb1ee5ce55
ConfigWizard: Add view mode setting page
2019-09-17 15:52:26 +02:00
Enrico Turri
cd7895065a
Fixed typo
2019-09-17 15:48:39 +02:00
Enrico Turri
f4910cafed
Fixed selection after adding a modifier by loading it from file
2019-09-17 15:30:54 +02:00
Lukas Matena
dd7eb0b186
Merge branch 'lm_raycasting_refactoring' into dev
2019-09-17 14:59:14 +02:00
Lukas Matena
6bcafd7c83
SLA gizmo no more uses IGL code directly, all was moved to the new MeshRaycaster class
2019-09-17 14:57:57 +02:00
Lukas Matena
1dfd8a0e62
MeshRaycaster class is now used in SLA gizmo when selecting by rectangle
2019-09-17 14:57:54 +02:00
Lukas Matena
3694bf3da9
Added functions get_hit_pos, get_hit_normal, ready to implement intersect_ray
2019-09-17 14:57:49 +02:00
Lukas Matena
b6292247e8
Unproject on mesh in the SLA gizmo is now performed by the MeshRaycaster class
2019-09-17 14:57:45 +02:00
YuSanka
0890c1417a
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-17 13:42:06 +02:00
YuSanka
93aa5ac6ce
Fixed re-scaling under MSW for Layers editing
...
+ Clean code in GUI_ObjectManipulation.cpp
2019-09-17 13:41:44 +02:00
Vojtech Kral
c5a67ff931
WIP: filament/material filtering per selected printers
2019-09-17 13:20:06 +02:00
Vojtech Kral
9a465514ff
Filament and material default installation based on enabled printers
2019-09-17 13:20:06 +02:00
Vojtech Kral
270008a3fd
Add material_type config option for SLA materials, use in Wizard
2019-09-17 13:20:06 +02:00
Vojtech Kral
235b659cf9
WIP: ConfigWizard: 3rd party bundle installation roughly done
2019-09-17 13:20:06 +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
Vojtech Kral
87b7b1cc1d
Load default filament/material selections from vendor profiles
2019-09-17 13:20:06 +02:00
Vojtech Kral
34b3548102
Filaments and materials selection/installation
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
Vojtech Kral
8e11a7b895
PresetUpdater: Fix: Sanitize downloadedsemver, fix #2927
...
Use HTTPS for the slicer app version url
2019-09-16 18:02:14 +02:00
YuSanka
13bde53955
Call update_config_values after deleting of a overridden option
2019-09-16 12:05:56 +02:00
YuSanka
a12e6a7bde
More clear identification if is there object selected
2019-09-16 11:55:05 +02:00
YuSanka
284355d378
Fix of #2878 (endless warning loop in configuration update)
2019-09-16 10:22:26 +02:00
Lukas Matena
70c0c87598
Renamed MeshClipper.cpp/.hpp to MeshUtils.cpp/.hpp
...
More helper classes like the MeshClipper could live here
Moved ClippingPlane class in here to start
2019-09-13 12:03:53 +02:00
Lukas Matena
9782701dd4
Calculating the transformations is now only performed by the MeshClipper
...
Attempted to get mirroring right (that never worked correctly with the clipping plane in the sla gizmo)
The transformation of the support mesh is kind of a mystery to me, hopefully it is right
Also cleaned the code a bit (removed commented-out code, unused variables, etc)
2019-09-13 12:03:53 +02:00
Lukas Matena
546917830b
Initial implementation of MeshClipper class
...
So far the work is shared between the old code in GLGizmoSlaSupports.cpp and the new class
2019-09-13 12:03:53 +02:00
Lukas Matena
cf23146ee3
Refactoring the SLA clipping plane
...
The plane is now internally stored as a plane in world coordinates
2019-09-13 12:03:53 +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