Commit graph

9654 commits

Author SHA1 Message Date
Lipu Fei
da8b55cf62 Make sure stacks will have non-empty definitionChanges in project loading
CURA-4107

In old Cura, there is no definitionChanges container, so loading a
project file from an old version will result in stacks with empty
defnitionChanges. This will cause an unnecessary auto-slice problem when
we switch between the extruder tabs for the first time. This action will
trigger a piece code in MachineAction which creates a definitionChanges
container for the active stack if it is empty. This eventually triggers
a propertyChanged signal and results in an unncessary auto-slicing.
2017-08-15 14:38:49 +02:00
Lipu Fei
3ebaacfa11 Use the extruder count in the global stack in project loading
CURA-4167

Custom FDM printers have multiple extruder stacks by default but not all
of them may be used. The actual number of extruders depends on what's
defined in the global stack. Because in the current architecture,
single-extrusion machines don't have extruder stacks, in project
loading, the extruder count in the global stack should be used so these
cases can be handled properly.
2017-08-15 14:19:23 +02:00
Lipu Fei
3a46a337ff In SliceInfo, use the global stack if it is a single-extrusion machine
CURA-4167

Single extrusion machines don't have extruder stacks in the current
architecture.
2017-08-15 14:19:23 +02:00
Lipu Fei
e67286c0d8 Do not add extruder stacks for single-extrusion machines
CURA-4167

In the current architecture, single-extrusion machines don't have
extruder stacks.
2017-08-15 14:19:23 +02:00
Ghostkeeper
3110349f5e
Fix misunderstood translation
Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird.

Contributes to issue CURA-4113.
2017-08-15 14:15:51 +02:00
Ghostkeeper
1f778e8d2f
Fix translated replacement strings
Bad translators! Bad! It even says so in the context!

Contributes to issue CURA-4113.
2017-08-15 11:13:48 +02:00
Ghostkeeper
8f46733dec
Correct whitespace of fatal exception text
It's not salient for our translation files really, since it is displayed in QML in the end which removes those. It is salient for gettext though, which gives an error when one message ends in a newline and the other doesn't.

Contributes to issue CURA-4113.
2017-08-15 11:05:50 +02:00
Lipu Fei
026244fb53 Add comments for conflict detection
CURA-4143
2017-08-15 10:49:11 +02:00
Lipu Fei
9ff6ae010a Use findInstanceContainers() for definition_changes
CURA-4167
2017-08-15 10:44:23 +02:00
Ghostkeeper
cbc60c7689
Minor fixes for German translations
Contributes to issue CURA-4113.
2017-08-15 09:58:42 +02:00
Ghostkeeper
262691c1ff
Update German translations
These are the translations from Bothof. They look mostly correct.

Contributes to issue CURA-4113.
2017-08-15 09:56:57 +02:00
Ghostkeeper
f6c84e054b
Fix HTML tags
They shouldn't be translated. Bad translator! BAD!

Contributes to issue CURA-4113.
2017-08-15 09:28:42 +02:00
Ghostkeeper
4f471ea1a4
Update Spanish translations
These are the updates from Bothof. I found some older mistakes here, which I'll solve next.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
1e1e6386fc
Update Finnish translation
These are the translation files from Bothof. They are excellent as far as I could detect.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
22d7312265
Minor fixes to French translations
These must've been in there for a while...

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
cd8b485e98
Update French translations
These are the new translations from Bothof. I've found some mistakes in cura.po which I'll fix in the next commit to make it clear which changes are from me.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
50508baad7
Minor interpunction fixes for Italian translation
The one with the href attribute is pretty serious.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
7c86e476c8
Update Italian translations
These look almost correct. Just one mistake with an HTML tag.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
45673a3586
Fixes to Dutch translations
Some consistency fixes and several places where they misunderstood the meaning of a text.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
92f5a4c392
Update Dutch translations
There's several mistakes in these translations. I'm fixing those in the next commit to keep it separate.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
673e281e4d
Fix XML tags in Turkish translation
Bad, BAD translator!

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
7682ffad08
Update Turkish translations
Some of these are plain wrong. We'll fix those in the next commit.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
fa49c7a939
Update Japanese translations
These are the new texts for 2.7.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Lipu Fei
dce575f661 Remove wall_extruder_nr from ExtruderManager.getUsedExtruderStacks
CURA-4145
2017-08-14 13:39:56 +02:00
Lipu Fei
2a695517f7 Remove wall_extruder_nr from fdmprinter
CURA-4145

 - Remove "wall_extruder_nr"
 - Remove all "limit_to_extruder" for all parent wall settings
 - Change settings that used to depend on the wall extruder to get
   value from the inner wall extruder
