3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
9150 commits 306 branches 270 tags 779 MiB
Commit graph

9150 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
3e9fdb5db1 Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes 2017-04-24 13:11:10 +02:00
Arjen Hiemstra
49bdb78219 Use cura. for imports instead of relative imports` 
Matches the style of the rest of the file.
 2017-04-24 13:11:04 +02:00
Jaime van Kessel
fb0df3109c Fixed inhertiance manager getting update from a Category setting 2017-04-24 13:10:33 +02:00
Jaime van Kessel
2297a6e80b Fixed inhertiance manager crashing if there is no parent 2017-04-24 13:05:39 +02:00
fieldOfView
fab0fa1dde Move setting values that are settable per extruder from/to global stack when setting extruder count 2017-04-24 12:58:20 +02:00
MaukCC
dff23b0e82 Update cartesio_0.8.inst.cfg 2017-04-24 11:06:34 +02:00
fieldOfView
c1fa927118 Make the general settings page options draggable only in the vertical direction 
... to match other scrollviews. Fixes #1723
 2017-04-22 23:07:13 +02:00
fieldOfView
d2d36b8c98 Lower extruder_nr settings when they exceed the number of extruders 2017-04-22 12:17:16 +02:00
fieldOfView
2ca24ba7e6 Restore both material and variant to match 1st extruder when switching to single extrusion 2017-04-22 11:20:55 +02:00
fieldOfView
8d42f9c187 Move some convoluted logic from QML into Python 2017-04-22 10:13:58 +02:00
fieldOfView
933ee408e4 Code style 2017-04-22 09:47:00 +02:00
fieldOfView
0966ef5338 Fix QML warnings when switching to an extruder tab 2017-04-21 21:48:20 +02:00
fieldOfView
656e7a8046 Change the scope of the head polygon functions to be inside the main tab 2017-04-21 21:27:15 +02:00
fieldOfView
ba229444b7 Pause autoslicing while the MachineSettingsAction is open 
Each setting-change would cause a reslice, which is unnecessary.
 2017-04-21 21:05:28 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
Ghostkeeper
fb674ec135 Merge remote-tracking branch 'origin/master' 2017-04-21 14:28:22 +02:00
Ghostkeeper
15f5a7f8c4 Revert "Drop in experimental profiles for external testing" 
This reverts commit 1feaace285.
 2017-04-21 13:30:29 +02:00
Ghostkeeper
1feaace285
Drop in experimental profiles for external testing 
A few external beta testers wanted to have these CPE(+) profiles to test with. I'm making a build that allows them to test this on MacOS.
 2017-04-21 11:52:27 +02:00
MaukCC
36eb3579a9 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 11:30:49 +02:00
MaukCC
ad4c696202 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 11:30:39 +02:00
MaukCC
d2a948fb5c Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 11:30:15 +02:00
MaukCC
39ac11df59 Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 11:30:09 +02:00
Victor Larchenko
e47ca7a68d Merge remote-tracking branch 'um/master' into gcode-keywords 2017-04-21 14:36:22 +06:00
MaukCC
d5190b7cf7 Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:33:45 +02:00
MaukCC
2b31aab28c Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:33:38 +02:00
MaukCC
25ff28041f Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:33:30 +02:00
MaukCC
d756ea5021 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:33:21 +02:00
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06:00
MaukCC
319690baa6 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:27:05 +02:00
MaukCC
7e426f96fb Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:26:39 +02:00
MaukCC
c80b51ddc9 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:26:28 +02:00
MaukCC
081505e967 Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:26:02 +02:00
MaukCC
17408a299f Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:19:44 +02:00
MaukCC
c160e4c5d6 Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:19:38 +02:00
MaukCC
633c4b87e4 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:19:30 +02:00
MaukCC
ea56830880 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:19:21 +02:00
MaukCC
c75a2941be Add files via upload 2017-04-21 10:07:25 +02:00
Arjen Hiemstra
3d5e535b69 Select the object underneath the cursor on context menu request 
Contributes to CURA-3609
 2017-04-20 17:53:05 +02:00
Arjen Hiemstra
05e1de2fb3 Deprecate the delete/multiply/center methods in CuraApplication 
Since they should no longer be used by the UI.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
e108bd0627 Add extruder selection to Context menu 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
9fd0239cd5 Add a selectedObjectExtruders property to ExtruderManager 
It exposes a list of the extruders used by the current selection.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
5f65cb25c6 Add a setSelectionExtruder method to CuraActions 
Can be used to set the extruder used for the selection

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
61f542c215 Add a SetObjectExtruderOperation class 
It handles setting an extruder for an object.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
03ccdec861 Call the right methods of CuraActions in Actions.qml 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
b56802a523 Add a deleteSelection method to CuraActions 
It does the same as CuraApplication::deleteSelection but this is a
better place for it.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
c21895de97 Add a multiplySelection method to CuraActions 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
905e59354b Change MultiplyObjectsJob to work on a list of objects 
This makes MultiplyObjectsJob able to handle a list of objects instead
of a single object ID.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
97fd35c21d Add a centerSelection method to CuraActions 
Can be used to center all selected objects.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
8e95c894fb Add material and variant names to ExtruderModel 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00