3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
23719 commits 306 branches 272 tags 787 MiB
Commit graph

2149 commits

Author SHA1 Message Date
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Nino van Hooff
c2c96faf5f Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon 
CURA-7437
 2020-05-20 17:20:40 +02:00
Ghostkeeper
d499c6fdfe
Keep this position a string 
We've set up enough defensive coding that this kept working, but the typing checker fails on it.
 2020-05-15 18:50:20 +02:00
Ghostkeeper
acc8e24cb4
Use extruderList rather than extruders dictionary 
The extruders dictionary has been deprecated.

Done during Turbo Testing and Tooling to reduce the amount of warnings in our log.
 2020-05-15 16:07:19 +02:00
Ghostkeeper
17762cb431
Use extruderList rather than extruders to switch userChanges over 
It's a bit weird that it switches the user changes over though. Won't it be a different printer type then?
 2020-05-15 16:04:42 +02:00
Ghostkeeper
33c1901070
Replace another extruders() call with extruderList 
The extruders function is deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:51:49 +02:00
Ghostkeeper
174a8e5411
Use extruderList rather than deprecated extruders 
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:50:03 +02:00
Ghostkeeper
a6d7b97abc
Use extruderList rather than deprecated extruders 
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:39:28 +02:00
Ghostkeeper
fe0bae4c25
MORE usage of extruderList, LESS of extruders 
Extruders has been deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:23:29 +02:00
Ghostkeeper
afde5353eb
Use extruderList rather than extruders 
Extruders is deprecated. Always use the extruderList.
In fact, the else case beneath was already using extruderList in the same way.
Hopefully we can one day get rid of all the string conversion for the position in this class. I don't dare to refactor that without having a review though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:20:46 +02:00
Ghostkeeper
6d3acf946a
Use new extruderList rather than extruders 
The extruders dictionary has been deprecated in favour of extruderList.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:16:43 +02:00
Ghostkeeper
4482b4f352
Use extruderList rather than deprecated extruders 
This fixes a possible bug, too, if the extruders dictionary weren't iterated over in the order of the extruders. It would sometimes assign the profiles to the wrong extruders then. However I think the dictionary iteration in Python is in order of insertion and we probably insert them in the proper order by accident.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:14:56 +02:00
Ghostkeeper
e0e0371de4
Use extruderList rather than extruders 
Removes another warning from the log. And it makes the code simpler in this case.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log file.
 2020-05-15 15:10:30 +02:00
Ghostkeeper
b231a4b3a2
Remove unnecessary re-adding of extruders 
This was originally added for backwards compatibility with old versions of Uranium. However the link between Cura versions and Uranium versions is already very strong (Cura crashes with old Uranium versions) so this is not necessary.
It was also adding warnings in our log that these extruders had already been added to the printer.

Done during Turbo Testing and Tooling, to clean up our log files.
 2020-05-15 14:26:44 +02:00
Ghostkeeper
88bf80c424
Don't provide setVariant with None as variant 
That is not allowed as per the type. This could happen if the preferred variant of a printer also doesn't exist.

Fixes Sentry issue CURA-NP.
 2020-05-07 08:53:52 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Ghostkeeper
52b4e98056
Prevent crash when unable to write to storage location for container manager 
Or the temp directory.

Fixes Sentry issue CURA-KY.
 2020-04-23 13:48:05 +02:00
Jaime van Kessel
8269ae9501
Use base_file to check if a material is known 
Fixes #7490
 2020-04-14 09:49:34 +02:00
fieldOfView
2eeabec317 Show support extruder for support meshes 2020-04-11 20:39:21 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
cfc2cc3692
Fix crash when printer definition could not be found 2020-04-08 17:14:58 +02:00
Jaime van Kessel
caa348265d
Add check to prevent unknown materials from being active 
This should really resolve the key error for anycubics
 2020-04-08 17:00:11 +02:00
Ghostkeeper
3d399672d0
Select default extruder if a setting has an extruder nr that's not available 
Fixes Sentry issue CURA-G2.
 2020-04-07 13:45:41 +02:00
Ghostkeeper
2ee3e5b386
Don't remove machines that don't exist 
Fixes Sentry issue CURA-EM.
 2020-03-30 14:10:59 +02:00
