Lipu Fei
66b26bafd4
Show quality name in project loading summary
...
CURA-4142
In case the quality changes container is not there, show the quality
name of the quality profile.
2017-08-09 13:27:00 +02:00
Lipu Fei
98b72fb971
Merge branch '2.7'
2017-08-09 13:16:43 +02:00
Lipu Fei
ccabbd8ca0
Mark definition changes container found instead of conflict
...
CURA-4143
Reverts 65554b60e19507635c79048dc73862e6b25ec0ec
2017-08-09 13:12:06 +02:00
Lipu Fei
65554b60e1
Mark definition_changes conflict if it is not found
...
CURA-4143
2017-08-09 13:06:18 +02:00
krios-fabteam
8829f64991
updated resources settings version
2017-08-09 10:21:56 +02:00
Lipu Fei
6fd3963e8f
Fix material searching in isContainerUsed()
...
CURA-4129
Searching for used materials should also take into account the material
container ID.
2017-08-09 09:47:36 +02:00
Ghostkeeper
c0d96a1d79
Remove heat/cool speeds that are equal to default
...
The default value for both of these settings in fdmprinter is 2.
2017-08-09 09:46:22 +02:00
Lipu Fei
e414621250
Fix code style
2017-08-09 09:27:42 +02:00
Lipu Fei
ab3d8349b6
Also skip empty containers when getting layer height for a quality profile
...
CURA-4133
On some machines such as UM2, there is no material. Getting the layer
height in this case will result back to the global stack itself, which
is the layer height of the current setting. This is a problem for
"Normal" (or "Fine") quality because it uses the machine's default layer
height.
2017-08-09 09:24:04 +02:00
Lipu Fei
7d3ad43c90
Merge pull request #2177 from Ultimaker/raft_smoothing
...
JSOn feat: raft smoothing setting (CURA-3854)
2017-08-09 08:40:34 +02:00
Lipu Fei
63ea940680
Add minimum_value 0 for raft_smoothing
...
CURA-3854
2017-08-09 08:39:10 +02:00
Lipu Fei
33bf758081
Merge pull request #2127 from ChrisRiddell/cr_fix_ironing_settings
...
Keep Ironing settings together while in experimental
2017-08-08 16:54:37 +02:00
Lipu Fei
050caf49b2
Merge branch '2.7'
2017-08-08 16:44:58 +02:00
Lipu Fei
f75871567f
Merge branch 'master' into cr_fix_ironing_settings
2017-08-08 16:43:48 +02:00
Lipu Fei
8c6abc85fc
Rename variable in for loop
...
CURA-4129
2017-08-08 16:32:40 +02:00
Lipu Fei
bb1475d1fd
Search for instance containers with type material
...
CURA-4129
2017-08-08 16:32:02 +02:00
Ghostkeeper
b9cdeb68d6
Don't crash when there is no global quality container
...
We fill the stack with an empty container rather than with None in that case.
Contributes to issue CURA-3301.
2017-08-08 14:40:02 +02:00
Ghostkeeper
fe406f530c
Never fill None for quality changes profile
...
We want it to be the empty profile instead. This gets passed on all the way to _replaceQualityOrQualityChangesInStack where the metadata is requested.
Contributes to issue CURA-3301.
2017-08-08 13:51:40 +02:00
fieldOfView
0630559472
Fix setting variant of non-active extruder through menu
2017-08-08 11:41:15 +02:00
Ghostkeeper
a75387ff3e
Only use Z-hop setting for the used extruders
...
Otherwise the unused extruders still influence the build volume.
2017-08-08 11:40:19 +02:00
Ghostkeeper
919bc6767c
Disable top surface line directions if there is no top surface
2017-08-08 11:40:19 +02:00
fieldOfView
8d72ba5fe7
Fix setting material of non-active extruder through menu
2017-08-08 11:32:34 +02:00
fieldOfView
975e7f04b4
Remove unused incorrect code
...
The property is called activeMaterialIds, but it returns the stack ids. The code is superceeded by allActiveMaterialIds.
2017-08-08 11:27:45 +02:00
Lipu Fei
4a34f141d1
Check if a material container is used by GUID
...
CURA-4129
isContainerUsed() is used to enable/disable the "Remove" button on the
Material Manager dialog. When a custom material is created, it creates
multiple containers, one for each extruder variant. In the dialog, it
only checks if the material for the currently active extruder is being
used or not. This causes a problem when 2 extruders are of different
types and one uses a custom material. Then, the "Remove" button will
not be correctly enabled/disable in the Material Manager dialog when
the other extruder is activated.
2017-08-07 13:17:47 +02:00
Ghostkeeper
80cbdd03bb
Merge branch '2.7'
2017-08-07 11:06:12 +02:00
Ghostkeeper
ac5c0d019b
Minor fixes to Polish translation
...
Contributes to issue CURA-4113.
2017-08-07 11:06:00 +02:00
Lipu Fei
09576241db
Generate unique names for definition changes containers
...
CURA-4107
2017-08-07 10:59:24 +02:00
Lipu Fei
76e8090dbd
Remove duplicated function createDefinitionChangesContainer()
...
CURA-4107
2017-08-07 10:59:24 +02:00
Ghostkeeper
e23e049c22
Update Polish translations for 2.7
...
These are the translation files exactly as I got them from Jagus85. Thanks!
Contributes to issue CURA-4113.
2017-08-07 10:58:46 +02:00
Lipu Fei
3bc7e9012d
Use the right stack to retrieve infill values in Recommended mode
...
CURA-3932
2017-08-07 10:53:19 +02:00
Ghostkeeper
cf1309c650
Don't update next stack if there is no next stack
...
Not all extruder stacks have a next stack. Well currently every extruder stack should have a next stack, but the code is built around the possibility that there isn't a next stack elsewhere too.
Contributes to issue CURA-4121.
2017-08-07 09:47:53 +02:00
Ghostkeeper
584e1b6abb
Set the next stack before adding the user container
...
Since the user container may trigger a propertyChanged signal, which then requests the next stack.
Contributes to issue CURA-4121.
2017-08-07 09:45:16 +02:00
Lipu Fei
b274f63df0
Use the right stack to retrieve infill values in Recommended mode
...
CURA-3932
2017-08-04 14:19:14 +02:00
Lipu Fei
7cb8e675cf
Remove redundant createDefinitionChangesContainer() in UMOUpgradeSelection
2017-08-04 11:14:56 +02:00
Ghostkeeper
c7c54f6d3a
Add test to ensure that UM3 and UM3E variants are kept the same
...
It's a bit chunky, but functional.
2017-08-04 00:50:42 +02:00
Lipu Fei
b4be6fcb9f
Use Label for LayerView legend texts
...
CURA-3799
2017-08-03 16:18:58 +02:00
Ghostkeeper
9837537120
Merge branch '2.7'
2017-08-03 15:55:08 +02:00
Ghostkeeper
d85fd63795
Mention Neotko as the originator of Ironing
...
As promised.
Contributes to issue CURA-4114.
2017-08-03 15:53:32 +02:00
alekseisasin
c5cdf2e206
UM3 Initial layer speed is fixed 20
...
CURA-3377
2017-08-03 15:19:17 +02:00
alekseisasin
03c48ac39c
Addded other printer "Kemiq Q2 Gamma & Beta" and material quality
...
CURA-4086
2017-08-03 15:05:45 +02:00
alekseisasin
543fda4656
Merge pull request #2136 from kemiq3d/master
...
Add Kemiq Q2 Beta and Kemiq Q2 Gama definitions, mesh and qualities
2017-08-03 15:04:35 +02:00
alekseisasin
2990333d1d
Updated the Change log (added 2.6.2 and 2.7.0)
...
CURA-4114
2017-08-03 14:00:55 +02:00
Lipu Fei
f5c1bd6abd
Add unit "mm" for Support Chunk Size
...
CURA-3957
2017-08-03 13:55:52 +02:00
Lipu Fei
8029efdffb
Rename skip-some-zags setting names
...
CURA-3957
2017-08-03 13:55:24 +02:00
alekseisasin
c4d23437f2
Updated the Change log (added 2.6.2 and 2.7.0)
...
CURA-4114
2017-08-03 13:19:49 +02:00
Lipu Fei
50960a3904
Merge branch 'master' into remove_some_zags
2017-08-03 13:10:39 +02:00
Lipu Fei
ddee562129
Fix typo in LayerView.qml
...
CURA-3799
2017-08-03 13:06:20 +02:00
alekseisasin
b984b99c30
Translated text overlaps GUI
...
CURA-3799
2017-08-03 13:05:53 +02:00
alekseisasin
3cbf0640a5
Added method to close the application (after clicking quit button) to prevent loss of custom material
...
CURA-3298
2017-08-03 11:57:27 +02:00
fieldOfView
92859697c5
Fix error about empty qml url
2017-08-03 10:57:47 +02:00
