GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 03:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,863 Commits 295 Branches 268 Tags
Commit Graph

4191 Commits

Author SHA1 Message Date
Ghostkeeper
a401c1d64f
Disambiguate between list of metadatas and metadata 
Because MyPy doesn't allow a variable to change its type later.

Contributes to issue CURA-5330.
 2018-06-15 17:03:04 +02:00
Ghostkeeper
79c6b2dad8
Use CuraApplication instead of Application 
Because UM.Application doesn't have any getPrintJobInformation function or anything like that.

Contributes to issue CURA-5330.
 2018-06-15 16:55:30 +02:00
Ghostkeeper
e717abf499
Fix typing related to Network Printing 
Contributes to issue CURA-5330.
 2018-06-15 16:53:45 +02:00
Ghostkeeper
b07db74011
Fix more typing errors 
It never ends.

Contributes to issue CURA-5330.
 2018-06-15 15:44:29 +02:00
Ghostkeeper
cfd0bde6b1
Use CuraApplication instead of Application 
Because UM.Application has no function getMultiBuildPlateModel.

Contributes to issue CURA-5330.
 2018-06-15 15:32:44 +02:00
Ghostkeeper
797d05947c
Fix type errors 
Contributes to issue CURA-5330.
 2018-06-15 15:20:41 +02:00
Ghostkeeper
9821793b46
Don't override boundingbox of SceneNode 
Whatever was intended here, it didn't work. Because when a method is called it is called on the class of the object. Methods are not attributes of instances but attributes of the class. The attribute of the class was never changed, so this had no effect.

Contributes to issue CURA-5330.
 2018-06-15 15:16:55 +02:00
Ghostkeeper
10f22f9c25
Cast result of getPluginObject to the plug-in type it implements 
We know for sure what the type of that plug-in is, only we can't import that type because it's a plug-in. We can (and did) import the plug-in type object MeshWriter though.

Contributes to issue CURA-5330.
 2018-06-15 15:09:19 +02:00
Ghostkeeper
e957f7b650
Fix typing errors 
Contributes to issue CURA-5330.
 2018-06-15 15:07:08 +02:00
Ghostkeeper
2b33a1f1b6
Fix broken import with DefinitionContainerInterface 
And the ensuing type error that can then be found.

Contributes to issue CURA-5330.
 2018-06-15 14:31:29 +02:00
Ghostkeeper
0d52b03716
Fix the wrong types in this class 
These mistakes were found by MyPy.

Contributes to issue CURA-5330.
 2018-06-15 14:25:25 +02:00
Ghostkeeper
4c3d28709b
Add typing for all functions and fields 
Lots of typing so that MyPy can then check whether the functions are safe to call.

Contributes to issue CURA-5330.
 2018-06-15 14:07:33 +02:00
Ghostkeeper
8256788ed8
Use CuraApplication instead of Application 
Because we need to call getExtruderManager which is only in CuraApplication.

Contributes to issue CURA-5330.
 2018-06-15 13:40:43 +02:00
Ghostkeeper
75e5a185d9
Don't unnecessarily cast to a set 
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set.

Contributes to issue CURA-5330.
 2018-06-15 13:07:55 +02:00
Diego Prado Gesto
b309e93767 CURA-5330 Fix typing in the VersionUpgrade plugin 2018-06-14 16:54:22 +02:00
Diego Prado Gesto
dc4556647a CURA-5330 Fix code style in XmlMaterialProfile plugin 2018-06-14 16:49:26 +02:00
Diego Prado Gesto
a184fad8ee CURA-5330 Add typing to the USBPrinting plugin 2018-06-14 15:57:30 +02:00
Diego Prado Gesto
7eba868574 CURA-5330 Fix typing and code style in the UM3NetworkPrinting plugin 2018-06-14 15:41:12 +02:00
Diego Prado Gesto
eb65a11e18 CURA-5330 Fix code style and typing in Toolbox plugin 2018-06-13 18:22:27 +02:00
Diego Prado Gesto
0a21ce44b0 CURA-5330 Fix code style and typing in GCodeReader plugin 2018-06-13 17:36:04 +02:00
Diego Prado Gesto
eca23e5b5d CURA-5330 Fix typing in 3MFReader plugin 2018-06-13 16:48:08 +02:00
Lipu Fei
439ea79c60 Add message for unable to slice due to disabled extruders 
CURA-5456
 2018-06-13 11:09:20 +02:00
