211 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
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
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
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
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
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
Jaime van Kessel
295cea338c Translate tool is now no longer stopped by ton of errors
CURA-1278
2016-05-20 14:09:58 +02:00
Tim Kuipers
62a53bfa1a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-13 13:22:54 +02:00
fieldOfView
f9adb2c601 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-13 13:05:58 +02:00
Tim Kuipers
883d138f67 Merge branch '2.1' 2016-05-13 12:19:19 +02:00
Simon Edwards
2f54e3554a When trying to exit the application, forcefully shutdown the backend exe.
Fixes CURA-1453 Cura in slicing loop (Arcus Error (6, native 54))
2016-05-09 12:42:51 +02:00
Arjen Hiemstra
44246c0676 Comment out all things that use settings related things so we can at least start 2016-05-09 12:06:11 +02:00
Ghostkeeper
4ef9c1a3e7 Merge branch '2.1'
Conflicts:
	plugins/CuraEngineBackend/StartSliceJob.py
2016-05-04 13:43:35 +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
Arjen Hiemstra
c329c2e12d Do not try to recreate the socket when we are shutting down anyway
This prevents issues where closing the socket triggers socket creation
and then a deadlock occurs.

Contributes to CURA-1391
2016-04-19 16:52:22 +02:00
fieldOfView
3ad65e315f Terminate CuraEngine if it is still running when Cura is closed
CURA-1388
2016-04-12 18:05:33 +02:00
fieldOfView
967c062357 Fix import error starting up with an empty profile
CURA-1376
2016-04-12 07:41:42 +02:00
Arjen Hiemstra
d5bf9b3733 Merge branch '2.1'
* 2.1:
  Do not round convex hull points to nearest int
  Use fdmprinter.json If we have no active machine instead of returning None
  JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374)
2016-04-11 15:40:36 +02:00
Arjen Hiemstra
cdb235740d Use fdmprinter.json If we have no active machine instead of returning None
This prevents issues where backend creation would end up in an infinite
loop while there was no active machine.

Contributes to CURA-1376
2016-04-11 13:01:03 +02:00
Jaime van Kessel
dc1630c268 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-08 15:02:30 +02:00
ckielstra
4c233e75f4 Spelling 2016-04-08 11:06:24 +02:00
Jaime van Kessel
e2e25ea3e8 Merge branch '2.1-max_message_size_fix' of https://github.com/Ultimaker/Cura into 2.1 2016-04-06 11:42:38 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1'
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
2016-04-04 18:49:09 +02:00
Jaime van Kessel
819c9568b1 Backend now correctly handles machine instance change
CURA-1323
2016-04-04 10:29:42 +02:00
Jaime van Kessel
ca70b275d8 Revert "Changed wait for subprocess to poll"
This reverts commit e463c93f77a8015b00ab49aa7b8f9f6433cba26b.
2016-04-01 13:58:11 +02:00
Jaime van Kessel
e463c93f77 Changed wait for subprocess to poll
The wait is a suspect in a MAC issue. CURA-1300
2016-03-31 17:35:57 +02:00
Jaime van Kessel
c91a87cbf8 Minor codestyle changes
CURA-1210
2016-03-30 09:24:50 +02:00
Jaime van Kessel
7045d67bde Layer data is now processed layer by layer.
This is done to prevent the very large messages that would be sent otherwise.
Protobuf can't do anything with messages above 512MB. As we no longer send a
"collection" message, this should no longer occur.
CURA-1210
2016-03-24 12:14:31 +01:00
Jaime van Kessel
3663f8ca20 Backend now logs return codes of processes
CURA-1133
2016-03-23 15:11:56 +01:00
Jaime van Kessel
8f9210af6b Socket is now re-created regardless of process state
The previous fix for this could cause an infinate slice loop on windows. CURA-1133
2016-03-22 11:29:16 +01:00
Jaime van Kessel
dce4fa9479 Added forced re-creation of socket
CURA-1133
2016-03-21 16:32:10 +01:00
Jaime van Kessel
174f150ead Error now also causes terminate to be called
CURA-1133
2016-03-21 15:44:27 +01:00
Jaime van Kessel
3ecd746f21 Added even more logging
CURA-1133
2016-03-21 15:36:07 +01:00
Jaime van Kessel
46bf7e440e Added more logging & removed duplicate slicing canceled signals
CURA-1133
2016-03-18 12:00:10 +01: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
Jaime van Kessel
b863d239b0 Added more logging to engine connection
Should make it easier to debug future issues. CURA-1133
2016-03-15 12:53:22 +01:00