3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17030 commits 340 branches 299 tags 734 MiB
Commit graph

4475 commits

Author SHA1 Message Date
Lipu Fei
16a078b9a6 Update SettingVersion to 2 for renaming the quality profiles 
CURA-3975

Update SettingVersion to 2 so we can create an upgrade to rename the
quality profiles.
 2017-07-06 10:25:51 +02:00
Lipu Fei
afb923401e Set versions correctly for container stacks and preferences 
CURA-3975

The upgrade for machine and extruder stacks and the preferences files
don't work because the current version registering doesn't take into
account the 1000000 multiplier and the settings_version.
 2017-07-06 10:25:50 +02:00
Jaime van Kessel
5fa2ba6052 Undo for material diameter also changes the property. 
It used to only set the metadata. CURA-2822
 2017-07-04 11:55:24 +02:00
Jaime van Kessel
5895f27792 Revert "Also invert nozzle offset when offsetting machine-specified disallowed areas" 
This reverts commit 319559740d.

This was already fixed (line 734 inveted it). This code breaks it when there is no extruder
 2017-07-03 17:10:59 +02:00
Ghostkeeper
319559740d
Also invert nozzle offset when offsetting machine-specified disallowed areas 
We inverted it properly with the borders, but not here yet.
 2017-07-03 10:53:50 +02:00
Ghostkeeper
bb79e33ad5
Don't forget to update approximate diameter after resetting actual diameter 
The approximate diameter needs to be in a static field because the list model filters on that field. The filter function is not clever enough to be able to filter on values being in some kind of range or rounded, so instead the decision was made that the rounded value needs to be set in a separate field so that the static filter can filter on it.

Contributes to issue CURA-2822.
 2017-06-29 16:55:47 +02:00
Ghostkeeper
034686e9fa
Don't modify list you're iterating over 
It doesn't give a problem right now since we're only iterating over lists of length 1 here, but in the future this could cause weird bugs.

Contributes to issue CURA-2822.
 2017-06-29 15:09:50 +02:00
Ghostkeeper
8ae49c317c
Emit metaDataChanged when changing properties 
Properties is a dictionary inside the metadata dictionary. If you change one of the properties, it'll check afterwards if the dictionary is different from what it was before, but since the dictionary is passed by reference all the time, it'll think that the dictionary didn't change: The reference is still the same, so the thing it checks against is updated along.
This solution is a bit ugly but it does notice when the metadata changed inside the properties and then emits a change signal.

Contributes to issue CURA-2822.
 2017-06-29 15:03:49 +02:00
Ghostkeeper
53e35daf02
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-29 13:45:02 +02:00
Jaime van Kessel
13f3477288 Fixed crash when adding a single extrusion printer 
CURA-3980
 2017-06-29 10:15:29 +02:00
Ghostkeeper
ab384ba8ec
Rename and invert moving disallowed areas metadata property 
It's more easy semantically to invert this, to prevent the double negatives.

Contributes to issue CURA-3663.
 2017-06-28 17:16:27 +02:00
Jaime van Kessel
4a5b1d0760 Merge branch 'feature_xy_offset_layer_0' of https://github.com/fieldOfView/Cura 2017-06-28 15:16:18 +02:00
Jaime van Kessel
f791017091 Revert "Added the no-nozzle offset for all polygons" 
This reverts commit 45eb301f9b.
 2017-06-28 14:20:12 +02:00
Jaime van Kessel
45eb301f9b Added the no-nozzle offset for all polygons 
CURA-3663
 2017-06-28 13:55:45 +02:00
fieldOfView
39cb68bd30 Update convex hull to account for first layer horizontal expansion 2017-06-28 11:41:51 +02:00
Ghostkeeper
fb1d7bc223
Fix direction of Y-offset in disallowed areas 
The front end has inverted Y with respect to the g-code. The prime position was correctly inverted but the nozzle offset wasn't.
 2017-06-28 09:23:14 +02:00
Ghostkeeper
21624d7761
Merge branch '2.6' 2017-06-27 16:25:55 +02:00
Ghostkeeper
b2b9b1bede
Fix checking if container stack exists 
It was checking a container stack ID against the definition containers, which doesn't match.

Contributes to issue CURA-3973.
 2017-06-27 15:14:26 +02:00
Ghostkeeper
df2ec7bd73
Don't try to activate a machine that we don't have a definition for 
Contributes to issue CURA-3973.
 2017-06-27 14:02:35 +02:00
Jaime van Kessel
7813bfc543 No longer crash when trying to get non existing extruder stacks 
CURA-3953
 2017-06-26 13:16:14 +02:00
Jaime van Kessel
7f98646b42 Merge branch 'feature_CURA-3663_optional_offsetting_for_disallowed_areas' of github.com:Ultimaker/Cura 2017-06-26 10:58:16 +02:00
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