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
12148 commits 340 branches 299 tags 734 MiB
Commit graph

2845 commits

Author SHA1 Message Date
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
Ghostkeeper
bbd852ceb7
Merge branch '2.6' 2017-05-29 15:56:02 +02:00
Ghostkeeper
e0326bbb9b
Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-05-29 15:55:08 +02:00
Lipu Fei
585bc78892 Only set material for imported quality profile if there is an active material 
CURA-3881

CuraContainerRegistry._activeMaterialId() can return an empty string
if there is no active material, and in this case, importing a custom
quality file will fail.
 2017-05-29 15:52:29 +02:00
Ghostkeeper
50c4b88050 Let global stack handle limit to extruder 
Contributes to issue CURA-3738.
 2017-05-29 15:44:24 +02:00
Ghostkeeper
b8f290d835
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-29 15:40:24 +02:00
Ghostkeeper
8ec9337077
Merge branch 'feature_extruder_per_feature' 2017-05-29 15:40:06 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix 
CURA-3810
 2017-05-29 15:23:52 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Jaime van Kessel
5dbee706a7 Printer output device can now have a QML item 
This contributes to CURA-3826. This will allow printer output devices to
add custom UI elements to the monitor tab in the future.
 2017-05-29 13:02:00 +02:00