1520 Commits

Author SHA1 Message Date
Ghostkeeper
e02e2bde8d
Remove semicolon at the end of the line 2016-05-26 16:35:34 +02:00
Arjen Hiemstra
d5fa6d884f Fix XML material profiles so the global properties are properly set
Contributes to CURA-339
2016-05-26 13:32:14 +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
Jaime van Kessel
1256f4a752 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-25 12:04:12 +02:00
Ghostkeeper
6522aae915
Improve slice trigger documentation
Contributes to issue CURA-1278.
2016-05-25 11:53:35 +02:00
Jaime van Kessel
5ba3f3ebad Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-25 11:50:22 +02:00
Arjen Hiemstra
e29cc5e699 Create machine-specific material containers for machine specific overrides in XML material files 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
396f023bdf Account for global container stack being None in the backend plugin 2016-05-25 11:31:19 +02:00
Jaime van Kessel
81cdb3fd8c Added wildcard to filtering
CURA-1278
2016-05-25 11:28:58 +02:00
Jaime van Kessel
5f54d611cf Per object settings filter now uses correct bool types (instead of strings)
CURA-1278
2016-05-25 11:16:57 +02:00
Jaime van Kessel
fd3788ba7c Removed stray = sign.
CURA-1278 CURA-1592
2016-05-25 11:06:48 +02:00
Ghostkeeper
d602c0754f
Properly serialise all settings to g-code file
This makes for ugly g-code files, true, but at least the functionality of saving settings is useful now: It's traceable. Could've implemented this somewhere else too, but this is fine for now.

Contributes to issue CURA-1278.
2016-05-24 03:00:16 +02:00
Ghostkeeper
8b5c4b0361
Document GCodeWriter class
Contributes to issue CURA-1278.
2016-05-24 02:28:56 +02:00
Ghostkeeper
673f63cf51
Remove unused import
The deep copy is no longer needed. Also updated copyright year.

Contributes to issue CURA-1278.
2016-05-24 02:26:02 +02:00
Ghostkeeper
59b8d5c169
Fix saving g-code to file
The settings that are serialised at the end of the g-code are now the serialised global container stack. That's fairly useless since the serialised version of a container stack just lists the IDs of the containers in the stack, not the settings themselves. One of these containers is likely a current_profile container and that's all the information you'll get from that serialisation.

Contributes to issue CURA-1278.
2016-05-24 02:24:11 +02:00
Ghostkeeper
fa1d262123
Fix getting platform centre
With the new setting system.

Contributes to issues CURA-1278 and CURA-1591.
2016-05-24 01:16:11 +02:00
Ghostkeeper
fedbda1990 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-24 00:57:20 +02:00
Ghostkeeper
1cbb3a3f28
Prevent slicing if there is an invalid setting value
E.g. higher than maximum_value. This seems to work okay but is largely untested because switching to advanced mode gives a segfault.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 23:47:38 +02:00
Ghostkeeper
b6aa78cc8d
Use getAllKeys of ContainerStack to get all setting values
Instead of traversing the setting definitions ourselves, let the stack do it. This code should be reusable for other places where we want to get certain properties of all settings, hopefully.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 23:15:21 +02:00
Arjen Hiemstra
ea5dc00080 Bump LayerView API version to 3
It does not use any setting API so it is safe
2016-05-23 18:21:23 +02:00
Ghostkeeper
6116f592b3 Remove print
This was printing all settings that were being sent to the engine. Could've been useful, actually. Maybe I'll re-add it in the form of a log.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
c6d3677d6f Remove unused function
There are no machine instances any more. We can just listen for setting value changes.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
90ce0f44c3 Document remaining functions of CuraEngineBackend
They have all been checked for correctness now. While I was doing that, I documented their working as far as I could understand.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
9217dd3e1b Remove unused function
No longer used due to fix for setting rework.

Contributes to issues CURA-1278 and CURA-1288.
2016-05-23 17:19:18 +02:00
Ghostkeeper
c8de272ec4 Document old functions
I was reading through these to check if they'd still work. They should still work, but since I went through them I went ahead and documented them too.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
e94220f46d Remove commented code
Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
6fcba4cdde Fix typo in error message
Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
15333fa940 Codestyle: Spaces after commas
Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
70b52f4b62 Also get setting values of child definitions
Otherwise we just get the setting categories, which is not very useful.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
9dab21c4d0 Fix getting print_sequence setting
The setting is used to group items for one-at-a-time printing before they're sent to the engine. This properly gets the setting value under the new setting system.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
8f1860413b Always send FDMPrinter definition via socket
We don't save the file name any more. The engine doesn't need any machine-specific definitions at the moment, so we can always just send FDMPrinter.. This may later change, but later we will also send a serialised JSON rather than a file name so then we won't need the file name any more.

