Commit graph

1822 commits

Author SHA1 Message Date
YuSanka
522b3f6d98 Follow-up 370e8bd752e3f7c97b9804a56dc417dfb362cce8 - Update 3D-scene after splitting of the unprintable object 2022-08-12 11:09:30 +02:00
Lukas Matena
0df757895e An attempt to fix issues with wxProgressDialog 2022-08-11 16:51:56 +02:00
Lukas Matena
620b89d1c6 Add STEP into menu label, enable drag and drop 2022-08-11 16:49:13 +02:00
YuSanka
2ac3861b2a Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-08 10:57:38 +02:00
YuSanka
066b567714 Using of wxWidgets 3.1.6 WIP:
* Create Cache of wxBitmapBundles instead of wxBitmaps
* Use wxBitmapBundles instead of wxBitmap for most of Widgets
* Use empty bitmabundles instead of wxNullBitmap for wxBitmapComboBoxes.
* Updated wxWidgets.cmake
* OSX specific: Discard BitmapComboBox overrides
+ some code cleaning
2022-07-29 11:21:54 +02:00
enricoturri1966
f0c1f9ebbd Follow-up of 6664ba3b80 - Fixed part positions after reload from disk called after loading multipart 3mf project 2022-07-25 08:54:24 +02:00
Michael Kirsch
6664ba3b80 fix reload loosing positioning information 2022-07-25 08:21:50 +02:00
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
2022-07-20 13:02:07 +02:00
YuSanka
89a7f6bdb1 Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut 2022-06-29 11:44:11 +02:00
YuSanka
dd6f7a71f1 Using of wxWidgets 3.1.6 WIP:
* Create Cache of wxBitmapBundles instead of wxBitmaps
* Use wxBitmapBundles instead of wxBitmap for most of Widgets
* Use empty bitmabundles instead of wxNullBitmap for wxBitmapComboBoxes.
* Updated wxWidgets.cmake
* OSX specific: Discard BitmapComboBox overrides
+ some code cleaning
2022-06-27 16:40:01 +02:00
Lukas Matena
9aa104d080 Revert "Merge branch 'pm_stable_meshfix' into dev_250"
This reverts commit 71a8ead282, reversing
changes made to a1143ab26e.
2022-06-17 16:13:18 +02:00
enricoturri1966
db31995310 Allow drag and drop on files into PrusaSlicer no matter which is the current selected tab 2022-06-16 11:12:45 +02:00
PavelMikus
20c91aa48e Meshfix integration into GUI 2022-06-07 11:10:51 +02:00
enricoturri1966
00878fb330 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES merged into ENABLE_WORLD_COORDINATE
Fixed conflicts during rebase with master
2022-06-06 13:36:29 +02:00
enricoturri1966
19712749c3 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Added reset button to remove skew, when detected, in object manipulator panel
Fixed conflicts during rebase with master
2022-06-06 10:00:28 +02:00
enricoturri1966
88ce6ccdef Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::scale(const Vec3d& scale, TransformationType transformation_type) to use matrix multiplication
Fixed conflicts during rebase with master
2022-06-06 09:54:19 +02:00
enricoturri1966
0e3490620e Added method const GLVolume* Selection::get_first_volume() const to simplify client code
Fixed conflicts during rebase with master
2022-06-06 08:44:11 +02:00
enricoturri1966
7e72963293 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - 1st installment. Geometry::Transformation modified to store data in a single matrix, without store the matrix components
Fixed conflicts during rebase with master
2022-06-03 13:58:36 +02:00
Lukas Matena
75a6f54f0b Fixed compiler warnings 2022-06-03 12:45:06 +02:00
enricoturri1966
90e54e5821 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES merged into tech ENABLE_WORLD_COORDINATE
Fixed conflicts during rebase with master
2022-06-03 09:57:07 +02:00
enricoturri1966
5e5fdc4844 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Volumes translation in all reference systems using Move gizmo and part manipulator fields
Fixed conflicts during rebase with master
2022-06-02 15:45:06 +02:00
enricoturri1966
fdc8a51d3c Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Fixed orientation for sidebar hints in 3D scene for part manipulation in instance and local systems
Fixed conflicts during rebase with master
2022-06-02 15:05:56 +02:00
enricoturri1966
79bdcefbde Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - 1st installment: introduction of instance reference system in part manipulation
Fixed conflicts during rebase with master
2022-06-02 14:58:44 +02:00
Filip Sykala
e0d5505413 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
2022-05-31 11:14:53 +02:00
tamasmeszaros
9892893587 Add UIThreadWorker for debugging and profiling purposes 2022-05-27 15:33:03 +02:00
YuSanka
496481e972 Cut WIP: Fix for Undo/Redo 2022-05-12 17:07:13 +02:00
YuSanka
279b116533 Cut WIP: Fix compilation warnings and errors 2022-05-09 16:52:02 +02:00
YuSanka
9582a9b478 Merge remote-tracking branch 'origin/master' into ys_cut 2022-05-09 11:25:29 +02:00
Filip Sykala
05354eda0c Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
2022-05-06 08:58:04 +02:00
YuSanka
881a5dbf37 Fix for #8228 - Model errors icon does not go away after proper model reloading 2022-05-02 15:10:24 +02:00
YuSanka
94f3aaacd4 Cut WIP: Undo/Redo implementation 2022-05-02 12:44:47 +02:00
Filip Sykala
3e9778b46b Merge branch 'et_world_coordinates' into fs_emboss 2022-05-02 10:11:47 +02:00
enricoturri1966
7af8f92f84 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-04-28 14:45:05 +02:00
YuSanka
73469ffa21 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-28 13:25:00 +02:00
enricoturri1966
36c317c0e5 Follow-up of dcbc5e1251 - Button label changed from Cancel to Ok 2022-04-28 10:43:21 +02:00
enricoturri1966
dcbc5e1251 Fixed typo into Plater::load_gcode leading to a message dialog without buttons 2022-04-28 09:55:05 +02:00
Lukas Matena
09fe421fe8 Merge branch 'stable' (no conflicts fixed) 2022-04-27 22:24:13 +02:00
Filip Sykala
7ec422d12f Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
2022-04-20 12:13:17 +02:00
enricoturri1966
8a36c12f13 Fixed conflicts after merge with master 2022-04-20 11:53:51 +02:00
YuSanka
91a1cd30a0 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-14 10:04:45 +02:00
YuSanka
09512c086b Fix for SPE-1220:
* Added check of the visibility for selected presets when Configuration is loaded from SLA archive or from the G-code.
* SLAImportDialog:
    * MSW specific: added dark mode
    * Center on parent
