GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,685 Commits 287 Branches 260 Tags
Commit Graph

243 Commits

Author SHA1 Message Date
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
Thomas-Karl Pietrowski
d1f5985fee Removing unused imports 2016-03-15 12:25:51 +01:00
Ghostkeeper
f6fc5fea06 Fix slicing not interrupting first layer processing job 
The layer processing job that was triggered by switching to layer view was not stored in the field. The field is where the start of slicing looks for jobs to abort.

Contributes to issue CURA-864.
 2016-03-03 11:31:59 +01:00
Arjen Hiemstra
abe184ebff Do not display backend error messages for a few known error types 
ConnectionReset is already handled, as is BindFailed and Debug should
never result in an error.

Contributes to CURA-813
 2016-02-24 17:28:31 +01:00
Jaime van Kessel
67db4a4778 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-19 15:52:52 +01:00
Jaime van Kessel
31ed8400ef Added a bit of error handling 2016-02-19 15:52:36 +01:00
Ghostkeeper
63a8b96049 Make layer processing abort when starting slice 
This involved adding an abort flag to the layer processing job, and making the job check back on that flag periodically. If processing a single layer takes forever then it will never stop the job at all, so it assumes that the concurrent programming in Python is Fair.

Contributes to issue CURA-864.
 2016-02-19 12:25:47 +01:00
Jaime van Kessel
fb598a2444 Operation stopped no longer cause a re-slice. 
No idea why this was the case as the result of an operation should decide
if a reslice should be triggered (eg; transformation causes scenechanged to be triggered)
CURA-829
 2016-02-10 13:19:12 +01:00
Ghostkeeper
5693d639f1 Merge pull request #618 from Ultimaker/feature_profiles 
Profiles rework
 2016-02-09 09:49:28 +01:00
Arjen Hiemstra
69d8160207 Make sure we properly restart the backend when it quits on itself 
This prevents issues where the backend would not properly restart
 2016-02-08 13:51:18 +01:00
fieldOfView
6e11c2409b Use working profile instead of "active" profile 2016-02-08 09:20:46 +01:00
Arjen Hiemstra
8d2fc1f7e1 Do not close the engine from our side when finished with slicing 
The engine will close itself when done. Closing it from our side
actually introduces errors as things can still be busy processing
 2016-02-06 18:08:47 +01:00
Arjen Hiemstra
1e4631ecdd Remove Cura_pb2.py file since it is no longer needed 
The new Arcus API uses the Cura.proto file instead.
 2016-02-02 18:22:09 +01:00
Jaime van Kessel
7c744044fd Fixed merge issues & updated proto files 2016-02-02 11:25:10 +01:00
Ghostkeeper
a45e55ab4c Reactivate _always_restart 
This was deactivated during debugging as a test. Shouldn't have been committed.

Contributes to issue CURA-427.
 2016-01-29 20:57:16 +01:00
Ghostkeeper
c53969f1bd Wait for FinishedSlicing message to mark slicing as finished 
Instead of waiting until progress is more than 99%, wait for the dedicated FinishedSlicing message.

Contributes to issue CURA-427.
 2016-01-29 11:22:04 +01:00
Arjen Hiemstra
e74d300fb3 Make things work properly using the new Arcus API 2016-01-28 18:07:42 +01:00
Arjen Hiemstra
6930008dd8 Pass the protocol file to Backend's createSocket 2016-01-28 03:22:18 +01:00
Jaime van Kessel
0b920950d4 Layer processing is now only done when no slicing is occuring. 
Contributes to CURA-693
 2016-01-22 16:38:03 +01:00