3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '2.7'

Browse source
This commit is contained in:
Lipu Fei 2017-08-09 13:16:43 +02:00
commit 98b72fb971
28 changed files with 6 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Settings/ContainerManager.py
View file

@ -341,7 +341,8 @@ class ContainerManager(QObject):
this_container = container_results[0]
container_guid = this_container.getMetaDataEntry("GUID")
# check all material container IDs with the same GUID
material_containers = self._container_registry.findInstanceContainers(GUID = container_guid,
material_containers = self._container_registry.findInstanceContainers(id = container_id,
GUID = container_guid,
type = "material")
if material_containers:
container_ids_to_check = [container.getId() for container in material_containers]

6
cura/Settings/ProfilesModel.py
View file

@ -108,9 +108,9 @@ class ProfilesModel(InstanceContainersModel):
#Quality has no value for layer height either. Get the layer height from somewhere lower in the stack.
skip_until_container = global_container_stack.material
if not skip_until_container: #No material in stack.
if not skip_until_container or skip_until_container == ContainerRegistry.getInstance().getEmptyInstanceContainer(): #No material in stack.
skip_until_container = global_container_stack.variant
if not skip_until_container: #No variant in stack.
if not skip_until_container or skip_until_container == ContainerRegistry.getInstance().getEmptyInstanceContainer(): #No variant in stack.
skip_until_container = global_container_stack.getBottom()
item["layer_height"] = str(global_container_stack.getRawProperty("layer_height", "value", skip_until_container = skip_until_container.getId())) + unit #Fall through to the currently loaded material.
yield item
yield item

1
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -222,6 +222,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
definition_name = instance_container.getName()
num_settings_overriden_by_definition_changes += len(instance_container._instances)
definition_changes = self._container_registry.findDefinitionContainers(id = container_id)
containers_found_dict["definition_changes"] = True
if definition_changes:
if definition_changes[0] != instance_container:
definition_changes_conflict = True

2
resources/definitions/101Hero.def.json
View file

@ -28,8 +28,6 @@
"layer_height": { "default_value": 0.2 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_with_fans_polygon": {
"default_value": [
[ 0, 0 ],

6
resources/definitions/grr_neo.def.json
View file

@ -30,12 +30,6 @@
"machine_nozzle_size": {
"default_value": 0.5
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

6
resources/definitions/kossel_mini.def.json
View file

@ -36,12 +36,6 @@
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

6
resources/definitions/kossel_pro.def.json
View file

@ -35,12 +35,6 @@
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

6
resources/definitions/makeR_pegasus.def.json
View file

@ -37,12 +37,6 @@
"material_diameter": {
"default_value": 2.85
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

6
resources/definitions/makeR_prusa_tairona_i3.def.json
View file

@ -37,12 +37,6 @@
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

6
resources/definitions/makeit_pro_l.def.json
View file

@ -35,12 +35,6 @@
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_with_fans_polygon":
{
"default_value": [

6
resources/definitions/makeit_pro_m.def.json
View file

@ -35,12 +35,6 @@
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_with_fans_polygon":
{
"default_value": [

6
resources/definitions/maker_starter.def.json
View file

@ -33,12 +33,6 @@
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"gantry_height": {
"default_value": 55
},

2
resources/definitions/mankati_fullscale_xt_plus.def.json
View file

@ -19,8 +19,6 @@
"machine_heated_bed": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_with_fans_polygon": {
"default_value": [
[ -3, 3 ],

6
resources/definitions/mendel90.def.json
View file

@ -62,12 +62,6 @@
"machine_heat_zone_length": {
"default_value": 16
},
"machine_nozzle_heat_up_speed": {
"default_value": 2.0
},
"machine_nozzle_cool_down_speed": {
"default_value": 2.0
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

2
resources/definitions/printrbot_simple.def.json
View file

@ -22,8 +22,6 @@
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_with_fans_polygon": {
"default_value": [
[-49, 20],

2
resources/definitions/printrbot_simple_extended.def.json
View file

@ -22,8 +22,6 @@
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_with_fans_polygon": {
"default_value": [
[ 55, -20 ],

6
resources/definitions/prusa_i3.def.json
View file

@ -36,12 +36,6 @@
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

2
resources/definitions/prusa_i3_mk2.def.json
View file

@ -31,8 +31,6 @@
"retraction_retract_speed": { "default_value": 35 },
"retraction_prime_speed": { "default_value": 35 },
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
"gantry_height": { "default_value": 28 },
"machine_max_feedrate_z": { "default_value": 12 },

6
resources/definitions/prusa_i3_xl.def.json
View file

@ -36,12 +36,6 @@
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2.0
},
"machine_nozzle_cool_down_speed": {
"default_value": 2.0
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

6
resources/definitions/rigidbot.def.json
View file

@ -26,12 +26,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"gantry_height": {
"default_value": 0
},

6
resources/definitions/rigidbot_big.def.json
View file

@ -29,12 +29,6 @@
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"gantry_height": {
"default_value": 0
},

3
resources/definitions/tam.def.json
View file

@ -43,9 +43,6 @@
"xy_offset": { "default_value": -0.01 },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_use_extruder_offset_to_offset_coords": { "default_value": true },
"material_diameter": { "default_value": 1.75 },

6
resources/definitions/ultimaker2.def.json
View file

@ -56,12 +56,6 @@
"default_value": 0.4,
"minimum_value": "0.001"
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"gantry_height": {
"default_value": 48
},

6
resources/definitions/ultimaker_original.def.json
View file

@ -34,12 +34,6 @@
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_with_fans_polygon":
{
"default_value": [

6
resources/definitions/ultimaker_original_dual.def.json
View file

@ -39,12 +39,6 @@
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_with_fans_polygon":
{
"default_value": [

6
resources/definitions/uniqbot_one.def.json
View file

@ -34,12 +34,6 @@
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"gantry_height": {
"default_value": 55
},

6
resources/definitions/vertex_k8400.def.json
View file

@ -65,12 +65,6 @@
"gantry_height": {
"default_value": 18
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

6
resources/definitions/vertex_k8400_dual.def.json
View file

@ -70,12 +70,6 @@
"gantry_height": {
"default_value": 18
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_extruder_count": {
"default_value": 2
},