637 Commits

Author SHA1 Message Date
Jack Ha
0bf037a160 Solved merge conflict 2016-07-19 10:27:59 +02:00
Jaime van Kessel
48620801d1 Merge pull request #843 from thopiekar/master-CURA-1775
[CURA-1775] CuraEngineBackend: Keep the last 200 lines of logged messages
2016-07-18 16:51:18 +02:00
Jack Ha
2936ad508c Merge branch 'master' into cura-1707 2016-07-18 16:06:08 +02:00
Jack Ha
b3837fbafd Raft thickness lowers the build volume.
CURA-1707
Now adding more visuals for better UX.
2016-07-18 16:02:24 +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
Johan K
3d413df215 Changed the point data type sent from the backend from int64 to float.
Added extruder information to LayerPolygon
2016-07-14 11:08:05 +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
Johan K
d31516bbb1 Code cleanup
Changed to "is None" insted of "== None" to test if numpy.array was initialized
Added extruder to PathSegment in Cura.proto
Changed index_pattern to class variable in Layer.py
2016-07-12 01:32:46 +02:00
Johan K
bbd49cee85 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-12 00:37:27 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing
Material Editing Support
2016-07-07 17:34:57 +02:00
Ghostkeeper
9d1ea28b49
Remove old commented-out code
The function it calls no longer exists. The protobuf message it listens to was renamed and the renamed message is properly listened to in the line above.

Contributes to issue CURA-1687.
2016-07-07 15:51:25 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
2016-07-07 11:29:18 +02:00
Jack Ha
2be8111f1b Restart timer after slicing is performed when not enabled.
CURA-1502
2016-07-06 16:21:03 +02:00
Jaime van Kessel
08502b9240 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-05 09:37:27 +02:00
Jaime van Kessel
44e4fc383e Changing active extruder no longer trigger re-slice
CURA-1729
2016-07-05 09:37:01 +02:00
fieldOfView
793f7824c7 Quick fix to restore slicing
This list of zeros may have to match the number of extruders
CURA-1687
2016-07-04 19:14:48 +02:00
Jack Ha
012484a4f1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 17:35:32 +02:00
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