GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 22:26:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,017 Commits 290 Branches 260 Tags
Commit Graph

80 Commits

Author SHA1 Message Date
Jack Ha
c23827cfa1 CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change 2018-02-26 16:33:25 +01:00
Jack Ha
cad6a3bb3d CURA-4606 CURA-5003 select and activate material after create, duplicate 2018-02-22 17:14:23 +01:00
Jack Ha
b209badf68 CURA-4606 CURA-5003 fix density and diameter in material manager 2018-02-22 16:14:11 +01:00
Jack Ha
c7499d6e17 CURA-4606 CURA-5003 fix saving material metadata when switching material; fix crashing on fallback material on materials without fallback 2018-02-22 15:52:02 +01:00
Jack Ha
32afa9bfd4 CURA-4606 CURA-5003 fixed sometimes crash material management page upon opening, provide correct containerId to MaterialView 2018-02-22 14:27:58 +01:00
Lipu Fei
6cc65e97f2 WIP: Cleanup MaterialsModel 2018-02-20 09:13:11 +01:00
Jack Ha
5d4a2a7e49 CURA-4606 qtquick dialogs 1.2 to be compatible with older pyqt 2018-02-19 11:04:45 +01:00
Lipu Fei
581699cd8d WIP: Make material import work 2018-02-16 14:23:11 +01:00
Lipu Fei
0b859bb308 WIP: Make material export work 2018-02-16 14:23:11 +01:00
Lipu Fei
4f29fc9ab2 WIP: make material creation work 2018-02-16 14:23:11 +01:00
Lipu Fei
779f49f545 WIP: Make material removal work in material management dialog 2018-02-16 14:23:11 +01:00
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
a0b53dc1c9 WIP: Materials management page, make Activate work 2018-02-16 14:23:11 +01:00
Lipu Fei
1e0a078af8 WIP: Refactor Materials management page to use new Managers 2018-02-16 14:23:11 +01:00
Lipu Fei
f0d9fba2f5 WIP: Create MaterialManager 2018-02-16 14:20:02 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Ghostkeeper
c167325b3d
Simplify translation of printer and variant 
The key-replacements are always in the same place regardless of translation. A translator can't put them before their translation any more now. But it greatly reduces the confusion among translators and produces fewer strings to translate.

Contributes to issue CURA-4883.
 2018-02-13 15:57:32 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
alekseisasin
e5c72cfdc5 Validate material profile 
CURA-4851
 2018-01-31 14:58:44 +01:00
ChrisTerBeke
225a205d97 Fixes for material duplication and editing, small refactoring - CURA-4787 2018-01-12 09:19:03 +01:00
Lipu Fei
93599de642 Update current index in material dialog 
CURA-4774

There is a delay so we update the current index when the model gets
changed.
 2018-01-09 17:03:38 +01:00
ChrisTerBeke
3de4940d69 Simplify creating, duplicating materials in preferences, extract logic to python, code-style fixes 2018-01-09 16:19:29 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page 
CURA-4708
 2018-01-03 11:27:30 +01:00
Jack Ha
eb171231c2 Fix removeMaterial. 
The base_file must be removed first, or it gets loaded halfway during remove containers.

Contributes to issue CURA-4243.
 2017-12-06 11:02:50 +01:00
Lipu Fei
dad2dfda89 No need to set currentItem after a material is imported 
CURA-4546
 2017-11-23 14:08:10 +01:00
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated 
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
 2017-08-14 13:54:11 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Ghostkeeper
9dd3527504
Blur setting text fields when clicking buttons 
Otherwise the setting is not applied yet by the time you duplicate or export a profile.

Contributes to issue CURA-4011.
 2017-07-05 16:04:11 +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
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
a727e4ffd0 Make sure all materials are shown 
Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.
 2017-05-11 18:17:11 +02:00
fieldOfView
6fa83a9110 Fix selecting a material when an edit field has the focus 2017-05-11 13:22:14 +02:00
fieldOfView
836cf27266 Keep material selected when editing its name, brand or type 
Editing a material name, brand or type may change its position in the materials list. We now reselect the material after editing one of these values.
 2017-05-08 11:37:19 +02:00
fieldOfView
b4f56d10d7 Set currentIndex to a more logical successor when deleting a material 2017-05-08 11:17:10 +02:00
fieldOfView
00f3cf409b Select newly created material 2017-05-08 10:38:25 +02:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material. 
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
 2017-04-27 11:19:46 +02:00
fieldOfView
e92aaca7b6 Filter materials by the (approximate) material diameter of the printer 
If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa
 2017-04-12 23:03:58 +02:00
Jaime van Kessel
efce0696bd Recently activated material can no longer be removed 
CURA-3147
 2017-03-16 13:11:51 +01:00
fieldOfView
ebbe37a6cd Remove "Edit" button from materials page 
The "Edit" button is an unnecessary barrier. Read-only materials are still uneditable.
 2017-01-03 11:23:31 +01:00
fieldOfView
7516fb6056 Store cost & weight as preference values independent of material definition 
Users need to be able to set these values independent of the xml definition, as it is not a material property but something that depends on the reseller etc. It must also be settable for read-only materials.
 2017-01-03 11:05:31 +01:00
Ghostkeeper
0ca157518e
Update current item when importing new material 
Since we select the newly imported material, we need to update the current item so that the window on the right also gets updated.

Contributes to issue CURA-3138.
 2016-12-16 11:12:33 +01:00
Jaime van Kessel
72112159d6 It's no longer possible to set materials for machines that dont support them 
CURA-3042
 2016-12-08 14:43:28 +01:00
Ghostkeeper
48b57de6df
Filter materials on compatibility for non-machine-specific materials 
This only listens to whether the 'base' XML profile is marked as compatible in its metadata, but since the machine doesn't have its own materials, the base is the only one that exists. This needs to be changed when we change the filtering on fdmprinter, hence the comment in the code.

Contributes to issue CURA-2837.
 2016-10-31 17:26:36 +01:00
Ghostkeeper
608248bec8
Fix display of inherited materials 
Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId.

Contributes to issue CURA-2576.
 2016-10-08 17:14:24 +02:00
Jaime van Kessel
9ba78dec54 After deletion of material the slection is refreshed 
CURA-2388
 2016-09-20 13:58:44 +02:00