3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
3049 commits 306 branches 272 tags 787 MiB
Commit graph

542 commits

Author SHA1 Message Date
Jaime van Kessel
113da81db5 Added isValidGlobalStack property to MachineManager 
CURA-1585
 2016-06-03 10:29:19 +02:00
Jaime van Kessel
171adde6be Fixed broken signal when file was loaded 2016-06-03 10:15:01 +02:00
Jaime van Kessel
3d47e3528a Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-03 10:06:41 +02:00
Jaime van Kessel
ad35c9f070 Added reload profile (simply clears user instance container) 
CURA-1278
 2016-06-03 10:06:08 +02:00
fieldOfView
d7148844ac Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-02 17:44:29 +02:00
fieldOfView
0dec0aafcf Fix exception when loading an object 
CURA-1619
 2016-06-02 17:44:06 +02:00
Jaime van Kessel
11cb9af97f fixed typo 2016-06-02 17:32:26 +02:00
Arjen Hiemstra
e36397fa29 Use the new empty type-specific containers when adding a new machine 
Contributes to CURA-1612
 2016-06-02 17:21:49 +02:00
Arjen Hiemstra
4cd224aeb2 Add empty variant, material and quality containers 
Since we need these for making container switching work.

Contributes to CURA-1612
 2016-06-02 17:21:49 +02:00
fieldOfView
184247ced6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-02 16:38:41 +02:00
fieldOfView
bb18bf6a30 Fix creating a jobname after loading a file 
Moves jobname creation out of qml and into python.
CURA-1619
 2016-06-02 16:38:06 +02:00
Arjen Hiemstra
186eca160b Fix containersChanged signal handlers 
Fixes CURA-1642
 2016-06-02 16:25:13 +02:00
Ghostkeeper
84fc7948ce
Expose ExtrudersModel to QML 
It is required by the drop-down for extruder settings.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 16:09:10 +02:00
Ghostkeeper
05243a4fca
Connect to function, not result of function 
The result of the function was None, but I don't need None to be called whenever extruders changed. I need the function itself to be called.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 16:09:10 +02:00
Ghostkeeper
64ef5ab3a4
Inherit from class, not module 
This is an import fail on my part, sorry.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 16:09:10 +02:00
Jaime van Kessel
388a345140 Changing a per-object setting now forces a re-slice 
CURA-1278
 2016-06-02 14:42:48 +02:00
Ghostkeeper
45d01bf371
Remove unused import 
This was no longer needed since ExtruderManager is now a singleton. It's no longer in CuraApplication.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:13 +02:00
Ghostkeeper
f18eeba793
Add extruder setting type 
This is a new data type. It behaves and saves just like an integer, but it's actually just an index of the extruder to use.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
c24f4be8ae
Add extruders model 
Hasn't been tested much because there is no display for this in the front-end yet. It needs a setting data type to go with in order to display it. This model is for the drop-down boxes to select an extruder to print, for instance, the support with.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
e16fedf2d8
Changing name of extruder also changes name in container stack 
This name may be used to get a unique human-readable name. Just for consistency really.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
df363a024a
Expose definition container of extruders 
This contains important metadata which we'll need.

It's also more consistent with the rest.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
25a6a99286
Make name of extruder a property 
This stores the name for later use, for instance when displaying the extruder.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
8a8de95969
Add iteration over extruder manager 
This iteration iterates over the extruders.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
8369316236
Use modern import method 
This is more robust to cyclic dependencies, and also the intended way of importing these classes in Python in general.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
8a8b0016ba
Add signal for when extruder list changes 
The ExtrudersModel will need to listen to this.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
06f7f90bb0
Make ExtruderManager into a singleton 
This way we don't need to load it in CuraApplication but we can just load it whenever it is first needed. ExtruderManager should be robust against initialising it at any point in Cura's runtime.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
1f9805a73c
Remove unused imports 
These are unused because the code was moved to Extruder.py

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
95e633f16c
Load extruder manager on start-up 
This will consequently also load all extruder stacks of the current machine whenever the current machine changes.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 11:17:52 +02:00
Ghostkeeper
73f12ffd99
Incorporate switching of global extruder stack 
When the global extruder stack switches, we need to re-connect the reloading of extruders to the new containersChanged signal of the new global container stack. This now also bootstraps the listening for the first time, when the global container stack changes from None to the first stack.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 11:17:52 +02:00
Ghostkeeper
c369202957
Fix unknown variable 
Was probably a copy-paste mistake here. Fixed it for him.

