GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 19:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,965 Commits 295 Branches 268 Tags
Commit Graph

9965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alekseisasin
ae63060d75 Merge branch 'mb-z-offset' of https://github.com/smartavionics/Cura 2017-08-28 10:43:53 +02:00
fieldOfView
61442e512f Fix setting the Gantry height setting in Machine Settings 2017-08-28 10:13:06 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +02:00
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed. 
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
 2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first 
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
 2017-08-25 12:19:05 +02:00
Lipu Fei
414901ae84 Force update the provider when the setting's limit_to_extruder gets changed 
CURA-4186

In the per-object settings, when a setting's limit_to_extruder gets
changed, its value should be updated too.
 2017-08-25 11:58:40 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack 
CURA-4186
 2017-08-25 11:57:52 +02:00
Ghostkeeper
ff4fb0dea0
Merge branch 'patch-4' of https://github.com/probonopd/Cura into probonopd-patch-4 2017-08-25 09:41:59 +02:00
Ghostkeeper
9cea356a18
Replace tabs with spaces 
As per our code style standard.
 2017-08-25 09:22:47 +02:00
Ghostkeeper
90583bd56d
Replace tabs with spaces 
And fix the alignment while we're at it.
 2017-08-25 09:22:07 +02:00
Ghostkeeper
4b4f971222
Make 'other' the default category 
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
 2017-08-25 09:17:55 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Lipu Fei
50a7e8146f Add a dedicated stack class for per-object settings 
CURA-4186

Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
 2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735 Add missing context in getProperty() in global and extruder stacks 
CURA-4186

All getProperty() calls should use the provided context.
 2017-08-24 17:01:03 +02:00
Lipu Fei
2ec7c14422 Fix PerObjectSettingsPanel.qml 
CURA-4186

- The UI shouldn't be bound to the limit_to_extruder stack, it should
  always be bound to the per-object stack.
- The ActiveTool.getValue() calls cannot be bound in QML, so use a
  Connections to update the values based on signals.
 2017-08-24 16:57:12 +02:00
Mark Burton
2db96f02f4 Revised minimum_value and minimum_value_warning values. 
Now just constrains z_offset_taper_layers to be >= 0 as that needs to be positive.
 2017-08-24 15:24:10 +01:00
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Ghostkeeper
a1fdcd0e48
Update prime tower settings for PVA 
This reduces the jerk considerably and makes use of the new prime tower purge settings.
 2017-08-24 15:32:41 +02:00
Ghostkeeper
4caad8f3b9
Add Creality CR10S4 and S5 definitions 
They use the same settings as the normal one but they are larger printers.
 2017-08-24 14:53:15 +02:00
Ghostkeeper
c43b7f6f1b
Update Creality CR10 Beta definition 
The printer was also renamed to a more specific name. These are updates I'm getting from Michael.
 2017-08-24 14:42:39 +02:00