2022-04-13 18:15:46 +02:00
enricoturri1966
9c15952343 Fixed conflicts after merge with master 2022-04-13 15:37:12 +02:00
YuSanka
c29b7b1eef Cut WIP:
* Suppress to delete/add a SolidPart/NegativeVolume from/for objects which are marked as "is cut"
* Suppress to delete Instances which are marked as "is cut"
* Allow delete an object which is marked as "is cut", but show warning message about break of the "cut consistency".
  And if this deletion was performed, the all related objects will be unmarked.
* m_connectors_cnt is added into CutObjectBase class to correct synchronization of a connectors count between related objects
2022-04-13 13:11:41 +02:00
YuSanka
ed71887e35 Fix for #8122 - When you change setting with a blank project and go to exit it will ask you to save blank project, if you don't "save", prusa slicer wont' shut down
and #8076 - PrusaSlicer-2.4.1 does not close with no 3D-Model loaded and unsafed
2022-04-11 12:09:30 +02:00
YuSanka
a248490507 Fix for #7905 - Segfault when changing printer after loading 3mf with a different printer set
Update searcher only before open one of next dialogs : SearchDialog, UnsavedChangesDialog or DiffPresetDialog.
But only Search dialog respects to the mode of PrusaSlicer
2022-04-11 12:09:30 +02:00
YuSanka
463e9ab530 Cut WIP:
+ Added CutObjectBase class which contains cut attributes for object
+ ObjectList and ManipulationPanel :
    * Disable all ManipulationEditors for solid/negative volumes of cut object
    * Disable Scale/Size ManipulationEditors for objects/instances of objects which are CutParts of initial object
+ Scale/Rotation/Move gizmos are disabled for solid/negative volumes of cut object
+ Select whole CutParts of initial object when ScaleGizmo is active
2022-04-11 11:20:00 +02:00
Filip Sykala
8719ec8977 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Model.hpp
2022-04-05 15:55:24 +02:00
YuSanka
05e94eb0ab Fixed hard crash on "Convert from/to units" when several objects are selected
This crash was caused by commit 38b877635
2022-04-01 09:48:38 +02:00
YuSanka
807f380d3f Fix for #8091 - Design bug: Yes/No response to save dialogue 2022-03-31 14:34:53 +02:00
Filip Sykala
4acdd76fff Merge branch 'master' into fs_emboss 2022-03-30 09:29:06 +02:00