Contributes to issue CURA-1278.
 2016-06-02 11:17:52 +02:00
Ghostkeeper
1603bb3075
Give access to nozzle, material and quality profiles 
You can now swap them out in the extruder model.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 10:56:17 +02:00
Ghostkeeper
9772d95984
Add user profile to extruder stack 
This profile is empty to start with. The user can fill it.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-02 10:56:17 +02:00
Ghostkeeper
7993775feb
Make profiles only load if the extruder says it has them 
For instance, only load materials if has_materials is True.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-02 10:56:17 +02:00
Ghostkeeper
72bc68f38a
Use self._definition instead of local definition parameter 
This is supposedly more defensive coding.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 10:56:17 +02:00
Arjen Hiemstra
123af4e3e4 Use metadata to determine what materials/qualities to use when adding a machine 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Ghostkeeper
0e108f0c04
Document filtering nozzles by extruder better 
Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 15:12:20 +02:00
Ghostkeeper
91fc90a423
Link extruder stack to global container stack 
Each extruder stack is linked to the same global container stack.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 15:05:14 +02:00
Ghostkeeper
d1566ef637
Also reload extruders at init 
Not a reload really, just a load.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 14:55:15 +02:00
Ghostkeeper
60a71fcc33
Only list extruders in extruder manager 
Let the extruders themselves take care of which profiles are attached to each.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 14:54:30 +02:00
Ghostkeeper
377fed206c
Remove extruder creation logic from manager 
This logic is now in cura/Extruder.py.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 13:52:57 +02:00
Ghostkeeper
48eb8de9a1
Add basic extruder implementation 
This implementation can load an extruder from a definition container, but doesn't expose anything (yet). It is intended to function in much the same way as a definition model, so it must expose its relevant properties to QML.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 13:52:57 +02:00
Ghostkeeper
a08e71774d
Make ExtruderManagerModel no longer a PyQt model 
It is still a model according to the MVC paradigm but not according to Qt. To be consistent with the rest, don't call it a model any more.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 12:03:01 +02:00
Arjen Hiemstra
f21e48adbb Register all QML files in Cura's QML directory as part of the Cura module 
Jaime asked for it.
 2016-05-31 18:07:33 +02:00
Arjen Hiemstra
4dffc414fb Make convex hull decorator respond properly to property change events 
Fixes CURA-1460
 2016-05-31 18:07:33 +02:00
fieldOfView
3638890138 Renaming a printer in the Manage Printers dialog is now reflected in the sidebar again 
Contributes to CURA-1632
 2016-05-31 15:26:38 +02:00
Ghostkeeper
d7eda39cb0 Basic extruder manager model implementation 
This implementation is currently not used, and also still leaves its container stacks empty. But still...

Contributes to issues CURA-1278 and CURA-351.
 2016-05-30 17:05:15 +02:00
Arjen Hiemstra
bdc8fdf508 Turn CuraApplication::_onExit into public api as saveSettings 
Since we need it for the autosave plugin

Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Jaime van Kessel
c1b64274e8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 15:29:15 +02:00
Jaime van Kessel
89c1136d7f Per object settings can now be added & changed 
CURA-1278
 2016-05-27 15:28:54 +02:00
Ghostkeeper
41425fd36e
Replace symbols in default visible settings before usage 
These characters are just for visualisation in the code. They should never be used during the normal operation of the program, nor should they be saved to the file. So just replace them immediately.

Contributes to issue CURA-1278.
 2016-05-27 14:39:53 +02:00