GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-28 23:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,636 Commits 287 Branches 260 Tags
Commit Graph

5291 Commits

Author SHA1 Message Date
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
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 37b904a3c4859e1fb01fa68c59559373152cca3c.
 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
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
fieldOfView
6c64486cd6 Fix creating QUrl to EmptyViewMenuComponent.qml 2019-06-02 14:50:10 +02:00
Jaime van Kessel
55c7f546b2 Split up the rebuild function of the buildvolume 
This should make it a lot easier to test
 2019-05-31 17:32:49 +02:00
Jaime van Kessel
f85095f5d8 Added simple test for BuildVolume 2019-05-31 17:19:27 +02:00
Jaime van Kessel
28287ac62d Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-31 14:54:49 +02:00
Jaime van Kessel
14d5fa5529 Add a bunch of tests for importing profiles 2019-05-31 13:59:54 +02:00
Jaime van Kessel
43360aace0 Add tests for ExportQualityProfile 2019-05-31 13:07:03 +02:00
Ghostkeeper
7b4097bea4
Merge branch 'fix_disallowed_skirt' 2019-05-31 12:53:22 +02:00
Ghostkeeper
ac9f892e09
Remove useless '== True' 2019-05-31 12:53:08 +02:00
Ghostkeeper
72d1f39112
Document better what adhesion spacing is used 
Contributes to issue CURA-6551.
 2019-05-31 12:48:18 +02:00
Lipu Fei
673ed4b3fd
Merge pull request #5806 from Ultimaker/fix_disallowed_skirt 
Fix: adhesion could overlap model because order of (el)if statements.
 2019-05-31 12:13:35 +02:00
Lipu Fei
6efb46c9a9
Merge pull request #5795 from Ultimaker/fix_auto_reset_on_discard_user_changes 
Fix auto-resetting settings when discarding user changes
 2019-05-31 11:18:09 +02:00
Jaime van Kessel
07ff08f6bb Ensure that objects outside build volume are not added to thumbnail 
CURA-6545
 2019-05-29 15:53:23 +02:00
Remco Burema
dc1679bbdd Fix: adhesion could overlap model because order of (el)if statements. 2019-05-29 13:12:34 +02:00
Cherubim
63cd3a52ce
Don't reset all invisible settings 
Why would you need to reset all invisible settings? It shouldn't matter whether a setting is visible or not.
This is causing bugs because the settings that are being reset are not necessarily extruder-type settings (as that is checked below). They are being reset to the value self._default_extruder, which is not always a valid setting value.

Fixes #4274.
 2019-05-28 15:08:03 +02:00
Lipu Fei
0bc8a67a37 Merge master 2019-05-28 10:43:51 +02:00
Jaime van Kessel
76163636a1 Fix the simple create machine test 2019-05-24 16:36:39 +02:00
Jaime van Kessel
66d8e41064 Also add tests for the update of the objects mode 
CURA-6283
 2019-05-24 15:27:08 +02:00
Jaime van Kessel
834e6344df Cut up large update function to make testing easier 
CURA-6283
 2019-05-24 13:26:11 +02:00
Jaime van Kessel
0bede7e3c5 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-24 12:53:56 +02:00
Lipu Fei
8a18e0c65c Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-24 10:51:19 +02:00
Lipu Fei
7c6c00df84 Merge remote-tracking branch 'origin/4.1' 2019-05-24 10:50:43 +02:00
Lipu Fei
27d6b9b53b Calculate bounding box for helper meshes 2019-05-24 10:49:35 +02:00
Jaime van Kessel
bd39a9c591 Simplify & cleanup objects mode 
CURA-6283
 2019-05-24 09:30:50 +02:00
Jaime van Kessel
502eea4d26 Simplify the objects model further 
CUA-6283
 2019-05-23 16:09:22 +02:00
Jaime van Kessel
71d156b175 Remove unneeded check 
CURA-6283
 2019-05-23 16:04:39 +02:00