3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
14778 commits 313 branches 275 tags 718 MiB
Commit graph

14778 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
f1b0c6238f CURA-5330 Add return type to some constructors 2018-06-13 11:01:30 +02:00
Diego Prado Gesto
6e364f0895 CURA-5330 Fix typing and code-style in the ContainerNode and all the 
related children, and QualityGroup and its children.
Also fix the related calls in the managers.
 2018-06-13 10:55:57 +02:00
Diego Prado Gesto
f860b9c99e CURA-5330 Fix typing in GenericOutputController 2018-06-13 09:07:34 +02:00
Diego Prado Gesto
221cd3e73e CURA-5330 Fix typing in SingleInstance 2018-06-13 09:06:05 +02:00
Diego Prado Gesto
3a8756efa5 CURA-5330 Fix typing in the Arranger 2018-06-13 08:53:01 +02:00
Diego Prado Gesto
698c72e190 CURA-5330 Fix typing in ExtruderManager and ContainerManager 2018-06-12 17:24:20 +02:00
Diego Prado Gesto
e6d3fd548d CURA-5330 Fix some typing in the MachineManager 2018-06-12 16:52:10 +02:00
Diego Prado Gesto
5cd464c5de CURA-5330 Fix some typing issues in QualityProfilesDropDownMenuModel and 
SettingInheritanceManager.
 2018-06-12 16:35:46 +02:00
Diego Prado Gesto
2e174e75fa CURA-5330 Add typing checks to the MachineManager 2018-06-12 16:28:39 +02:00
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and 
QualityProfilesDropDownMenuModel
 2018-06-08 17:02:59 +02:00
Diego Prado Gesto
7f34d7615e CURA-5330 Add typing to CuraSceneNode 2018-06-08 16:56:52 +02:00
Diego Prado Gesto
8c2ba64f32 CURA-5330 Add typing to NetworkedPrinterOutputDevice 2018-06-08 16:47:52 +02:00
Diego Prado Gesto
a6815e7c61 CURA-5330 Add typing to Backup 2018-06-08 16:31:43 +02:00
Ghostkeeper
adafea73cc
Ignore missing imports 
We don't want to be type checking inside those files.

Contributes to issue CURA-5330.
 2018-06-08 16:19:20 +02:00
Diego Prado Gesto
51462b20c3 CURA-5330 Add typing to PrinterOutputModel constructor 2018-06-08 15:56:20 +02:00
Diego Prado Gesto
1982c9b84c CURA-5330 Change TYPE_CHECKING flag 2018-06-08 15:54:28 +02:00
Diego Prado Gesto
fcdb1aef52 CURA-5330 Add typing in ExtruderOutputModel 2018-06-08 15:53:33 +02:00
Diego Prado Gesto
ace7e89ea0 CURA-5330 Add typing to PrintJobOutputModel 2018-06-08 15:48:47 +02:00
Diego Prado Gesto
e1ecbdf8fe CURA-5330 Add typing in QualityGroup 2018-06-08 15:46:24 +02:00
Diego Prado Gesto
e5e96bc600 Merge branch 'master' into mypy_fixes 
Contributes to CURA-5330
 2018-06-08 15:29:22 +02:00
Ian Paschal
dc5a48fb7d
Merge pull request #3908 from Ultimaker/CURA-5444_pva_default_hardware_compatible 
CURA-5444: These are merged, but the branches are not deleted, so that we can also open a new PR to merge into 3.4.
 2018-06-08 14:47:39 +02:00
Ghostkeeper
8438406d8b
Revert "CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly" 
This reverts commit 9432252de4. It was assuming the wrong default speed_print value of 60. It's not always 60. We need to find a different solution or modify the script.

Reverts the fix for issue CURA-5342.
 2018-06-08 13:44:40 +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
Ghostkeeper
fd19f8791e
Merge branch '3.4' 2018-06-08 11:47:29 +02:00
Ghostkeeper
79fb1bb2bd
Correction to translation of Retraction Extra Prime Amount 
Thanks to @getget1980.

Fixes #3789.
 2018-06-08 11:47:07 +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
Lipu Fei
bddd32a5b6 Fix branded materials model binding 
CURA-5336

When the global stack gets changed, the model should update itself
so it refers to the correct extruder stack.
 2018-06-07 15:50:08 +02:00
Lipu Fei
54c827fd44 Do not run firmware update check jobs in parallel 
CURA-5418

To avoid showing multiple update messages.
 2018-06-07 15:24:21 +02:00
Lipu Fei
12a406529e 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 14:42:36 +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
Ghostkeeper
af2d05ebfa
Remove superfluous 'enabled' field 2018-06-07 13:40:16 +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
3b46816632 Also check btemporary value 
CURA-5449
 2018-06-07 11:29:21 +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
Lipu Fei
bf9581e068
Merge pull request #3903 from Ultimaker/formulafy_speeds 
CURA-5342 formulafy speed settings
 2018-06-07 10:48:25 +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
971d6306bf Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-06 19:04:29 +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
Jack Ha
9432252de4 CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly 2018-06-06 17:07:04 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Ghostkeeper
a15831c486
Update translation templates per language 
These are the templates from 3.4.

Contributes to issue CURA-5451.
 2018-06-06 16:57:33 +02:00
Ghostkeeper
0faaf3cd22
Update translation templates for Cura 3.4 
These are the translations for Cura 3.4. Fixed and in-place. Can't change translated texts any more.

Contributes to issue CURA-5451.
 2018-06-06 16:57:32 +02:00
Diego Prado Gesto
343c606df6 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-06 14:58:23 +02:00