Commit graph

21225 commits

Author SHA1 Message Date
Ghostkeeper
168c9db648
Code style: Space around binary operators
Contributes to issue CURA-6597.
2019-07-04 09:28:23 +02:00
Ghostkeeper
3cce33be6f
Get intents for every active extruder, not every used extruder
We want the intents for basically any extruder, not just the one that would get used by a slice using the current settings for extruder_nr.

Contributes to issue CURA-6597.
2019-07-04 09:14:06 +02:00
Ghostkeeper
951b91e3d8
Filter on 'material' metadata instead of material_id
This is consistent with how the material is stored in other profiles, such as quality profiles.

Contributes to issue CURA-6597.
2019-07-04 09:09:22 +02:00
Ghostkeeper
c75b83be21
Resolve circular imports
Can't import CuraApplication because we create instances of IntentManager from the IntentsModel which is created in CuraApplication.

Contributes to issue CURA-6597.
2019-07-04 09:08:15 +02:00
DragonJe
b55d0b3230
Create nwa3d_a31_e.inst.cfg 2019-07-03 17:41:27 -05:00
DragonJe
6428e9185c
Create nwa3d_a31_best.inst.cfg 2019-07-03 17:40:38 -05:00
DragonJe
62fa11f182
Create nwa3d_a31_fast.inst.cfg 2019-07-03 17:39:34 -05:00
DragonJe
225a34ae30
Create nwa3d_a31_normal.inst.cfg 2019-07-03 17:38:50 -05:00
DragonJe
abc980e3d6
Create nwa3d_a31_06.inst.cfg 2019-07-03 17:37:38 -05:00
DragonJe
87193da472
Create nwa3d_a31_04.inst.cfg 2019-07-03 17:37:12 -05:00
DragonJe
348b7cd9d8
Create nwa3d_a31_extruder_0.def.json 2019-07-03 17:35:39 -05:00
DragonJe
56b39d0b33
Create nwa3d_a31.def.json 2019-07-03 17:34:12 -05:00
Ghostkeeper
36971f0058
Give smooth an intent and increment setting_version
Smooth needs an intent because otherwise it gets the default intent. None of the default intents are allowed to have files.

Contributes to issue CURA-6597.
2019-07-03 16:52:33 +02:00
Ghostkeeper
3f29bce263
List intents per category
This is the naive one. We want to list the default intents multiple times, once for every quality level.

Contributes to issue CURA-6597.
2019-07-03 16:51:47 +02:00
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately.
part of CURA-6590
2019-07-03 16:14:08 +02:00
Jaime van Kessel
7d446722a9 Remove the max-z-speed-override
CURA-6625
2019-07-03 16:13:21 +02:00
Jaime van Kessel
d43415191b Merge branch 'CURA-6635_add_printer_by_manufacturer' of github.com:Ultimaker/Cura 2019-07-03 14:29:26 +02:00
Lipu Fei
5620ee811f
Merge pull request #5959 from Ultimaker/feature_intent_per_quality
Feature intent per quality
2019-07-03 14:11:20 +02:00
Ghostkeeper
cfa059fb81
Remove removed prime tower settings
The prime tower is now always circular. This fixes a unit test.
2019-07-03 12:48:29 +02:00
Ghostkeeper
12e2e47e72
Make corrections to manufacturer fields
When it's categorised by manufacturer these mistakes become more apparent.

Contributes to issue CURA-6635.
2019-07-03 11:27:19 +02:00
Ghostkeeper
0678d47dad
Make 'Ultimaker B.V.' preferred manufacturer rather than 'Ultimaker'
Ultimaker was the category. Ultimaker B.V. is the manufacturer, which is now used as the section property.

Contributes to issue CURA-6635.
2019-07-03 11:12:41 +02:00
Ghostkeeper
e6f25884f8
Categorise printers by manufacturer
This should make it easier to find the printer you want.

Contributes to issue CURA-6635.
2019-07-03 10:56:19 +02:00
Lipu Fei
3a9e97156e Merge commit 'b463b0c35b' into feature_intent_per_quality 2019-07-03 10:54:21 +02:00
Lipu Fei
35e1426231
Merge branch 'feature_intent' into feature_intent_per_quality 2019-07-03 10:52:08 +02:00
Ghostkeeper
365d725e42
Add escape as hotkey to exit full screen
Should be easier to discover.