Contributes to issues CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
8a21ac77ed Re-implement sending global settings
It turns out to be mostly the same.

Contributes to issue CURA-1278 and CURA-1588.
2016-05-23 17:19:18 +02:00
Ghostkeeper
b03aa246a0 Call new function to send global settings
I'm going to rename this function to be able to send per-extruder and per-object settings with different functions later on. This updates the call to the function to use the new one.

Contributes to issue CURA-1278.
2016-05-23 17:19:18 +02:00
Ghostkeeper
eb951ed07c Fix potential concurrency of finishing before connected to finishing
This was a concurrency issue: If the slicing was very fast, it could finish slicing before the listener was connected to the message of being finished. Therefore, we should connect to being finished before we even start the start-slice job.

Contributes to issue CURA-1278.
2016-05-23 17:19:18 +02:00
Ghostkeeper
63bf5bec3d Remove _profile from start slice job parameters
Instead, the start slice job searches for the container stack itself.

Contributes to issue CURA-1278.
2016-05-23 17:19:18 +02:00
Ghostkeeper
a0645a44c8 Re-enable slicing message
Nothing appears right now, but this enables progress to show later on in the progress (if it would get there).

Contributes to issue CURA-1278.
2016-05-23 17:19:17 +02:00
Ghostkeeper
ae6f4912e6 Remove unnecessary variable initialisation
This isn't C++ or anything. Variable scope isn't limited by if statements.

Contributes to issue CURA-1278.
2016-05-23 17:19:17 +02:00
Ghostkeeper
83c1ea2ccc Move message hide into terminate function
Always if we terminate we want to hide the old message. This fixes the message not hiding when using the tools.

Contributes to issue CURA-1278.
2016-05-23 17:19:17 +02:00
Ghostkeeper
ab2a6136d7 Filter setting changed listener properly
The parameters of the listener were out of date and it should only trigger a reslice if we're changing the value of a setting, not any other property.

Contributes to issue CURA-1278.
2016-05-23 17:19:17 +02:00
Ghostkeeper
e5df225b1e Connect SettingChanged to new propertyChanged function
The listener doesn't properly listen to the signal's parameters yet though.

Contributes to issue CURA-1278.
2016-05-23 17:19:17 +02:00
Ghostkeeper
bace52fccf Add documentation
I need a bit of documentation for myself to understand this process.

Contributes to issue CURA-1278.
2016-05-23 17:19:17 +02:00
fieldOfView
740f3775fa Reset stored layer data as soon as a new slice operation starts
This prevents layer view showing a combination of stale and fresh data

Fixes CURA-1370 (and CURA-1519)
2016-05-23 12:07:02 +02:00
fieldOfView
f8c8de86bc Fix showing changelog when the first item in the changelog doesn't start with an "*"
CURA-1583
2016-05-23 11:35:01 +02:00
Simon Edwards
0b858f3878 Introduced a LayerDataBuilder. Made LayerData immutable just like its superclass. Fixed the layer view which broke.
Contributes to CURA-1504
2016-05-23 09:49:31 +02:00
Arjen Hiemstra
e0c7ed8561 Add a plugin that loads XML materials and an example material 2016-05-23 02:19:39 +02:00
Jaime van Kessel
dcb27e23ed Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-20 17:22:13 +02:00
Jaime van Kessel
fc7f349801 Added rudimentary filtering
Current implementation looks for an exact mach, whereas we should look for text in property.

CURA-1278
2016-05-20 17:21:09 +02:00
Ghostkeeper
754932f83a Move LegacyProfileReader to new setting structure
Untested as the profile manager is not functional at the moment.

Contributes to issue CURA-1278.
2016-05-20 16:22:10 +02:00
Ghostkeeper
7cc62db81d Increment XRayView API number
This plug-in still works, so this can be incremented without trouble.

Contributes to issue CURA-1278.
2016-05-20 16:22:10 +02:00
Jaime van Kessel
e9380ba83d Added rudimentary display of settings again
CURA-1278
2016-05-20 15:08:17 +02:00