Ghostkeeper
13c9519a7c
Fix deprecated decorator
...
Contributes to issue CURA-2822.
2017-06-23 09:42:08 +02:00
Lipu Fei
b958e30fe6
Add machine_disallowed_areas and turn off nozzle offsetting for disallowed areas calculation
...
CURA-3663
We don't need to calculate the disallowed areas for certain machines
because they have taken into account the nozzle offsets. This commit
does the following:
- Add machine_disallowed_areas
- Add a flag in definition so that disallowed areas calculation with
nozzle offsets becomes optional in Cura.
Update documentation for no offsetting for nozzles
Contributes to issue CURA-3663.
2017-06-23 08:33:03 +02:00
Ghostkeeper
bc219a06fe
Add MaterialsModel to make material list update upon metadata change
...
This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes.
Contributes to issue CURA-2822.
2017-06-22 18:17:16 +02:00
Ghostkeeper
0e23930bfe
Fix checking whether the old material diameter was the same
...
Getting the old material diameter wasn't working properly.
Contributes to issue CURA-2822.
2017-06-22 18:17:16 +02:00
Ghostkeeper
7ea1d4cc5a
Add getContainerProperty function
...
The opposite of setContainerProperty.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
f041473465
Fix applying material diameter undo
...
Somehow it seems to get the wrong value there though. Debugging that next...
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
c192d37daa
Fix connecting undo action to undo button
...
Also hiding the message afterwards. Apparently that's not done automatically.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
b37fa6f718
Implement warning message when you change material diameter
...
The undo functionality currently gives an error though. Investigating...
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
121bf5897d
Deprecate _updateMaterialContainer
...
There are better alternatives nowadays.
Discovered during CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
fc96dfec4e
Expose approximateMaterialDiameter of the definition
...
This way we can request that from QML.
Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Lipu Fei
7fe5c2ad07
Fix code style
...
CURA-3663
2017-06-21 14:48:54 +02:00
Jaime van Kessel
5375d43320
Merge branch 'fix_layerview_python3.6' of https://github.com/sheinz/Cura
2017-06-19 11:13:31 +02:00
Jaime van Kessel
41c5aaed69
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-16 13:53:05 +02:00
Lipu Fei
5647800aec
Merge pull request #1978 from Ultimaker/feature_sanding_horizontal
...
Horizontal Ironing
2017-06-16 11:55:45 +02:00
Jaime van Kessel
2adf97ba2d
Also apply the filtering on the quality and user profiles model
...
CURA-3935
2017-06-15 17:18:04 +02:00
Ghostkeeper
29b90d26b8
Re-enable centre camera on selection
...
With Qt 5.8 it works again on Windows.
2017-06-15 16:16:56 +02:00
Jaime van Kessel
c93acc12e7
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-15 15:28:34 +02:00
Ghostkeeper
e003abf895
Only display global quality changes profiles
...
There's one copy for every stack. It doesn't matter which one we take as long as they have the same name. Global is always present, even in single extrusion. Seems the most logical one to display.
Contributes to issue CURA-3935.
2017-06-15 14:38:04 +02:00
Ghostkeeper
66f5b236d6
Merge branch '2.6'
2017-06-15 09:54:19 +02:00
Ghostkeeper
ebd2f0b415
Fix switching to quality changes profiles
...
It would put the global quality changes profile in each of the extruders, thus not giving any per-extruder settings.
Contributes to issue CURA-3935.
2017-06-14 15:30:55 +02:00
Ghostkeeper
f4e620c458
Remove unused variable
...
Contributes to issue CURA-3935.
2017-06-14 13:40:57 +02:00
Jaime van Kessel
7551c83612
QualityChanges are now also removed if a machine has a parentDefinition
...
CURA-3929
2017-06-14 11:04:22 +02:00
Ghostkeeper
8bce6e060c
Merge branch '2.6'
2017-06-14 10:58:11 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials
...
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
2017-06-14 10:42:04 +02:00
fieldOfView
8f7471a892
Remove debug statement
2017-06-14 10:41:53 +02:00
fieldOfView
ed6f4d851c
Update documentation
2017-06-14 10:41:39 +02:00
fieldOfView
c9998ca6fe
Set properties for all containers with the same base_file metadata entry
2017-06-14 10:41:23 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml
2017-06-14 10:41:02 +02:00
Jaime van Kessel
a7a2740690
No longer add material to qualityChanges
...
QualityChanges are never supposed to have Material.
CURA-3929
2017-06-14 09:41:33 +02:00
Jaime van Kessel
1020b0a2f3
Finding all qualities no longer does silly things with materials
...
The fetchContainer function also did magical material filtering, which caused it to go haywire.
CURA-3929
2017-06-14 09:40:11 +02:00
Lipu Fei
0e09094a3d
Merge branch '2.6'
2017-06-13 15:06:37 +02:00
Lipu Fei
dd65248968
Only set metadata/material for quality_changes if material is not None
...
CURA-3929
2017-06-13 14:35:27 +02:00
Jaime van Kessel
c8d9720a8a
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-13 13:51:55 +02:00
Jaime van Kessel
ec73abecb5
Custom material now defaults to PLA.
...
This is not an ideal solution, but it bandaids a problem for the moment.
CURA-3911
2017-06-13 13:48:34 +02:00
Arjen Hiemstra
e5df4c4c5e
Merge branch '2.6'
...
* 2.6:
Merge pull request #1910 from Ultimaker/fix_dialog_sizes
Fix ordering of merged PlatformPhysicsOperation
2017-06-13 13:23:35 +02:00
Arjen Hiemstra
d44caa281b
Fix ordering of merged PlatformPhysicsOperation
...
This makes sure we undo the PP operation before the other operation, so
the ordering of operations is still correct.
Contributes to CURA-3912
2017-06-13 13:10:59 +02:00
Jaime van Kessel
df67ae18f1
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-12 15:25:35 +02:00
Jaime van Kessel
9a54ff426b
FindAllQualitiesForMachineMaterial only looks with basic materials if it found them
...
CURA-3911
2017-06-12 15:14:25 +02:00
Jaime van Kessel
a306b4dada
We now properly fall back if no basic material is found
...
CURA-3911
2017-06-12 13:53:35 +02:00
Lipu Fei
82224c0ed0
Copy material into metadata if machine has specific material profiles when duplicating a quality profile
...
CURA-3929
2017-06-12 10:56:01 +02:00
Mark
0153ba6947
Remove support_interface_density from default visible settings. Changing it will usually mess up your print
2017-06-08 11:38:57 +02:00
sheinz
de62a3c0fe
Fix displaying layers with python3.6
2017-06-06 23:47:40 +03:00
Ghostkeeper
f719be2484
Be robust against faulty data from the engine
...
We modify the line types that we get from the engine so that it's always within range.
This was a bug I found during development of CURA-3903.
2017-06-02 11:35:11 +02:00
Ghostkeeper
afb5dd7582
Merge branch '2.6'
2017-06-02 10:27:51 +02:00
Lipu Fei
6bcc1c296d
Do not override filter_by_material if no material is found
...
CURA-3884
We rely on the machine to decide whether it needs machine specific
materials, so we don't override the filter_by_material flag when
looking for quality profiles for a material.
2017-06-01 13:26:45 +02:00
Jaime van Kessel
c76a91fbb4
added curaplugin to list of plugin extensions
...
CURA-3712
2017-05-31 13:21:44 +02:00
Ghostkeeper
cbe4891784
Merge branch '2.6'
2017-05-30 13:36:04 +02:00
Ghostkeeper
9132a025d6
Merge branch 'feature_CURA-3810_material_info_button' of https://github.com/LipuFei/Cura into LipuFei-feature_CURA-3810_material_info_button
2017-05-30 13:32:03 +02:00
Lipu Fei
8af1cc886f
Use .definition to access DefinitionContainer in qml
...
CURA-3810
2017-05-30 12:49:12 +02:00
Lipu Fei
c80e1b67a5
Only show material info button for multi-extrusion machines
...
CURA-3810
2017-05-29 18:00:46 +02:00
