3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
3049 commits 307 branches 272 tags 787 MiB
Commit graph

542 commits

Author SHA1 Message Date
Ghostkeeper
8bd06ee8ec Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 14:09:38 +02:00
Jaime van Kessel
d5dbd0f77b Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 14:01:06 +02:00
Jaime van Kessel
990d05815b Added qml files to import path 2016-05-27 14:00:38 +02:00
fieldOfView
545678e18b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-27 11:54:24 +02:00
fieldOfView
6355631842 Activate another machine when we remove the currently active MachineManagerModel 
CURA-1278
 2016-05-27 11:53:53 +02:00
Jaime van Kessel
a9efa3e612 Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 11:27:16 +02:00
Jaime van Kessel
c914446060 Initial changes for perobject stuff 
CURA-1278
 2016-05-27 11:26:41 +02:00
Ghostkeeper
3311fa8033
Add resource type for extruder definitions 
The definition is derived with inheritance, just like the printers. Therefore I decided to call this 'ExtruderStack' in line with how the resource type for the printer is named.

Contributes to issue CURA-1278.
 2016-05-27 10:23:28 +02:00
fieldOfView
b60e704aa6 Fix typo 
CURA-1606
 2016-05-26 22:29:21 +02:00
fieldOfView
53661b2739 Ensure a machine gets a unique names when adding or renaming a machine 
CURA-1606
 2016-05-26 22:18:34 +02:00
fieldOfView
6bc61a6352 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 18:07:00 +02:00
fieldOfView
c01e7144d1 Consistently change the spelling of bounding box 
bounding box, bounding_box, boundingBox
 2016-05-26 18:06:40 +02:00
Arjen Hiemstra
7ce4e23677 Add all categories to default visible list 
Since otherwise none of the children will be visible

Contributes to CURA-1278
Fixes CURA-1614
 2016-05-26 15:52:36 +02:00
Arjen Hiemstra
386aec32a8 Merge branch 'settings_rework' 
Contributes to CURA-1278

* settings_rework: (224 commits)
  Improve slice trigger documentation
  Import Cura in materials preferences page so we can use the active definition id
  Add layer height to high quality profile so we have something that changes
  Update example XML material to use the right product names
  Filter available materials by the machine definition
  Show the add machine dialog when we do not have an active machine
  Create machine-specific material containers for machine specific overrides in XML material files
  When creating a new container stack, add empty containers for things where we cannot find containers
  Add preferred variant, material and quality to UM2+ definition
  Account for global container stack being None in the backend plugin
  Use the global stack instance variable and account for it potentially being None
  Store the global container stack as an instance property
  Added wildcard to filtering
  Per object settings filter now uses correct bool types (instead of strings)
  Removed stray = sign.
  Fix creating print job name
  Disable asynchronous loading of SettingItem when Qt Version < 5.5
  Document QTbug
  Properly serialise all settings to g-code file
  Document GCodeWriter class
  ...
 2016-05-25 15:12:25 +02:00
Arjen Hiemstra
a1d48fd511 When creating a new container stack, add empty containers for things where we cannot find containers 
Additionally, record this information in the metadata of the stack
 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
b1f887a70f Use the global stack instance variable and account for it potentially being None 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
2e0205f174 Store the global container stack as an instance property 
This reduces the amount of function calls and makes it simpler to check
for container existance
 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
eb8b3e01e3 Properly catch exceptions when serializing containers and check for dirty state 2016-05-23 18:21:23 +02:00
Ghostkeeper
d235b36692 Fix computation of material length from volume 
The setting value was obtained wrongly.

Contributes to issue CURA-1278.
 2016-05-23 17:19:18 +02:00
Arjen Hiemstra
63b623a6ef Move global_only property declaration to before the super() call so containerregistry knows about it when loading 
Also, properly set its type to function and default to False
 2016-05-23 02:18:20 +02:00
Ghostkeeper
117973ee25 Add todo message for adding profile readers 
This should be done when we have a working profile manager again.

Contributes to issue CURA-1278.
 2016-05-20 16:22:10 +02:00
Ghostkeeper
5a28eca203 Add profile reader plug-in type 
This type of plug-in will load a file as an instance container of the user profile type.

