Commit graph

5917 commits

Author SHA1 Message Date
Jaime van Kessel
2e71ce2710 Added intent to the CuraContainerStack
CURA-6534
2019-06-03 10:52:19 +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
Jaime van Kessel
4a6495a0e6 Remove unneeded itemsChanged emit
CURA-6283
2019-05-23 16:01:53 +02:00
Jaime van Kessel
48dd9d247c Renamed some local variables so they describe better what they do
CURA-6283
2019-05-23 16:01:19 +02:00
Jaime van Kessel
c784a39ec6 Fixed typing
CURA-6283
2019-05-23 15:59:14 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting"
This reverts commit bec7b6546d, reversing
changes made to 7094b222b1.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
2019-05-23 13:40:11 +02:00
Lipu Fei
288770b991 Fix merge conflicts 2019-05-23 11:37:51 +02:00
Lipu Fei
fb33497ff1 Fix auto-slice for per-object settings
CURA-6539
2019-05-23 11:36:55 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Lipu Fei
5d58d60a16 Fix typing
CURA-6283
2019-05-21 13:39:14 +00:00
Lipu Fei
83b9e5e53b Change import
CURA-6182
2019-05-21 15:17:04 +02:00
Lipu Fei
c9642273eb Fix typing
CURA-6283
2019-05-21 15:15:18 +02:00
Lipu Fei
c282897c1e Fix numbering in object renaming
CURA-6283

For both individual nodes and grouped nodes.
2019-05-21 14:49:45 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode
CURA-6182

Move complex logic to Python.
2019-05-21 08:10:49 +02:00
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function
CURA-5395
2019-05-20 16:34:24 +02:00
Jaime van Kessel
f7d0bcd0d4 Prevent modifier meshes from blocking one at a time slicing
CURA-6030
2019-05-20 14:40:41 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name
CURA-6497 Add validation for empty strings in SettingDefinition
2019-05-20 13:40:39 +02:00
Jaime van Kessel
5ae103964a Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1 2019-05-20 13:38:37 +02:00
Ghostkeeper
2ada8cec72
Cast autosave delay preference to int
Oops. How long has this been in there, you think? At least 3 years.
As seen in #5729, when changing this preference it results in an error that it can't set the interval to a string. The default is an integer, so if you don't edit it it works fine, but if you edited the preferences file, it gets a string from the preferences file. Casting both to an int should work.
2019-05-20 13:33:33 +02:00
Jaime van Kessel
c1818bcfbe Add test for CuraStackBuilder 2019-05-20 08:57:58 +02:00
Lipu Fei
33aae24d6d Merge remote-tracking branch 'origin/4.1' 2019-05-17 14:41:52 +02:00
Remco Burema
4813ff0bb7 Ask users to write English in crash-report. 2019-05-17 10:37:25 +02:00
Jaime van Kessel
8b73f7cef9 No longer create convex hulls for modifier meshes
CURA-6030
2019-05-17 09:47:47 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list
Add an object list/selector
2019-05-17 07:48:22 +02:00