Fixes #5956.
2019-07-03 10:32:00 +02:00
Lipu Fei
e8c08b77e5
Merge pull request #5961 from Ultimaker/trouch-fix/creawsomemod
Import CreawsomeMod profiles and implement version upgrade
2019-07-03 09:42:05 +02:00
Ghostkeeper
d449ec9266
Really don't make creality_base a visible printer
It's not a printer. It's a base profile. Every printer in the list of printers should coincide with a physical printer, with the one exception of Custom FFF Printer.
If we find settings that work for all printers we should apply it to fdmprinter so that we do apply it to every printer.

Contributes to issue CURA-6554.
2019-07-03 09:31:10 +02:00
Ghostkeeper
d9b3f1fee9
Merge branch 'trouch-fix/creawsomemod' of github.com:trouch/Cura into trouch-fix/creawsomemod 2019-07-03 09:22:59 +02:00
Lipu Fei
63171508c9 Fix profiles 2019-07-03 09:18:39 +02:00
Lipu Fei
7f824b06bb Fix typing 2019-07-03 09:09:23 +02:00
trouch
8081e32ebf Change creality_base name to "Creawsome Custom" 2019-07-02 20:08:31 +02:00
trouch
0f79376547 fix ender purge line going out of bed 2019-07-02 19:39:20 +02:00
trouch
8911aa5cbb Update creality_base def with last Creawsome one 2019-07-02 19:26:59 +02:00
Jaime van Kessel
4428c32df3 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-02 17:59:50 +02:00
Jaime van Kessel
2cd6b73d12 Ensure that the material selection gets reset when diameter is changed
CURA-6590
2019-07-02 17:59:27 +02:00
Ghostkeeper
a57304b603
Fix typo: Retracation -> Retraction
Contributes to issue CURA-6631.
2019-07-02 17:46:06 +02:00
Ghostkeeper
02b925388a
Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX
Conflicts:
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg -> Deleted in branch, but modified for setting version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/variants/tizyx_evy_dual_direct_drive.inst.cfg -> Modified in branch for new settings, in master for settings version
2019-07-02 17:35:07 +02:00
Jaime van Kessel
758a8a0078 Merge branch 'CURA-6583_fix_ortho_side' of github.com:Ultimaker/Cura 2019-07-02 16:50:00 +02:00
Remco Burema
5ea2b0e073 Make stripes closer togheter in striped shader.
part of CURA-6583
2019-07-02 16:49:27 +02:00
Ghostkeeper
bb6e9da526
Fix upgrading custom quality profiles for Creality printers
Quite a lot of logic necessary... Oh well.

Contributes to issue CURA-6554.
2019-07-02 16:39:56 +02:00
Remco Burema
a61e7ea7df Fix striped (off-buildplate) shader for ortho-view.
part of CURA-6583
2019-07-02 16:20:12 +02:00
Ghostkeeper
d5da6e34be
Add version upgrade for Creality printers and CreawsomeMod
This should work for both.

Contributes to issue CURA-6554.
2019-07-02 16:00:06 +02:00
Jaime van Kessel
e182459dba Fix the updating of material diameter.
This was a weeeird bug. It worked if you changed the value and selected another field.
Pressing enter however (aka; The behavior that 80%+ of the users have) would change it
but it would switch back in half a second. It seems to have been caused by mutliple onEditingFinished
signals being emitted in sequence.
As I can't be bothered to go through the bowels of QML and figure out why exactly this is doing what it's doing,
I just tied the enter to losing the focus, which ensures that the right behavior happens (Field is no longer selected,
and the onEditingFinished is emitted)

Contributes to CURA-6590
2019-07-02 15:16:41 +02:00
Remco Burema
af467d4e16 Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality 2019-07-02 14:44:56 +02:00
Remco Burema
270cf28ea1 Fix comments code review IntentManager.
part of CURA-6091
2019-07-02 14:43:56 +02:00
Lipu Fei
b463b0c35b Fix CuraVerison.py configuration 2019-07-02 14:19:56 +02:00
Jaime van Kessel
be1fd2e003 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent_per_quality 2019-07-02 13:52:46 +02:00
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Remco Burema
50cbf71f68 Fixed test 'selectIntent' for IntentManager-tests.
part of CURA-6091
2019-07-02 13:15:18 +02:00