GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-12 22:41:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,448 Commits 131 Branches 318 Tags
Commit Graph

1672 Commits

Author SHA1 Message Date
YuSanka
1f1ed048db Fixed context menu for Text 2022-10-03 11:22:41 +02:00
Filip Sykala - NTB T15p
0e3b7cae12 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
 2022-09-29 18:47:21 +02:00
enricoturri1966
3513b800a0 Tech ENABLE_PREVIEW_LAYOUT set as default 2022-09-29 14:23:41 +02:00
Filip Sykala - NTB T15p
00db58c823 Disallow arrange and add instance when emboss gizmo is opend -- prevent strobo effect during editing emboss parameters. 
Fix issue 40
 2022-09-23 12:58:01 +02:00
Filip Sykala - NTB T15p
ed6a1b18f3 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-09-14 11:28:36 +02:00
YuSanka
0b8d7380ff DiffDialog: Implemented a transfer of options from one preset to another 
Related to [Feature Request] #5384 - Copy values in Profile comparaison dialog
 2022-09-13 17:30:22 +02:00
enricoturri1966
380f8ea8d5 Follow-up of db31995310c1743faa0c1ce9d3135af6cb7e2c71 - Fixed opening of gcode files when dragging and dropping them into GCodeViewer 2022-09-09 09:31:34 +02:00
enricoturri1966
134d34179c Added handling of unhandled exception when trying to override a 3mf file in a protected folder 2022-09-07 11:01:35 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
 2022-08-31 15:22:10 +02:00
YuSanka
8443e763c7 Fix for #8693 - GUI: Layout of "Object Manipulation"-Panel is broken (Linux GTK3) 2022-08-24 11:03:11 +02:00
YuSanka
c774603179 GTK3 specific: Follow-up b19ae0df5b - Fix for build 2022-08-24 09:45:38 +02:00
YuSanka
b19ae0df5b Fix for #8738 - UI bug: profile edit controls hidden by scroll bars. 2022-08-23 17:31:13 +02:00
YuSanka
eac1191b25 Fix for #8710 - Changing colors doesn't qualify as a change to save project 2022-08-22 14:53:03 +02:00
Lukas Matena
bce2b148f4 Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED) 2022-08-15 13:41:40 +02:00
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
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 6664ba3b80d2723f89a244096c8575c05477db3b - 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
Lukas Matena
9aa104d080 Revert "Merge branch 'pm_stable_meshfix' into dev_250" 
This reverts commit 71a8ead28207b61b34f11e767bceff28609bfd66, reversing
changes made to a1143ab26e532c5bee616d4ec9b144091d57847a.
 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
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
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
enricoturri1966
36c317c0e5 Follow-up of dcbc5e1251849acc5a5c2e29f6086b3f200b307f - 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
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
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
Filip Sykala
8719ec8977 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Model.hpp
 2022-04-05 15:55:24 +02:00