Commit graph

614 commits

Author SHA1 Message Date
fieldOfView
d13b5adda6 Codestyle & comments
CURA-1619
2016-06-05 12:22:23 +02:00
Jaime van Kessel
783134031b Settings can now be set by extruder
CURA-340
2016-06-05 12:17:35 +02:00
Jaime van Kessel
64ded3299e Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-05 12:02:10 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model
CURA-340
2016-06-05 12:01:46 +02:00
Jaime van Kessel
eeb1882c2f Merge pull request #765 from thopiekar/master-buildtype-in-splashscreen
Fixing a typo
2016-06-05 11:38:20 +02:00
Jaime van Kessel
c79b7bdd7a Machine manager now creates ExtruderTrainStacks
CURA-340
2016-06-05 11:34:29 +02:00
Thomas Karl Pietrowski
d6acb78bd4 Fixing a typo
Had that change locally here, but for a reason I forgot to commit that
fix. Oops..
2016-06-05 09:59:57 +01:00
Jaime van Kessel
2f3352bfa0 Added default values when adding variant & materials
CURA-1612
2016-06-05 10:45:47 +02:00
Jaime van Kessel
cb0df43f4b Merge branch 'master-buildtype-in-splashscreen' of git://github.com/thopiekar/Cura into thopiekar-master-buildtype-in-splashscreen 2016-06-05 10:28:33 +02:00
Arjen Hiemstra
3413334c6d Update active material/quality when changing one of the lower levels
Contributes to CURA-1612
2016-06-04 21:17:27 +02:00
Thomas Karl Pietrowski
c62ab6e937 Adding a field of the build type to the spashscreen.
For example, if the community distributes Cura in a different way, they
can set CURA_BUILDTYPE via 'cmake -DCURA_BUILDTYPE=' and whenever Cura
is launched " (PPA)" will be appended. Of course, this could be done by
appending " (PPA)" to CURA_VERSION, but in case of my Ubuntu/Debian
packaging it will only need one modification in debian/changelog to
change the version. During build (debian/rules) this version will be
read from debian/changelog.
Changing the version number across different files, is a waste of time.

Finally, we can use that field in the future to indicate debug or other
other special builds.
2016-06-04 13:55:35 +02:00
Jaime van Kessel
490a8724e5 Fixed duplication of profiles
CURA-1427
2016-06-03 16:29:46 +02:00
Jaime van Kessel
d1d60e27cc Added function to duplicate container
CURA-1427
2016-06-03 15:25:08 +02:00
Jaime van Kessel
ea73f00aac Fixed case where validation state was set incorrectly
CURA-1585
2016-06-03 14:39:36 +02:00
Jaime van Kessel
b6b154e153 Fixed slowdown caused by validation check
CURA-1585
2016-06-03 13:34:06 +02:00
Jaime van Kessel
2b91b81f2d Added documentation
CURA-1585
2016-06-03 13:24:23 +02:00
Jaime van Kessel
5faf2f024f Added signal for validation state
This improves the runtime speed somewhat
CURA-1585
2016-06-03 13:14:49 +02:00
Jaime van Kessel
7b87143e65 Only value property events are now used
This speeds the num events up a bit, but it's still a tad to slow

CURA-1585
2016-06-03 13:07:35 +02:00
Jaime van Kessel
0dece95f0f Updating non-readonly profiles is now possible again
CURA-1585
2016-06-03 13:03:56 +02:00
Jaime van Kessel
d29cc37d6b Adds way to convert user settings into quality settings
CURA-1585
2016-06-03 11:58:59 +02:00
Jaime van Kessel
4fc565711d Added read-only property to profiles
CURA-1585
2016-06-03 11:19:33 +02:00
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