GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 08:08:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,972 Commits 290 Branches 260 Tags
Commit Graph

2972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
11cb9af97f fixed typo 2016-06-02 17:32:26 +02:00
Jaime van Kessel
f115fd0619 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-02 17:27:37 +02:00
Jaime van Kessel
95a0c69662 Bit of code refactoring to prevent duplication 
CURA-1288
 2016-06-02 17:25:34 +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
1a30dd96b1
Change setting type for extruder_nr settings 
This way it can determine the difference between an integer and an index in the extruder list.

Contributes to issues CURA-1278.
 2016-06-02 16:09:10 +02:00
Ghostkeeper
7146c9ab7d
Make a drop-down box for selecting an extruder 
For use by settings such as infill_extruder_nr.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-02 16:09:10 +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
1ae69b25fa Added documentation 2016-06-02 16:07:09 +02:00
Jaime van Kessel
2ed518c47e Removed no longer used code 
CURA-1278
 2016-06-02 16:02:47 +02:00
Jaime van Kessel
edd5eecc3d Per object settings no longer show depth identation, revert/inherit buttons 
CURA-1278
 2016-06-02 15:53:00 +02:00
Jaime van Kessel
64e4cd0041 Added properties to make setting items more customisable 
CURA-1278
 2016-06-02 15:52:25 +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
Jaime van Kessel
2abbb5c9a1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-02 14:20:14 +02:00
Jaime van Kessel
c994cb6bef Slicing no longer occurs when a perObject setting is in error state 
CURA-1288
 2016-06-02 14:19:39 +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
b9f2d498b4
Fix typo in documentation 2016-06-02 14:17:12 +02:00
Jaime van Kessel
ca218d7a1f Removed too generic exception handling 
CURA-1278
 2016-06-02 13:52:11 +02:00
Jaime van Kessel
a33b6c2cd3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-02 13:42:10 +02:00
Jaime van Kessel
1af6e63b35 Removed unused model 2016-06-02 13:41:46 +02:00
fieldOfView
14a8b8a1a4 Fix showing formatted tooltip when exiting reset-value-icon 
CURA-1278
 2016-06-02 13:30:26 +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
fieldOfView
e03f65c471 Remove stray debug print 
CURA-1278
 2016-06-02 11:12:37 +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
7f7b56ff08 Add additional quality profiles 
Low quality and machine-specific qualities for UM2+

Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
5ce9bc64f4 Remove non-xml material profiles 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
48c8e7a189 Update generic PLA profile 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
6847365e09 Indicate the UM2+ should use machine specific materials and qualities 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
2b91e3639e Add basic ABS and CPE material profiles 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
ceb21ce89b Filter material/quality by machine only when we should filter 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00