Ghostkeeper
566af8be2e
Don't crash when importing definition files as materials 
Reproduction steps:
* In the Material Manager, click on 'Import material'.
* Change the file type in the file dialogue to 'All files'.
* Select any .def.json file, for example from Cura's own resources/definitions folder.

Previously this crashed the application. Now it shows the user an error message instead.

Fixes Sentry error CURA-D4.
 2020-03-23 09:06:20 +01:00
Jaime van Kessel
2fc8c0e5b5
Fix variant from extruder not restoring correctly 2020-03-13 10:37:08 +01:00
Ghostkeeper
548c02772d
Gracefully fail if the profile can't be set currently 
Discovered during work on CURA-7283.
 2020-03-06 13:40:28 +01:00
Jaime van Kessel
670a106957
Be a bit more gracefull when adding a machine failed 
This seems to happen for people that manually add machines to cura
but mess something up when copying the files.

CURA-3X
 2020-02-28 17:03:38 +01:00
Jaime van Kessel
f4d1d5d936
Add a check that fixes wrong variants upon setting an active machine 2020-02-28 15:06:11 +01:00
Jaime van Kessel
0ccf457314
Split up an overly long call into shorter readable bits 2020-02-28 14:25:50 +01:00
Jaime van Kessel
9e94875733
Merge branch 'feature_value_from_container_function' of https://github.com/fieldOfView/Cura 2020-02-04 16:47:45 +01:00
Jaime van Kessel
0520f9a4bc
Ensure that setActiveExtruderCount correctly emits the extruderEnablechanged signal 2020-02-04 16:46:35 +01:00
fieldOfView
5f67331bac Fix "typo" caused by cleanup before push 2020-01-30 18:23:25 +01:00
fieldOfView
5a4661db98 Add valueFromContainer() and extruderValueFromContainer() functions 2020-01-28 16:36:06 +01:00
Kostas Karmas
9266c753c3 Reset print_sequence when reactivating extruder 2 
The setting print_sequence was not being resetted to all at once
whenever the 2nd extruder was reactivated.
This commit fixes that by explicitly resetting print_sequence
when reenabling an extruder, if it has been changed by the user.

CURA-6914
 2020-01-24 17:12:00 +01:00
Ghostkeeper
d18c0703b4
Fix getting correct initial extruder number 
As found in the discussion in #6847.

This was done as a 5 minute fix.
 2020-01-16 13:59:02 +01:00
Jaime van Kessel
e74f049142
Fix bunch of issues found by pylint 2020-01-10 16:37:46 +01:00
Jaime van Kessel
e46febfea4
Switch out number of getActiveExtruderStacks for extruderList 
It's essentially the same, but reduces the dependency of MachineManager
on the ExtruderManager
 2020-01-06 14:47:46 +01:00
Jaime van Kessel
55dacee45f
Simplify the numUserSettings count 2020-01-06 14:38:39 +01:00
Jaime van Kessel
3e6723f378
Remove unneeded update calls 2020-01-03 14:16:34 +01:00
Jaime van Kessel
8b393317ff
Add "all" as a setting visibility preset 
CURA-7082
 2020-01-02 10:51:40 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4' 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
 2019-12-23 16:26:25 +01:00
Ghostkeeper
15ba762847
Fix spelling of error message in the log 
Found during investigation of #6828.
 2019-12-20 09:54:07 +01:00
Kostas Karmas
50b8ff2352
Fix check that finds the extruder in a position 
CURA-7048
 2019-12-17 10:55:28 +01:00
Kostas Karmas
a1d7eefc42
Fix PPA crashing on single-extruder printers 
The machine manager was leading to a crash when trying to enable
the second extruder in single-extrusion printers, because the check
for the second extruder was not correctly implemented. This commit
fixes that issue by checking if the global stack has the specified
extruder. If it does not, then the function returns while logging the
issue.

CURA-7048
 2019-12-17 10:55:28 +01:00
ninovanhooff
f77832315a
Merge branch 'master' into CURA-6127_settings_lost_when_sync_to_diff_printer_type 2019-12-16 09:48:32 +01:00
Kostas Karmas
409dc98299 Keep global settings on sync to diff printer type 
In addition to the per-extruder user changes, copy the global user
changes to the new_machine.

CURA-6127
 2019-12-13 15:00:22 +01:00
Remco Burema
44e7cb7108
Replace deprecated code. 2019-12-13 13:52:24 +01:00