Commit graph

693 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
YuSanka
7ebd0bbb3b Fix for - Don't set printable state on merge if all parts are unprintable 2022-08-12 11:08:04 +02:00
YuSanka
2ac3861b2a Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-08 10:57:38 +02:00
enricoturri1966
86a5280ff6 Added handling of event wxEVT_DATAVIEW_ITEM_ACTIVATED in ObjectList to fix behavior when double clicking on list items 2022-07-29 11:59:02 +02:00
YuSanka
f8477d1be6 Using of wxWidgets 3.1.6 WIP: Linux/OSX specific fixes
OSX specific: Fixed get_mouse_position_in_control().
+ Use GetItemRect() to calculation of the position and size for Extruder selector

Linux specific:
* Use just 1.0 scale for wxBitmapComboboxes under GTK3 and gtk3
* GTK2 specific: use GTK2 doesn't suppost get_scale, so scale bitmap size form em_unit()
2022-07-29 11:21:54 +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
YuSanka
31800bb85d GizmoScale: Suppress ununiversal scale for cut objects
+ Gizmos/GLGizmoRotate: Deleted changes which was made for GizmoCut, but aren't used any more
2022-07-28 14:23:51 +02:00
YuSanka
0fd29dfec7 Cut WIP: Suppress un-universal scaling for cut objects
Added editing of the tolerance
2022-07-22 16:38:28 +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
07d455a125 Cut WIP: some UI improvements
+ partially reverted 63890b5f8d
2022-07-11 10:42:57 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED):
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
YuSanka
89a7f6bdb1 Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut 2022-06-29 11:44:11 +02:00
YuSanka
ae08819a24 Using of wxWidgets 3.1.6 WIP: Linux/OSX specific fixes
OSX specific: Fixed get_mouse_position_in_control().
+ Use GetItemRect() to calculation of the position and size for Extruder selector

Linux specific:
* Use just 1.0 scale for wxBitmapComboboxes under GTK3 and gtk3
* GTK2 specific: use GTK2 doesn't suppost get_scale, so scale bitmap size form em_unit()
2022-06-27 16:40:01 +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
Lukas Matena
60894a26dd Fix of 8342 (deselection when changing object-specific settings) 2022-06-08 14:49:31 +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
b76f9fc2ee Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Scaling using object manipulator fields
Fixed conflicts during rebase with master
2022-06-06 12:38:20 +02:00
enricoturri1966
e3d648c802 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reoworked calculation of volume matrix for newly added modifiers and parts
Fixed conflicts during rebase with master
2022-06-06 12:16:17 +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
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
enricoturri1966
23b5860e35 Tech ENABLE_WORLD_COORDINATE - Fixed visualization of sidebar hints when editing values in Object manipulation fields while using an MMU printer 2022-06-02 13:39:01 +02:00
YuSanka
91a1cd30a0 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-14 10:04:45 +02:00
YuSanka
87e1df2fb2 Cut WIP: Lock icon is added for objects after a cut performing
* ObjectDataViewModel: Some code refactoring to update bitmap in respect to the warning mane and lock appearance
2022-04-13 13:16:29 +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
e50e999b8e Merge branch 'master' into fs_emboss 2022-03-25 09:16:01 +01:00
David Kocik
8202862809 object info notifiction not show on copy obj 2022-03-24 12:37:55 +01:00
YuSanka
b204f05809 Cut: ObjectList: Show info about added cut connectors.
+ Some code refactoring: Put CutConnectorsType, CutConnectorsStyle and CutConnectorsShape to the Model.hpp.
2022-03-14 16:54:50 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	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/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
enricoturri1966
7d87490777 Tech ENABLE_RELOAD_FROM_DISK_REWORK - A bunch of bug fixes in Reload from disk command:
1) Lost orientation after reload from disk (SPE-1182)

2) Wrong objects replacement from reload from disk command (SPE-1183)

3) Reload from disk not disabled for built-in models (SPE-1184)
2022-02-02 14:25:36 +01:00
Lukáš Hejl
c2258dead7 Fixed destructors of DiffViewCtrl and ObjectList after 8342b7f95b and 0726b46da2. 2022-01-31 14:36:06 +01:00
Filip Sykala
53ee0092b0 Create emboss object on cursor position 2022-01-28 18:00:10 +01:00
Lukáš Hejl
0726b46da2 Added deallocation of ObjectList::m_objects_model into the ObjectList destructor. 2022-01-28 14:43:10 +01:00
enricoturri1966
2cebe16663 Tech ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL - Removal of wipe tower magic object_id equal to 1000 2022-01-17 15:56:58 +01:00
YuSanka
1955baa14b GUI_ObjectList: Get list of the loaded files before a taking of Undo/Redo snapshot
+ Fixed localization for the "Post processing" description line
2021-12-17 12:49:55 +01:00
enricoturri1966
818a92497a Fixed call to take_snapshot() in ObjectList::load_subobject() 2021-12-16 12:03:11 +01:00
Filip Sykala
88523bceb6 Merge branch 'master' into fs_emboss 2021-12-13 10:52:04 +01:00
YuSanka
080e80a4d6 Localization: Next improvements: CS, IT, ES, DE, ES, FR 2021-12-10 17:28:36 +01:00
YuSanka
14749d3c73 Code refactoring for ObjectList::get_selection_indexes().
Assert is changed to check if selection isn't empty.
Elsewhere processing of the empty selection can causes a crash.
2021-12-10 17:10:09 +01:00
enricoturri1966
8df5202e74 - Fixes in reload from disk command 2021-12-10 14:36:28 +01:00
Vojtech Bubnik
bfce4f6901 Follow-up to 3622f06bed
Work around 3D scene focus after de-activation of the main
window without having to resort to CallAfter(), which breaks
on Linux with some window managers that follow mouser cursor.
Fixes   

3622f06bed was not a correct solution,
it broke focus for non-modal windows.
Fixes 

The actual issue seems to be caused by wxProgressDialog not playing
well with modal dialogs closed just before wxProgressDialog opens.
If wxProgressDialog parent was not a main frame, keyboard focus
was not restored correctly after the wxProgressDialog closed.
2021-12-05 09:09:34 +01:00
Filip Sykala
8699d04dc9 Merge branch 'et_world_coordinates' into emboss_local
# Conflicts:
#	src/slic3r/GUI/Plater.cpp
2021-12-02 13:05:43 +01:00
Filip Sykala
d698df2c31 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
2021-12-01 14:35:42 +01:00
enricoturri1966
ad72e29612 Fixed conflicts after merge with master 2021-11-30 13:58:06 +01:00
Filip Sykala
43d200a7fb Using of Re run Job 2021-11-23 22:21:14 +01:00
YuSanka
7828964f8c Fix for - Filename containing chars not usable on FAT result in error and crash in gcode export 2021-11-23 13:53:58 +01:00
Filip Sykala
eba68f9a9e Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
2021-11-23 09:09:09 +01:00