719 Commits

Author SHA1 Message Date
Jaime van Kessel
318182495a We now recieve material estimation per extruder
CURA-1687
2016-07-04 17:11:03 +02:00
U-ULTIMAKER\j.ha
84b736df07 first commit in Cura! fix CURA-1085, time estimate is reset before every slice action 2016-07-04 17:08:35 +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
Thomas Karl Pietrowski
c67d2faac3 CuraEngineBackend: Keep the last 200 lines of logged messages
Don't know how much lines we will need exactly, but I think 200 are
enough for the moment.

Contributes to CURA-1775
2016-07-03 14:39:16 +02:00
Johan Kristensen
41503d7d5b Adapting code to merge of simple_convex_hull and code cleanup. 2016-06-28 23:50:00 +02:00
Johan K
788f79f5ba Changing the message used from the engine from Layer to LayerOptimized. 2016-06-28 22:29:29 +02:00
Johan K
f184baadf0 Formulate layerview logic using numpy to speed up. Also changed layer data packets from engine to make it possible. 2016-06-28 22:29:29 +02:00
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
2016-06-21 14:47:10 +02:00
Thomas Karl Pietrowski
536e0f489a Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform 2016-06-15 14:59:34 +02:00
Thomas Karl Pietrowski
3df124e3cf CuraEngineBackend: Removing duplicate close()
close() is already defined in this class. This removes the useless code.
2016-06-12 12:46:19 +02:00
Thomas Karl Pietrowski
6d43ec700d CuraEngineBackend: Using Platform.isWindows() 2016-06-12 11:02:15 +02:00
Jaime van Kessel
9672b3360c Changing settings in extruder stack now also triggers reslice
CURA-1689
2016-06-10 12:26:11 +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
Tim Kuipers
b6649eab3a dox: documented proto file (CURA-1681 CURA-1682) 2016-06-09 12:08:10 +02:00
Jaime van Kessel
a01b554ee3 Added extruder to proto message
CURA-1681
2016-06-09 11:56:41 +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
Tim Kuipers
ce9d8b6dd0 proto file typo fix (CURA-1681 CURA-1682) 2016-06-09 10:48:44 +02:00
Jaime van Kessel
20f657af88 Updated proto file
Objects & global settings are now sent in one message.
Also added support for extruder settings

CURA-1681
2016-06-09 10:40:28 +02:00
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +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
5873f1d4d0 Limit layer processing to 99% to indicate more stuff needs to happen
Fixes CURA-1644
2016-06-02 11:22:39 +02:00
Arjen Hiemstra
93873a2ce8 Also trigger a reslice when the containerstack's containers change
Contributes to CURA-1278
2016-05-30 14:02:51 +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
cd2b853fff Remove "slicing" message since it is now displayed in the sidebar
Now removed for good

Contributes to CURA-1278
2016-05-30 13:01:25 +02:00
Arjen Hiemstra
0b3b718e87 Make CuraEngineBackend respond to changes to the global container stack
This way we can properly connect to propertyChanged signals and trigger
a reslice.

Contributes to CURA-1278
2016-05-30 12:23:28 +02:00
Arjen Hiemstra
c63eb3871c Account for the changes to BackendState in Uranium
Contributes to CURA-1278
2016-05-30 12:22:12 +02:00
Ghostkeeper
e02e2bde8d
Remove semicolon at the end of the line 2016-05-26 16:35:34 +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
6522aae915
Improve slice trigger documentation
Contributes to issue CURA-1278.
2016-05-25 11:53:35 +02:00
Arjen Hiemstra
396f023bdf Account for global container stack being None in the backend plugin 2016-05-25 11:31:19 +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
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
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