117 Commits

Author SHA1 Message Date
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
Jack Ha
d45f61f778 Comment. CURA-2605 2016-10-11 15:13:16 +02:00
Jack Ha
b119be7d11 Remove settings from extruder that are not settable_per_extruder. CURA-2605 2016-10-11 15:00:17 +02:00
Jaime van Kessel
e582607e41 Added todo comment 2016-10-05 13:48:09 +02:00
Ghostkeeper
bc6e7dd24e
Merge branch 'sevaa-feature_x3d_file_format' 2016-09-20 11:49:39 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
Jaime van Kessel
76e57c940d Added more specific error message when trying to slice with incompatible material
CURA-2271
2016-09-13 17:27:29 +02:00
Jaime van Kessel
677d6556fb Refuse to slice when material is mismatched
CURA-2271
2016-09-09 13:02:19 +02:00
Jaime van Kessel
9a84deb14e If buildplate has errors, slicing is not possible
CURA-2234
2016-09-07 17:19:20 +02:00
Jaime van Kessel
a68e112060 Fixed resolvement not being overwritten by user changes 2016-09-01 14:44:29 +02:00
Seva Alekseyev
a43efcde05 Code review issues 2016-08-24 17:28:30 +02:00
Seva Alekseyev
5cb9f97986 Slicing logic now index-aware, correctly processes scenes with vertex reuse 2016-08-24 17:28:30 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value.
Contributes to CURA-2007
2016-08-04 14:30:48 +02:00
Ghostkeeper
de7f32da19
Convert global_inherits_stack to int before slicing
Sometimes it was accidentally converted to a float when it passes through Javascript.

Contributes to issue CURA-2055.
2016-08-04 13:25:51 +02:00
Ghostkeeper
c2201eb814
Send setting extruder only when extruder is valid
Apparently hasProperty always returns True. Fine. I'll just check the values then...

Contributes to issue CURA-2011.
2016-08-01 09:36:23 +02:00
Ghostkeeper
b21a1f311a
Send all global_inherits_stack to engine
Only the settings for which global_inherits_stack is set should be sent to the engine.

Contributes to issue CURA-2011.
2016-08-01 09:36:16 +02:00
fieldOfView
fb96950762 Don't set extruder_nr per object for single extrusion printers
CURA-1754
2016-07-29 21:50:49 +02:00
Jaime van Kessel
562363ec16 Updated documentation 2016-07-29 17:24:12 +02:00
Jaime van Kessel
fa78cf2d39 No longer use brute force approach for per object
CURA-1754
2016-07-29 15:44:34 +02:00
Jaime van Kessel
7ff1b937e3 Perobject settings now use correct stacks to calculate values
CURA-1754
2016-07-29 15:19:50 +02:00
Jaime van Kessel
467f971dac When sending per object settings, we now also check if we need to send anything at all
Adding a setting and then removing it caused some weird behavior issues CURA-1988
2016-07-28 15:26:59 +02:00
Jaime van Kessel
a1bd8f59ed Slicing no longer occurs when stack is invalid
CURA-1998
2016-07-28 13:14:07 +02:00
Jaime van Kessel
48d39ce387 material_guid is now also a setting in fdmprinter
CURA-1836
2016-07-18 11:46:12 +02:00
Jaime van Kessel
d48b4bf790 Material GUID is now sent to engine for each extruder
CURA-1836
2016-07-15 13:23:25 +02:00
Jaime van Kessel
726eb97d9f Machine_id instead of definition_id is now used to link extruders
Contributes to CURA-1898
2016-07-13 11:17:44 +02:00
Arjen Hiemstra
6f3fa19890 Fix up plugins that use ExtruderManager
Since it has been moved to cura.Settings
2016-07-04 13:16:04 +02:00
Jaime van Kessel
0e098e38eb More fixes for changed setting object location 2016-07-04 13:10:29 +02:00
Jaime van Kessel
3df1bc4e62 Fixed minor issue in buildExtruderMessage
CURA-1681
2016-06-09 13:23:09 +02:00
Jaime van Kessel
d93044a338 Added setting sending per extruder
CURA-1681
2016-06-09 13:04:07 +02:00
Jaime van Kessel
899e4cc175 Fixed sending of per-object settings to engine
CURA-1681
2016-06-09 11:46:52 +02:00
Jaime van Kessel
123c2f5c85 Moved global settings into slice message (as per API changes)
CURA-1681
2016-06-09 11:33:15 +02:00
Jaime van Kessel
95a0c69662 Bit of code refactoring to prevent duplication
CURA-1288
2016-06-02 17:25:34 +02:00
Jaime van Kessel
c994cb6bef Slicing no longer occurs when a perObject setting is in error state
CURA-1288
2016-06-02 14:19:39 +02:00
Arjen Hiemstra
8039184c18 Move setting error checking to StartSliceJob and allow the job to return a proper response
Now the job can determine if we can continue with slicing or not and if
not, why not.

This also means we can now show a message when we cannot find any
slicable objects.

Contributes to CURA-1278
2016-05-30 13:03:06 +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
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
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
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
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
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
2696f883b0
Add a bit of documentation
I was going further with this, but then it was decided that we need to do this later but I won't throw away this bit of documentation when I have it anyway.

Contributes to issue CURA-1278.
2016-05-19 16:31:29 +02:00
Ghostkeeper
4ef9c1a3e7 Merge branch '2.1'
Conflicts:
	plugins/CuraEngineBackend/StartSliceJob.py
2016-05-04 13:43:35 +02:00
Jaime van Kessel
efd14421cc Codestyle & Documentation
CURA 537
2016-04-28 15:56:25 +02:00
Simon Edwards
dff976f197 Minor code style fix.
Contributes to CURA-1434
2016-04-26 15:21:11 +02:00
Simon Edwards
f92ff3e864 Only talk to the CuraEngine socket from the same (Main) thread, and be a lot more careful about handling the StartSliceJob when restarting CuraEngine.
Fixes CURA-1434
2016-04-25 15:53:02 +02:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1'
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
2016-03-17 15:24:00 +01:00