Diego Prado Gesto
b9a94a1025 Adjust the slider label width a bit to look ok in macOS 2018-06-12 13:40:28 +02:00
Diego Prado Gesto
7cd0f57f22 Make the slider label width adjustable depending on the number of digits of 
the total number of layers.
 2018-06-12 13:32:54 +02:00
Jack Ha
fa93d47d5b Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 17:00:51 +02:00
Jack Ha
89c84eb93b CURA-5327 fix crash when changing material diameter 2018-06-11 17:00:43 +02:00
Diego Prado Gesto
335d3d4329 Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 15:55:22 +02:00
Diego Prado Gesto
6e575c9cf5 CURA-5463 The packages that are scheduled to be removed, are not old 
packages.
 2018-06-11 15:54:11 +02:00
Jack Ha
b3f6e5c9e0 CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant 2018-06-11 15:52:28 +02:00
Ghostkeeper
54a03723ab
Set encoding correctly when opening files everywhere 
Otherwise the encoding is interpreted differently on Windows and Mac.
 2018-06-11 11:09:07 +02:00
Lipu Fei
c779795618 Remove unnecessary updateMaterialForDiameter() 
CURA-5327
 2018-06-11 10:55:10 +02:00
Lipu Fei
83fcc60bee Show message for unknown machines in project files 
CURA-5337

Do not crash on loading project files with unkown machine types. Show a
message instead.
 2018-06-11 07:52:34 +02:00
Diego Prado Gesto
e5699918ea CURA-5444 Also get the metadata even if the material was marked as not 
compatible.
 2018-06-08 12:03:46 +02:00
Diego Prado Gesto
2a3eed30ab CURA-5444 Always create the instance of the material even if it is not 
compatible, otherwise it will never show as
incompatible if the material profile doesn't define hotends in the
machine.
 2018-06-08 11:21:17 +02:00
Jack Ha
d063741d7a Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-07 13:50:50 +02:00
Jack Ha
b2b9de7960 CURA-5396 added timeout options for auto detecting baud rate over USB serial 2018-06-07 13:50:40 +02:00
Lipu Fei
afc5c1fbbd Do not run firmware update check jobs in parallel 
CURA-5418

To avoid showing multiple update messages.
 2018-06-07 13:45:10 +02:00
Lipu Fei
3a7a1dbc6d Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 12:51:54 +02:00
Ghostkeeper
8202b62343
Merge branch '3.4' 2018-06-07 11:38:13 +02:00
Ghostkeeper
624bbbeb4a
Account for the fact that createMachine can return None 
Contributes to issue CURA-5337.
See also #3787.
 2018-06-07 11:37:48 +02:00
Jack Ha
f828c135f8 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-07 11:35:09 +02:00
Lipu Fei
04ecc55e3c
Merge pull request #3850 from Ultimaker/uranium_package_manager 
Move package manager to Uranium
 2018-06-07 11:03:45 +02:00
Diego Prado Gesto
97a1aa1a2b Fix a crash in MaterialManager when the brand of the material is None. 
Fix other possible cases when the type or the color are also None.
 2018-06-07 10:54:23 +02:00
Jack Ha
49e49bfa58 Merge branch '3.4' 2018-06-07 09:34:30 +02:00
Diego Prado Gesto
fbdf950a7b
Merge pull request #3899 from fieldOfView/fix_sidebar_monitoringprint 
Remove vestigial references to "monitoringPrint"
 2018-06-06 19:08:58 +02:00
Diego Prado Gesto
ece2729744 CURA-5445 Remove the action when the Finish button is clicked. The 
button will just close the dialog.
 2018-06-06 19:02:40 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
 2018-06-06 14:54:26 +02:00
Jack Ha
96f2e6e1ed CURA-5402 hopefully solved merge conflicts 2018-06-06 14:39:53 +02:00
Jack Ha
702d23ad0e CURA-5357 set showcase to max 3 items per row 2018-06-06 13:48:04 +02:00