11407 Commits

Author SHA1 Message Date
fieldOfView
7dc4975b36 Tweak layout and texts 2017-10-24 11:33:47 +02:00
Jack Ha
5d51d547da Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-24 11:25:21 +02:00
Jack Ha
d8e1b5b9b4 CURA-4481 add setting Remove Empty First Layers 2017-10-24 11:25:12 +02:00
fieldOfView
46fc478f9d Tweak disabled appearance 2017-10-24 11:15:33 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
alekseisasin
b0c54bb26a Merge pull request #905 from Ultimaker/snappier_camera_animation
Make camera animation feel snappier
2017-10-24 10:36:55 +02:00
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
fieldOfView
6294900bc7 Disable controls when manual control is not available 2017-10-24 10:23:07 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
fieldOfView
9cd8869382 Add settable jog distance 2017-10-23 22:27:05 +02:00
fieldOfView
56fa7036b3 Add controls for jogging the head/bed 2017-10-23 21:27:53 +02:00
ChrisTerBeke
3794ae16ae Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451 2017-10-23 17:41:58 +02:00
ChrisTerBeke
d018e0b2bb First steps towards salvation - CURA-4451 2017-10-23 17:34:31 +02:00
alekseisasin
f6cd7327d3 Merge pull request #2660 from Ultimaker/CURA-4447_UPDATE_INSTANCE_CONTAINER
Cura 4447 update instance container
2017-10-23 16:27:21 +02:00
ChrisTerBeke
3ef680af5e Merge branch 'master' into CURA-4451_not_support_container 2017-10-23 15:57:11 +02:00
ChrisTerBeke
d2ef373d19 Also apply container changes when no user interaction is required - CURA-4447 2017-10-23 15:50:42 +02:00
ChrisTerBeke
560be2931a Create empty not supported container dynamically when no qualities are found - CURA-4451 2017-10-23 15:41:45 +02:00
Jack Ha
c56d135b15 Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-23 14:20:22 +02:00
Jack Ha
4cfd0de580 CURA-4248 hide settings in UI for Surface Energy and Adhesion Tendency 2017-10-23 14:20:10 +02:00
ChrisTerBeke
c132300fd5 start 2017-10-23 13:56:26 +02:00
ChrisTerBeke
ff732720ca Set quality slider active index to -1 for user created profile, fix for CURA-4466 2017-10-23 12:45:07 +02:00
ChrisTerBeke
e63616ca41 Update method description - CURA-4447 2017-10-23 11:43:15 +02:00
ChrisTerBeke
4bd132943c Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER 2017-10-23 11:41:39 +02:00
ChrisTerBeke
2361e96e29 Wait with updating active stack variant and material until dialog was closed - CURA-4447 2017-10-23 11:41:20 +02:00
Diego Prado Gesto
eb0b08a813 CURA-4470 Hide quality slider handle when quality profile doesn't exist 2017-10-22 18:35:05 +02:00
Buco
f1d125b232 Added quality profiles
Made some changes to the main profiles and added quality profiles for each material.
2017-10-20 16:09:26 +02:00
Brecht Nuyttens
33e42493fd Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2017-10-20 15:18:17 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
2017-10-20 15:09:45 +02:00
ChrisTerBeke
09ed53b4ec Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER 2017-10-20 12:38:12 +02:00
ChrisTerBeke
9f73f79b2f Update simple mode manager states when manager is created - CURA-4466 2017-10-20 12:37:59 +02:00
ChrisTerBeke
95a2559607 indent 2017-10-20 12:34:35 +02:00
ChrisTerBeke
31a04ed8da Also emit active quality changed when no dialog interaction occured - CURA-4447 2017-10-20 11:37:45 +02:00
ChrisTerBeke
e24242dc3c Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER 2017-10-20 11:34:45 +02:00
ChrisTerBeke
64bcf4b44d Remove debug log when XML material file contains unused property 2017-10-20 10:22:09 +02:00
ChrisTerBeke
3fcf20c714 Merge pull request #2564 from BagelOrb/slicing_mode
Adds a UI setting for the new slicing tolerance option in the engine.
2017-10-20 09:49:05 +02:00
Diego Prado Gesto
d2d28fbdfb CURA-4470 Fix quality slider not selecting correct quality profile
Compare selected quality by quality_type instead of id when loading a
project file from older versions of Cura.
2017-10-19 20:49:11 +02:00
ChrisTerBeke
be046117c4 Sidable quality slider handle when switching to user created profile - CURA-4466 2017-10-19 18:00:03 +02:00
Tim Kuipers
823d11f0e1 rename slicing mode ==> slicing tolerance 2017-10-19 17:14:01 +02:00
Tim Kuipers
4650a12324 slicing mode 2017-10-19 17:14:01 +02:00
ChrisTerBeke
30281f17f3 Add simple mode settings flag for user created profile - CURA-4466 2017-10-19 17:03:31 +02:00
Ghostkeeper
f7e048aee5
Remove unused variable
Contributes to issue CURA-4243.
2017-10-19 16:37:03 +02:00
Ghostkeeper
2fc198a7ad
Move manual criterion into base criteria filter
This code was filtering on certain criteria, and then filtering the results based on an additional metadata field. Let's just move that last field in the original criteria too...

Contributes to issue CURA-4243.
2017-10-19 15:48:19 +02:00
Ghostkeeper
7745113704
Re-use stack variable
We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient.

Contributes to issue CURA-4243.
2017-10-19 15:32:21 +02:00
ChrisTerBeke
3354f58ddb Remove BAM qualities 2017-10-19 15:14:28 +02:00
ChrisTerBeke
70cf86c65b Remove debug print - CURA-4447 2017-10-19 14:40:56 +02:00
ChrisTerBeke
e9336b9b9e Small cleanups for discard or keep behavior - CURA-4447 2017-10-19 14:39:32 +02:00
Diego Prado Gesto
1a47ec85ca Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-19 13:58:19 +02:00
Diego Prado Gesto
b49610f0c8 Merge branch 'CURA-4248_BAM' 2017-10-19 13:57:30 +02:00
Diego Prado Gesto
0e74f9d881 CURA-4248 - Fix some mistakes in the formulas in quality profiles 2017-10-19 13:54:10 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
2017-10-19 13:38:08 +02:00