3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
20047 commits 344 branches 300 tags 764 MiB
Commit graph

5217 commits

Author SHA1 Message Date
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume' 2019-07-02 10:37:22 +02:00
Remco Burema
f5b0cae554 Prime-brim calculation needs adhesion extruder, not just any. 2019-07-02 07:46:21 +02:00
Ghostkeeper
ea93490c45
Fix crash when loading multi-extrusion print 
Because getProperty needs a property to get.
 2019-07-01 14:56:03 +02:00
Jaime van Kessel
a7d419f497 Fix deprecation decorator breaking the getExtruder function 2019-07-01 11:18:54 +02:00
Ghostkeeper
17e86a28b7
Guard against broken import 2019-07-01 10:58:08 +02:00
Ghostkeeper
f86cf06b88
Add typing 2019-07-01 10:57:08 +02:00
Jaime van Kessel
6136f5a2f2 Further simplify the build volume code 2019-06-28 15:22:58 +02:00
Jaime van Kessel
691d106719 Remove old unused code 2019-06-28 15:09:08 +02:00
Jaime van Kessel
f329d7aed9 Made typing hint a bit more specific 2019-06-28 15:08:46 +02:00
Jaime van Kessel
2133fc78e0 Remove unused code 2019-06-28 15:01:09 +02:00
Jaime van Kessel
efc6ef2905 Add missing typing 2019-06-28 13:44:47 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
Ghostkeeper
7fbdccffdb
Add typing 2019-06-18 12:00:22 +02:00
Lipu Fei
1d85e60a6b Merge remote-tracking branch 'origin/master' into CURA-6460_remove_square_tower 2019-06-17 13:11:07 +02:00
Ghostkeeper
02b0242807
Fix translatability of caution message 
Never put the formatting within the i18nc call. Always put the formatted string inside, but the formatting call outside of the function, like this:

    catalog.i18nc('@info', 'I am {age} years old.').format(age = my_age)

Otherwise, when looking up the translation for the string, it's going to try to look up the translation for the formatted string (with the age already filled in). It won't be able to find that because this sentence was not translated for all possible ages of a human.
In this case I can make it even easier on the translator because the list must always follow after the text.
 2019-06-14 11:00:52 +02:00
Ghostkeeper
cf9f97e897
Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> Both had a version upgrade implementation.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py -> Both had a version upgrade implementation.
 2019-06-12 13:03:05 +02:00
Ghostkeeper
a38984dcec
Increment setting_version to 8 
This is required for the version upgrade.

Contributes to issue CURA-6311.
 2019-06-12 09:09:41 +02:00
Jaime van Kessel
f842769c1d Fix situation where _calculateMoveFromWallRadius could cause exception 2019-06-07 17:21:28 +02:00
Jaime van Kessel
4018c24b4c Split out all the individual steps for getting the edgeDisallowedSize 
This makes it so much easier to write tests for it
 2019-06-07 17:14:51 +02:00
Jaime van Kessel
3967c995f1 Split out updating the machine size properties so it can be tested easily 2019-06-07 16:42:51 +02:00
Jaime van Kessel
2f83fa1a42 Small code simplification 2019-06-07 16:34:38 +02:00
Jaime van Kessel
887f50dee4 Add tests for calculating the extra z clearance 2019-06-07 16:30:29 +02:00
Jaime van Kessel
54740dd486 Add some unhappy flow tests for rebuild 2019-06-07 16:09:18 +02:00
Jaime van Kessel
090b7ac225 Refactor the rebuild function to cut it up in smaller bits 2019-06-07 16:08:47 +02:00
Jaime van Kessel
a98f88e6a3 Also move _getMachineTypeNameFromId to DiscoveredPrintersModel 
As this is only used by that model, there is no point in keeping it in the machine manager
 2019-06-07 15:04:19 +02:00
Jaime van Kessel
5eee3fc368 Move hasHumanReadableMachienTypeName to discovered printers 2019-06-07 15:01:30 +02:00
Jaime van Kessel
05a5f66856 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
Jaime van Kessel
06aaf40d06 Add test for computation of prime blob 2019-06-07 14:29:15 +02:00
Jaime van Kessel
1759e01b27 Make _geSettingFromAllExtruders use zip 
This is a bit cleaner to use
 2019-06-07 13:40:41 +02:00
Jaime van Kessel
a6ca49d68c Fix typing for Buildvolume 2019-06-07 13:34:57 +02:00
Remco Burema
6f928ad97c Merge branch 'master' into feature_intent 2019-06-07 10:39:52 +02:00
Lipu Fei
0e55b25e0b
Merge pull request #5768 from Ultimaker/CURA-5395-orthographic-view 
Support for orthographic view
 2019-06-06 11:49:25 +02:00
Remco Burema
a30814fe52 Remove square prime tower. [CURA-6460] 2019-06-06 10:07:05 +02:00
Jaime van Kessel
080cafe78f Increase the looking from offset so model doesn't get cut off 
CURA-5965
 2019-06-06 10:01:20 +02:00
Jaime van Kessel
7880c8d3f4 Revert "Clean up snapshot code" 
This reverts commit 37b904a3c4.
 2019-06-06 09:58:15 +02:00
Jaime van Kessel
37b904a3c4 Clean up snapshot code 2019-06-06 09:51:06 +02:00
Lipu Fei
c2b866fd05 Fix scale for just ungrouped objects 
CURA-6565

Same as in Uranium _calculateAABB()
 2019-06-05 13:29:45 +02:00
Jaime van Kessel
6e053e0bb6 Mark objects that are completely below the buildplate as outside of the buildvolume 
CURA-6545
 2019-06-05 13:25:43 +02:00
Jaime van Kessel
35ec70a3cf Add a selector for the intent profile 
CURA-6534
 2019-06-05 11:13:32 +02:00
Jaime van Kessel
2d8c19203e Expose intent model to QML 
CURA-6534
 2019-06-05 09:57:42 +02:00
Jaime van Kessel
2e7f8b066a Ensure that the intent model gets populated 
CURA-6534
 2019-06-04 17:32:11 +02:00
Jaime van Kessel
266cf52cbc Add stub for the IntentModel 
CURA-6534
 2019-06-04 17:24:34 +02:00
Lipu Fei
a6fea1bf40 Simplify check 
CURA-6545
 2019-06-04 07:43:58 +02:00
Ghostkeeper
c00bd8c138
Merge branch 'fix_emptyviewmenucomponent_url' of https://github.com/fieldOfView/Cura into fieldOfView-fix_emptyviewmenucomponent_url 2019-06-03 14:25:38 +02:00
Ghostkeeper
228fb62e60
Handle functions in user or user-changes profiles 
Normally the user hasn't got any of these unless he selected a setting to be copied for all extruders.
 2019-06-03 14:15:40 +02:00
Jaime van Kessel
7cc4ac741c Add version upgrade that adds empty intent profile to the stacks 
CURA-6534
 2019-06-03 11:49:03 +02:00
Jaime van Kessel
a1bbb46555 Add intent to recognised resource types 
CURA-6534
 2019-06-03 11:15:59 +02:00
Jaime van Kessel
a595feb24e Increase the version of the CuraContainer stack 
Since we added a new layer to it, it's version is one level higher (*DING*)

CURA-6534
 2019-06-03 11:10:20 +02:00