Commit graph

3514 commits

Author SHA1 Message Date
fieldOfView
6a77f67c34 Rearrange sidebar top
CURA-340
2016-05-26 09:42:04 +02:00
fieldOfView
098cf515df Fix tooltips for simple mode helpers
CURA-790
2016-05-26 09:41:49 +02:00
fieldOfView
fe53a43819 Combine support checkbox & support extruder selection & remove main extruder selection
CURA-790
2016-05-26 09:41:25 +02:00
Simon Edwards
7e3dd3d443 Removed some debug.
Contributes to CURA-1504
2016-05-25 15:51:12 +02:00
Simon Edwards
5d533d642d PlatformPhysics doesn't need ConvexHullJob either.
Contributes to CURA-1504
2016-05-25 15:47:12 +02:00
Simon Edwards
6b71326df9 Deleted ConvexHullJob. We no longer need it.
Contributes to CURA-1504
2016-05-25 15:44:56 +02:00
Jaime van Kessel
808f117785 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura 2016-05-25 15:44:08 +02:00
Arjen Hiemstra
6305c70820 Remove old version of FDM printer base file 2016-05-25 15:12:56 +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
fieldOfView
f349221fa6 Make simple mode extruder selection work with settings_rework
CURA-1278 & CURA-790
2016-05-25 14:56:05 +02:00
fieldOfView
a0c09063ee Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-25 13:57:33 +02:00
fieldOfView
2683907121 Show Ultimaker Original and Ultimaker Original + in Add Machine wizard
CURA-1278
2016-05-25 13:57:16 +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
9bb4917ae7 Import Cura in materials preferences page so we can use the active definition id 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
ab0d34d9ac Add layer height to high quality profile so we have something that changes 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
81d0b34f20 Update example XML material to use the right product names 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
b2a8810d04 Filter available materials by the machine definition
Since we now have some machine-specific materials
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
2654033fae Show the add machine dialog when we do not have an active machine 2016-05-25 11:31:48 +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
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
24210246ee Add preferred variant, material and quality to UM2+ definition 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
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
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
Simon Edwards
3915dec426 Only remove the old convex hull shadow when a tool is really being used.
Contributes to CURA-1504
2016-05-24 20:56:41 +02:00
Simon Edwards
a2b5128c05 Updated the cura code for removal of MeshBuilder.getMesh().
Contributes to CURA-1504
2016-05-24 20:51:49 +02:00
Simon Edwards
be145d02b3 Updated the cura code for removal of MeshBuilder.getMesh().
Contributes to CURA-1504
2016-05-24 20:42:21 +02:00
Ghostkeeper
c80455c6bc
Fix creating print job name
Also fixed up the code style of that bit.

Perhaps this should've been done in Python, but that is for later.

Contributes to issue CURA-1278.
2016-05-24 15:04:08 +02:00
Arjen Hiemstra
332321b991 Disable asynchronous loading of SettingItem when Qt Version < 5.5 2016-05-24 11:50:39 +02:00
Ghostkeeper
b1d5cad898
Document QTbug
Took a while to find!

Contributes to issue CURA-1278.
2016-05-24 11:43:57 +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
a1115649cf Rename all variant profiles to .inst.cfg and correctly mark them as type variant
Still some issues with formulas causing errors, but it is getting closer
2016-05-23 18:21:23 +02:00
Arjen Hiemstra
f90be96bc6 Add back the Profiles page 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
8284ab9de5 Insert printers and materials pages at the right location 2016-05-23 18:21:23 +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
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
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