Contributes to issue CURA-1278.
 2016-05-20 16:22:10 +02:00
Ghostkeeper
85ce8a719e Merge local with origin 
Contributes to issue CURA-1278.
 2016-05-20 16:22:10 +02:00
Jaime van Kessel
295cea338c Translate tool is now no longer stopped by ton of errors 
CURA-1278
 2016-05-20 14:09:58 +02:00
Jaime van Kessel
305cb27ac0 Global_only is now a string, as the filtering does not work with settingFunctions 
CURA-1278
 2016-05-20 13:35:38 +02:00
Jaime van Kessel
2fa24edc1f Fixed type for global_only property 
CURA-1278
 2016-05-20 11:29:48 +02:00
Jaime van Kessel
e20691c421 Fleshing out of SettingOverrideDecorator 
CURA-1278
 2016-05-19 11:41:10 +02:00
Jaime van Kessel
7ec3ca6e75 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-19 11:25:47 +02:00
Jaime van Kessel
0e792e7a22 Added SettingOverrideDecorator stub 
CURA-1278
 2016-05-19 11:25:25 +02:00
Ghostkeeper
6b0a33e166 Move dual extrusion settings into FDMPrinter 
This involves making labels and descriptions for some dual-extrusion machine settings, and default values for everything, making sure inheritance is correct, etc.

Contributes to issue CURA-1278.
 2016-05-18 17:53:43 +02:00
Ghostkeeper
3b5a74047b Add setting instance type for extruder 
This type is not included in the global stack structure yet since there is no global stack structure per extruder yet.

Contributes to issue CURA-1278.
 2016-05-18 17:53:43 +02:00
Arjen Hiemstra
b621958098 Fix uses of getValue after its removal from Uranium API 2016-05-18 16:45:44 +02:00
Jaime van Kessel
a5f8546d69 Fixed cases where getValue was still used. 
We now use getProperty instead

CURA-1278
 2016-05-18 16:29:57 +02:00
Ghostkeeper
222d8ba828 Merge branch '2.1' 2016-05-18 12:46:07 +02:00
Jaime van Kessel
dafff9159e Added materials & qualities 
CURA-1278
 2016-05-18 11:03:44 +02:00
Arjen Hiemstra
0664cbd2f6 Make sure to set the right type for the "current settings" instance container 2016-05-17 18:37:18 +02:00
fieldOfView
c4c6be7c34 Improve code legibility 
CURA-1543
 2016-05-17 14:56:05 +02:00
Jaime van Kessel
ffcfba2caa Cura now handles saving of instances & stacks 
This is done because Cura has a fundamentally different strategy for this than Uranium.

CURA-1278
 2016-05-17 14:46:51 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception 
CURA-1278
 2016-05-17 12:55:40 +02:00
Jaime van Kessel
59ec593db5 Added way to change active quality 
CURA-1278
 2016-05-17 10:49:06 +02:00
Jaime van Kessel
9bfe31aeef Added quality type to setting stack 
CURA-1278
 2016-05-17 10:39:10 +02:00
Jaime van Kessel
62cdde1a9b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-17 09:43:26 +02:00
Simon Edwards
442b9f2af3 Rename 'tmp' to something a bit more meaningful. 
Contributes to CURA-1512
 2016-05-17 09:43:14 +02:00
Arjen Hiemstra
d1d2e1cea7 Set the right defaults for setting visibility in Cura 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
5ff5ed3856 Add an "activeDefinitionId" property to MachineManager 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
efdf1d78d1 Add a "Current Settings" instance container to the stack on stack creation 2016-05-16 18:21:57 +02:00
Arjen Hiemstra
08afad8973 Remove get/setSettingValue from CuraApplication 
They are unused and should not be used anyway
 2016-05-16 18:16:42 +02:00
fieldOfView
12638f3601 Make machine prefix for jobname optional 
CURA-1480
 2016-05-13 19:04:32 +02:00
Jaime van Kessel
ed49831785 Last active machine is now restored upon restart 
CURA-1278
 2016-05-13 15:24:49 +02:00
Jaime van Kessel
dd24e488a8 Materials & variants are now correctly checked when active 
CURA-1278
 2016-05-13 12:04:38 +02:00