Ghostkeeper
bef1611e98
Merge branch 'kemiq3d-patch-9' 2017-08-24 09:17:25 +02:00
Ghostkeeper
ccf6d12283
Merge branch 'patch-9' of https://github.com/kemiq3d/Cura into kemiq3d-patch-9 2017-08-24 09:17:18 +02:00
Ghostkeeper
5c66beb082
Merge branch 'kemiq3d-patch-8' 2017-08-24 09:15:26 +02:00
Ghostkeeper
548d17390e
Merge branch 'patch-8' of https://github.com/kemiq3d/Cura into kemiq3d-patch-8 2017-08-24 09:15:20 +02:00
Ghostkeeper
df4cd98406
Merge branch 'kemiq3d-patch-7' 2017-08-24 09:14:06 +02:00
Ghostkeeper
6a40264f9a
Merge branch 'patch-7' of https://github.com/kemiq3d/Cura into kemiq3d-patch-7 2017-08-24 09:13:55 +02:00
Ghostkeeper
222c9b66d8
Merge branch 'kemiq3d-patch-6' 2017-08-24 09:12:16 +02:00
Ghostkeeper
a12c569281
Merge branch 'patch-6' of https://github.com/kemiq3d/Cura into kemiq3d-patch-6 2017-08-24 09:12:00 +02:00
Ghostkeeper
523635dfc4
Merge branch 'kemiq3d-patch-5' 2017-08-24 09:10:21 +02:00
Ghostkeeper
ef3377e6fe
Merge branch 'patch-5' of https://github.com/kemiq3d/Cura into kemiq3d-patch-5 2017-08-24 09:10:05 +02:00
Ghostkeeper
65247ae9d4
Merge branch 'patch-4' of https://github.com/kemiq3d/Cura into kemiq3d-patch-4 2017-08-24 09:08:36 +02:00
Ghostkeeper
2000ccd8da
Merge branch 'patch-3' of https://github.com/kemiq3d/Cura into kemiq3d-patch-3 2017-08-24 09:07:11 +02:00
Ghostkeeper
5bd575c1aa
Merge branch 'fix_readme_make_definition' of https://github.com/fieldOfView/Cura into fieldOfView-fix_readme_make_definition 2017-08-24 00:11:37 +02:00
Mark Burton
2c13f5dc75 Add minimum_value to z_offset_taper_layers. 
It now constrains the value to be no less than 0 when z_offset_layer_0 is negative or
z_offset_taper_layers is 0, otherwise the value must be such that the gap between subsequent
layers is not less than 80% of the normal layer height.

If the print head was lowered for the first layer, the tapering will always cause the
subsequent layers to be at least the normal layer height above the previous layer so the
tapering can occur over any number of layers.

On the other hand, if the print head was raised for the first layer, we demand that either
tapering is not used (value is 0) or that the tapering occurs over sufficient layers so that
the inter-layer gaps are not too small.
 2017-08-23 22:32:11 +01:00
Mark Burton
5cbead5128 Add some value constraints to z_offset_layer_0. 
Now the offset cannot be such that the first layer would be less than 1/2 of its normal height.

Warnings shown when first layer is less than 80% or more than 200% of its normal height.
 2017-08-23 21:52:21 +01:00
Lipu Fei
3d44d3c4ca Add logging and minor fix for project loading 
CURA-4204
 2017-08-23 17:42:40 +02:00
Lipu Fei
3805d2ff9e Add comments for HACK in project loading 
CURA-4204
 2017-08-23 17:37:59 +02:00
Lipu Fei
c37782d544 Stop slicing when a new slice is needed 
CURA-4206
 2017-08-23 17:19:48 +02:00
Lipu Fei
d662770b22 Fix setting new material for stacks 
CURA-4204

When a new material is created during project file loading, the material
for each stack is set according to the parent material ID, but actually
the child material should be used. This fix uses a hack to find the
corresponding child material for a stack so when a user chooses to
create a new material during project file loading, the material can be
correctly set.
 2017-08-23 16:27:28 +02:00
Lipu Fei
759d44dbef Add stack context for function evaluation 
CURA-4186
 2017-08-23 14:39:08 +02:00
Jaime van Kessel
b1160c2c37 Labels in layerview now correctly use font 
Fixes #2309
 2017-08-23 14:02:02 +02:00
Jaime van Kessel
d74d865ec8 Merge branch 'skin_preshrink' of github.com:Ultimaker/Cura 2017-08-23 13:34:21 +02:00
Lipu Fei
5564d80950 Merge branch '2.7' 2017-08-23 13:02:05 +02:00
Jaime van Kessel
904682945a Decreased the value of the u_z_bias, so the plate quad is drawn again. 
CURA-4150
 2017-08-23 12:48:19 +02:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder 
CURA-4186
 2017-08-23 12:32:20 +02:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1 Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura 2017-08-23 11:11:45 +02:00
Mark
2d0a4d443d Switch material and print core 
CURA-4147
 2017-08-23 10:54:46 +02:00
Ghostkeeper
b58fb0d05d
Merge branch '2.7' 2017-08-23 09:23:29 +02:00
Ghostkeeper
90860c67c2
Minor tweaks suggested by fieldOfView 
See the comments in this commit: c4d23437f2
 2017-08-23 09:23:04 +02:00