Commit graph

671 commits

Author SHA1 Message Date
YuSanka
50ef968f59 ObjectList: When object contains only one volume and it's text:
* Add menu item "Edit text" for object menu.
* Apply volume name to the object name
2022-11-11 15:50:43 +01:00
Filip Sykala - NTB T15p
c77f8373bd Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Selection.hpp
2022-11-07 15:44:33 +01:00
YuSanka
380c746871 Linux specific issue: Prevent ObjectList's events, when updating the volumes in object.
On Linux DeleteVolumeChildren() called the update selection event, what caused the unexpected one by one selection of all volumes in object.
2022-11-07 13:47:34 +01:00
YuSanka
7742ebb813 ObjectList: Fixed position of the added sub-object, when it is Slab 2022-10-31 12:55:43 +01:00
YuSanka
1c061dc7a1 After merge fixes 2022-10-27 14:23:50 +02:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
YuSanka
dd8234512b Changes in wxWidgets.cmake to support of the updated wxWidgets v3.2.0-patched
+ ObjectList: Deleted code, which is no needed after update of wxWidgets
2022-10-27 09:11:06 +02:00
YuSanka
bba6d8b94d Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-10-25 16:16:36 +02:00
YuSanka
18edc71254 Cut WIP: Code refactoring for ae21667786
+ ObjectList: Fixed list of the types for "Change type" dialog, when object is cut.
+ CutGizmo:
  * Warning line is extended for information about invalid connectors
  * Fixed a crash on undo/Redo, when cutGizmo is active
2022-10-25 15:54:52 +02:00
Filip Sykala - NTB T15p
f7f4b28f73 Change wxString to string 2022-10-21 17:26:25 +02:00
YuSanka
7bb0b7eefc Cut bug fixing: Fixed a place of connectors after several cutting
+ Added info about camera direction to a DEBUG window
+ Code factoring (deleted unused code)
+ Fixed build warnings
2022-10-20 16:34:21 +02:00
Filip Sykala - NTB T15p
a752ccb420 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
2022-10-19 19:35:31 +02:00
enricoturri1966
71660a281b Tech ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL set as default 2022-10-19 08:52:35 +02:00
YuSanka
3a21f156c0 Cut Improvements/Bug Fixing
* Context menu: Suppress "Simplify model" for cut object
* CutGizmo:
  * Disable gizmo for dowel object
  * Invalidate cut plane position after update of Bounding box
  * Suppress Frustum style for connectors with Dowel type
  * Rectangle selection: Fixed processing on LeftUp
* Selection on Canvas: Suppress to move NEGATIVE_VOLUME if it's a connector
* Model:cut: Fixed a bug in add_cut_volume(). Cut info wasn't copied to the new volume
2022-10-18 14:13:50 +02:00
YuSanka
13e4e85e3d Cut bug fixing:
Model: fixed looks_like_imperial_units(). This function respects to cut status now.
To be detected as looks_like_imperial_units, all parts of cat object have to be looks_like_imperial_units().

ObjectList: Fixed update after adding/deleting of the modifiers for cut object

GUI_Factories: Fixed a place of the "Invalidate cut info" item in object menu
2022-10-17 15:49:43 +02:00
YuSanka
64c57faf8f Cut Improvements: Fixed Undo/Redo for cut performance
+ ObjectList: Fixed items update after Invalidate cut information
+ CutGizmo: Fixed wrong mode selection after delete object and that add new
2022-10-17 12:15:10 +02:00
YuSanka
85af9b93f1 Cut: Fixes and improvements for object's context menu
* Disable or delete some menu items, which are inappropriate for cut objects
* For cut objects added menu item "Invalidate cut info" to disconnect related cut parts of initial object
* If just one part is kept after cut performance, than don't apply a cut info for this object.

+ CutGizmo: Fixed selection of the mode
   An object has connectors         -> Connectors mode
   An object doesn't has connectors -> CutPlane mode
2022-10-07 16:26:19 +02:00
YuSanka
a8440db5ec Cut WIP:
* ObjectList & Selection: Show Connectors in the Scene, when CutConnectors Item is selected
* ObjectList: refactoring: extract the adding of volumes to the add_volumes_to_object_in_list()
* If some connector is selected on 3dScene -> select all connectors of this object
* GLGizmoScale3D : check if grabber is enabled, when do rendering
+ GLGizmoCut: refactoring : split render_cut_plane_grabbers to several functions
2022-09-30 14:07:17 +02:00
YuSanka
0201a5055a Cut WIP:
* Suppress to split cut objects
* ObjectList:
  * Use another icons to mark the cut objects and connectors 
  * For the cut object show parts, which are not connectors
* Set different colors for the Plugs and Dowels
* CutGizmo:
  * Invalidate CutGizmo after changes in ObjectList or perform a cut
  * CupPlane in Connectors mode: Unselect selection, when click on empty space
  * Connectors mode: Fixed performance issue
2022-09-27 16:17:09 +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
484eae7a1c Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-08 13:32:14 +02:00
YuSanka
39788066e2 Fix for - MMU - Allow user to choose initial extruder but then also change extruder at layer height
1. Fix for detection of the DoubleSlicer mode => An extruder for the Height Range modifiers have to be ignored, if it's default.
2. OSX only: Extruder selection wasn't editable for Height Range modifiers
2022-09-02 14:36:40 +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
98e94c3329 Fix for - Remember Size/Location of Shape Gallery window box 2022-08-24 16:49:38 +02:00
YuSanka
79e9df4b64 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-17 10:05:44 +02:00
YuSanka
5ec84adb14 Cut WIP: Add only needed modifiers 2022-08-17 09:58:20 +02:00
YuSanka
a8919b1e91 Cut WIP: Set all dowels as a separate objects
ObjectList: Don't show connectors for cut objects
2022-08-15 16:55:17 +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
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