2017-08-14 13:21:26 +02:00
Ghostkeeper
cc26d52af3
Revert "Add settings for skipping some zags"
This reverts commit a0e59dd6aa.
2017-08-14 11:08:28 +02:00
Ghostkeeper
70a0a6ef1c
Fix infill before walls check
This could be dependent on either the inner or the outer wall, depending on how many walls you have. However usually it will be the inner wall.

Contributes to issue CURA-4145.
2017-08-14 11:02:32 +02:00
Lipu Fei
bb1316fc88 Check if a material is being used based on base_file
CURA-4129
2017-08-14 08:48:07 +02:00
Ghostkeeper
0b19b20c24
Fix language metadata
For some reason PoEdit seems to automatically put this back every time. Maybe it's time to switch to a different standard.

Contributes to issue CURA-4113.
2017-08-11 16:57:14 +02:00
Ghostkeeper
9243444c0e
Merge branch 'halfakop-2.7' into 2.7 2017-08-11 16:55:51 +02:00
Ghostkeeper
23aeb7efa8
Merge branch '2.7' of https://github.com/halfakop/Cura into halfakop-2.7 2017-08-11 16:55:29 +02:00
Ghostkeeper
5416504fcb
Update Korean translations
These files are directly copied from the translator. They seem to be perfect though so I don't see a reason to modify them further (apart from the fact that I don't know any Korean; the format is correct though).

Contributes to issue CURA-4113.
2017-08-11 16:19:49 +02:00
Ghostkeeper
824849a878
Make manufacturer for base fdm- definitions unknown
They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer.

Contributes to issue CURA-4159.
2017-08-11 12:38:34 +02:00
Lipu Fei
3e870d2e40 Always update raft thickness and extra z clearance before rebuilding the build volume
CURA-4154
2017-08-11 12:27:45 +02:00
Ghostkeeper
b03847447f
Take manufacturer from XML profile if available
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
2017-08-11 11:13:23 +02:00
Ghostkeeper
e1266ceb1f Change Ultimaker manufacturer to Ultimaker B.V.
The material profiles are sent to UM3 with a manufacturer that's obtained from the printer definition rather than the material definition. The printer definition was 'Ultimaker' rather than 'Ultimaker B.V.' and the printer checked against this.

Contributes to issue CURA-4159.
2017-08-11 10:24:13 +02:00
Lipu Fei
4bac499c22 Use QualityManager._getFilteredContainersForStack() to get qualities
CURA-4151

The quality searching code in _configureProfile() for importing quality
profiles doesn't take into account base materials. Use the function in
QualityManager to solve this problem.
2017-08-10 12:14:43 +02:00
Ruslan Popov
d349854bdd Update russian translation. 2017-08-09 19:28:25 +03:00
Lipu Fei
a49c956cfa Temporary work around for "not overriden" limit to extruder features
CURA-4145

When features with limit to extruder set to "not overriden" and its
value is retrieved with "extruderValue()", because the extruder number
is "-1", extruderValue() falls back to the global stack. As a result,
values can be incorrect. This workaround using the variants temporarily
solves the problem for outer and inner wall line widths.
2017-08-09 16:57:21 +02:00
Lipu Fei
1aba451149 Fix value for outer wall_line_width
CURA-4145
2017-08-09 13:52:05 +02:00
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
ccabbd8ca0 Mark definition changes container found instead of conflict
CURA-4143

Reverts 65554b60e1
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
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
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