3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-01 06:41:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12129 commits 344 branches 300 tags 757 MiB
Commit graph

2832 commits

Author SHA1 Message Date
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
Arjen Hiemstra
586050552b Merge branch '2.6' 
* 2.6:
  Error out when trying to import a profile witha quality_type we dont have
  Add default for colour code of material
  When trying to convert None to RGBA, log it and return a usable default
 2017-05-24 15:47:46 +02:00
Arjen Hiemstra
9bda7dbaae Error out when trying to import a profile witha quality_type we dont have 
Rather than successfully importing the profile and then not showing
anything, we now display an error. Not the perfect solution but the
easiest for now.

Contributes to #1873
 2017-05-24 15:43:49 +02:00
Lipu Fei
374b6d4e35 Merge branch '2.6' 2017-05-24 14:10:26 +02:00
Jaime van Kessel
3c14545e08 Merge branch 'fix_machine_name_conflicts' of https://github.com/fieldOfView/Cura 2017-05-24 11:27:05 +02:00
Ghostkeeper
0f97dd6fde
Let global stack handle limit to extruder 
Contributes to issue CURA-3738.
 2017-05-22 16:56:54 +02:00
Ghostkeeper
1f33a0d4cd
Use per-parameter-value compression for signals 
This will only emit one signal for each unique combination of parameters.

Contributes to issue CURA-3803.
 2017-05-22 15:36:46 +02:00
Ghostkeeper
bec43d5b9a
Make sure that the preferred material name variable exists 
Another small bug I found when looking through this MachineManager code. My IDE was complaining that the preferred_material_name was not always initialised and that preferred_material was an unused variable.

Doesn't contribute to issue CURA-3803.
 2017-05-22 15:36:46 +02:00
Jaime van Kessel
c474642744 Removed debug ID 
CURA-3814
 2017-05-22 14:25:29 +02:00
Jaime van Kessel
92192ff411 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-22 14:10:27 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder 
This is more in line with the other properties

CURA-3814
 2017-05-22 14:05:10 +02:00
Ghostkeeper
c14294d1f7
Merge branch '2.6' 
Conflicts:
cura/Settings/ExtrudersModel.py

Contributes to issue CURA-3803.
 2017-05-22 14:02:48 +02:00
Ghostkeeper
5f0fb3f9bd
Don't squash signals updating materials and variants 
These may have different parameters, such as which machine and extruder they are updating the material and variant of. If we only pass the last signal on, then we're missing the update of other extruders.

Contributes to issue CURA-3803.
 2017-05-22 14:01:58 +02:00
Ghostkeeper
8c166ea770
Use CuraContainerStack.definition instead of ContainerStack.getBottom() 
We know now that it must be a Cura Container Stack. This should be a bit faster, and makes the error message I was getting a bit more clear.

Contributes to issue CURA-3803.
 2017-05-22 14:01:58 +02:00