1319 Commits

Author SHA1 Message Date
Jaime van Kessel
b63c308694 Changed order of loading containers so extruder stacks don't fail anymore
CURA-340
2016-06-05 12:45:02 +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
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
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
171adde6be Fixed broken signal when file was loaded 2016-06-03 10:15:01 +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
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
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
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
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
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
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
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
Tim Kuipers
b8df3825f6 JSON fix: remove visible property (and add visibility defaults (CURA-1443)
for acceleration and jerk settings
2016-05-30 14:54:33 +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
Ghostkeeper
8bd06ee8ec Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 14:09:38 +02:00
Jaime van Kessel
990d05815b Added qml files to import path 2016-05-27 14:00:38 +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
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
eb8b3e01e3 Properly catch exceptions when serializing containers and check for dirty state 2016-05-23 18:21:23 +02:00
Simon Edwards
d7127b800c Finally, use the new convex hull code to compute the object 'shadow' and exclusion zones.
Contributes to CURA-1504
2016-05-23 17:21:52 +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
Simon Edwards
d1f68143a4 Adjustments to support immutable AxisAlignedBox.
Contributes to CURA-1504
2016-05-21 14:17:58 +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
85ce8a719e Merge local with origin
Contributes to issue CURA-1278.
2016-05-20 16:22:10 +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
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
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
62cdde1a9b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-17 09:43:26 +02:00
Arjen Hiemstra
d1d2e1cea7 Set the right defaults for setting visibility in Cura 2016-05-16 18:22:37 +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
0de4f466dc Codestyle & Documentation 2016-05-12 15:38:59 +02:00
Jaime van Kessel
a16acddff1 Removed unused code
CURA-1278
2016-05-12 11:59:23 +02:00
Jaime van Kessel
f91a4f9369 Moved registration of MachineManager model to before QML is read
Else the model is undefined on first run, which caused a number of silly issues.
CURA-1278
2016-05-11 16:13:30 +02:00
Jaime van Kessel
573c1c1a5a Added MachineManagerModel to Cura
CURA-1278
2016-05-11 15:35:41 +02:00
fieldOfView
4830943113 Refactor grouping/ungrouping into an operation that is undoable
CURA-1543
2016-05-11 15:21:01 +02:00