3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22342 commits 1 branch 1 tag 249 MiB
Commit graph

1783 commits

Author SHA1 Message Date
YuSanka
484eae7a1c Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-08 13:32:14 +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 - 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 - UI bug: profile edit controls hidden by scroll bars. 2022-08-23 17:31:13 +02:00
YuSanka
eac1191b25 Fix for - Changing colors doesn't qualify as a change to save project 2022-08-22 14:53:03 +02:00
YuSanka
cf144da4fe Cut WIP: Import/Export cut information to/from .3mf file 
+ Fixed a crash during change object selection, when CutGizmo is On
+ Fixed Undo/Redo (was accidentally broken with 7912613dc8)
 2022-08-22 10:09:32 +02:00
YuSanka
79e9df4b64 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-17 10:05:44 +02:00
Lukas Matena
bce2b148f4 Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED) 2022-08-15 13:41:40 +02:00
YuSanka
7912613dc8 Cut WIP: Fixed crash on second "Perform cut" 
+ some code cleaning
 2022-08-12 17:59:36 +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
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 - 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