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
Lipu Fei
946b8ae92d
Remove executable bit for non-executable files
2017-10-19 10:28:57 +02:00
Diego Prado Gesto
d3e8915b30
Merge branch 'master' into CURA-4248_BAM
2017-10-19 10:26:25 +02:00
Lipu Fei
475f6223d4
Remove executable bit for json files
2017-10-19 10:24:38 +02:00
A.Sasin
5a8fa92c3f
Added semicolon
...
CURA-4449
2017-10-19 09:01:15 +02:00
Lipu Fei
d735921d42
Take into account the keep/discard interaction when emitting signals
...
CURA-4248
When user switches to a different profile, the keep/discard dialog can
show up. Don't emit signals immediately if this interaction takes place
because it will trigger an unnecessary slice.
2017-10-19 08:32:26 +02:00
alekseisasin
10127240b5
Merge pull request #2593 from petterreinholdtsen/patch-1
...
List model/x3d+xml in the desktop file
2017-10-18 18:06:22 +02:00
ChrisTerBeke
f4eb2ee256
Merge pull request #2612 from fieldOfView/fix_splashscreen_sub_version_size
...
Fix size of "beta" classifier on splash screen for HiDPI screens
2017-10-18 16:46:56 +02:00
ChrisTerBeke
3ddb277477
Remove double sidebar header item, fixes #2605
2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823
Update helper text for custom changes in recommended settings - CURA-4333
2017-10-18 15:44:02 +02:00
ChrisTerBeke
795eda64e3
Merge branch 'master' into CURA-4248_BAM
2017-10-18 15:08:51 +02:00
ChrisTerBeke
f07c5ab470
remove unused ignore
2017-10-18 14:31:03 +02:00
ChrisTerBeke
7d58208507
Fix BAM draft quality weight - CURA-4248
2017-10-18 14:19:11 +02:00
