28353 Commits

Author SHA1 Message Date
Jelle Spijker
23cc7084c4
Switch between correct states of the un-/installed buttons
Contributes to CURA-8587
2021-12-15 17:51:38 +01:00
casper
e5be3e56dc Use correct definition of Polygons
Only saw this error after the merge so pushing directly to master.

part of CURA-8083
2021-12-15 17:48:20 +01:00
Casper Lamboo
7c7a1016d0
Merge pull request #11075 from Ultimaker/CURA-8083_separate_z_shrinkage_comp
[CURA-8083] Separate Vertical and Horizontal Shrinkage Compensation.
2021-12-15 17:40:27 +01:00
Jelle Spijker
0ffaafc8c0
Revert "Simplify CuraPackageManager"
This reverts commit 33f1bd8c5d2126e0f3045d9c71514dd23788f9c9.
2021-12-15 16:39:02 +01:00
Jelle Spijker
9e1e98bdbd
Revert "Show install button after package has been uninstalled"
This reverts commit c66e17dd9e52987ff75b708557e9037f4d9d66f2.
2021-12-15 16:38:54 +01:00
casper
c66e17dd9e Show install button after package has been uninstalled
CURA-8587
2021-12-15 15:13:38 +01:00
casper
2bf8309d45 Merge remote-tracking branch 'origin/CURA-8587_disable_update_install_and_uninstall' into CURA-8587_disable_update_install_and_uninstall 2021-12-15 15:09:32 +01:00
Jelle Spijker
8b2ced122c
Explicitly close the downloaded curapackage
Sometime very small curapackage where download and the `canInstallChanged`
signal was emitted before the zipfile was completely processed.
This could result in a failed installation, which was often the case for
materials.

I also narrowed down the try-catch block.
2021-12-15 15:07:23 +01:00
Remco Burema
d277109cc8
Fix build-volume (related) tests.
part of CURA-8083
2021-12-15 14:42:17 +01:00
casper
33f1bd8c5d Simplify CuraPackageManager
CURA-8587
2021-12-15 14:18:40 +01:00
Remco Burema
f51cc84a7c
Temporary? solution for UX w.r.t. material shrinkage.
Material shrinkage now alters both the disallowed areas+, and the blue wireframe, toghether repressenting the usable build-volume. This doesn't shrink the build-plate/printer model, still keeping in line with the 'show the size of the result object in Prepare, not the resized one we do print becasue it will shrink later' principle we had originally agreed on enough. Note that the disallowed areas also take the object themzelves into account, so the user could still tell when objects are going to be printed overlapped (as the dissalowed areas of those respective models then overlap -- but not, of course, the models themselves).

part of CURA-8083
2021-12-15 12:50:01 +01:00
Jaime van Kessel
03398422dd Merge branch '4.13' of github.com:Ultimaker/Cura 2021-12-15 12:04:19 +01:00
Jaime van Kessel
998ba3631c Add missing format to error log 2021-12-15 12:03:55 +01:00
casper
62596a42e6 Remove un-needed column component
CURA-8587
2021-12-15 10:44:25 +01:00
casper
aea316799a Always set busy = False on installed package
CURA-8587
2021-12-15 10:43:57 +01:00
Jaime van Kessel
58719fd294 Disable material_alternate_walls for now
CURA-8079
2021-12-15 10:35:08 +01:00
casper
d2a0ef0ecb Move "Alternate Wall Directions" setting to experimental
As dictated by the ticket

CURA-8079
2021-12-15 10:34:13 +01:00
Remco Burema
281b337be6 Add setting for alternating wall directions.
This will be useful for materials that can build up a lot of stress.

part of CURA-8079
2021-12-15 10:33:38 +01:00
Ghostkeeper
fdfdb2e428
Remove Cura 4 settings
These settings have been removed and should no longer be in the profiles.
They were added during a merge, since they were updated recently for Cura 4.13. The merge 'resolved' the conflict automatically without informing me. And resolved it wrongly.
2021-12-15 10:09:42 +01:00
Ghostkeeper
0edfa89084
Merge branch 'master' of github.com:VOLUMIC/Cura into VOLUMIC-master 2021-12-14 18:46:22 +01:00
casper
5f444fa5b7 Simplify enabled busy state
both the `installManageButton` and `updateManageButton` are busy when
`packageData.busy`, so the
`!(installManageButton.busy || updateManageButton.busy)` check didn't
make much sense.

CURA-8587
2021-12-14 17:49:25 +01:00
Remco Burema
b6c0a49657
Attempt to compensate build-area/volume for material shrinkage.
part of CURA-8083
2021-12-14 17:04:20 +01:00
casper
c338d8f5ce Only show enable/disable button if plugin is installed
CURA-8587
2021-12-14 16:37:16 +01:00
Remco Burema
ef1a94c6e4
Split 'shrinkage compensation' in XY versus Z axis.
CURA-8083
2021-12-14 15:47:39 +01:00
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased'
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
2021-12-14 11:48:58 +01:00
Ghostkeeper
64dec9ecc1
Merge branch 'master' of https://github.com/lin-ycv/Cura into lin-ycv-master 2021-12-13 17:29:54 +01:00
Jaime van Kessel
08eba9f21a Fix updating package
CURA-8587
2021-12-13 15:17:19 +01:00
Jaime van Kessel
d50dc59aac Simplifications and cleanup
CURA-8587
2021-12-13 15:13:00 +01:00
Jaime van Kessel
d422e0d4ee Simplify onClicked for install button
CURA-8587
2021-12-13 14:18:50 +01:00
Jaime van Kessel
62f99a28b3 Simplify the update logic in the package model / card
CURA-8587
2021-12-13 14:15:16 +01:00
Jaime van Kessel
4b358496d9 Simplify enable/disable button visibility
CURA-8587
2021-12-13 13:15:16 +01:00
Jaime van Kessel
aa29114470 Correctly set defaults of managebutton
CURA-8587
2021-12-13 13:13:42 +01:00
Jaime van Kessel
8c0d4899ed Remove unneeded {}
CURA-8587
2021-12-13 13:12:06 +01:00
Jaime van Kessel
274b98f9b1 Remove unneeded "primary_action" from managebutton 2021-12-13 13:09:17 +01:00
Jaime van Kessel
08685af9de Switch ManageButton over to implicitWidth & height instead of layout
This makes it a much easier to re-use component.

CURA-8587
2021-12-13 12:24:18 +01:00
Jaime van Kessel
f993243d57 Remove unneeded import
CURA-8587
2021-12-13 12:08:33 +01:00
Jaime van Kessel
e92cc584fb Add missing return type
CURA-8587
2021-12-13 12:01:37 +01:00
Jaime van Kessel
50f1afa5d9 Make plugin_registry protected
CURA-8587
2021-12-13 11:57:00 +01:00
Jaime van Kessel
eb11e92637 Rename local_packages_id to local_packages_ids
CURA-8587
2021-12-13 11:54:13 +01:00
Ghostkeeper
006b5e25b2
Also catch unknown keyring errors
We're confident now that we get it to not crash for most normal cases. If there is a crash here it's due to the internals of Keyring. We're catching all of the others separately anyway.

Fixes Sentry issue CURA-340.
2021-12-13 11:22:37 +01:00
Ghostkeeper
5567cc480e
Merge branch '4.13' 2021-12-13 10:18:10 +01:00
Ghostkeeper
2abfad55e0
Remove tree support from draft intent profiles
It is a global setting, so it can't currently be changed with an intent profile.
A resolve function would resolve this. But which function that should be is to be decided.

Contributes to issue CURA-8746.
2021-12-13 10:17:54 +01:00
NilsRo
01da8e2ce2 Update anycubic_i3_mega_s.def.json
Added Filamant information
2021-12-12 15:54:57 +01:00
Jelle Spijker
4f997319b0
Try sorting on section, update and display name
Contributes to CURA-8587
2021-12-10 18:31:55 +01:00
Jelle Spijker
e72655cc22
Moved busy/confirmed logic to QML
COntributes to CURA-8587
2021-12-10 17:38:20 +01:00
Eryone
b7e88bb021
Update Eryone thinker and er20 3d printer profile (#10650)
* Adding Eryone Thinker profile to Cura

- adding printer definition
- adding extruder definition
- adding image plate
- adding platform object
- adding quality profiles

* Minor update eryone_thinker.def.json

Fix initial fan speed

* Improve model textures and draw order

Fixed draw order of model by seperating the mesh into parts and ordering them before export.  Add more colors to the texture to allow for more distictant parts.

* Reduced mesh size by remodeling the bed height adjustment wheels.

* Updated Eryone Thinker name to include Series in the name

* Update eryone_thinker.def.json

* Improve End GCode

Ensure we disable bed temp and turn off all fans.
Move the nozzle up by 0.5mm and retract to remove wipe on model top layer.

* Minor fixes to start and end gcode

* Eryone Thinker Profile improvements.

Adding Extra Fast profile.
Added acceleration speed for Fast.
Minor updates to definition for default material to be Eryone PLA and some other setting to work better with profiles.

* Delete eryone_thinker.def.json

* Create eryone_thinker.def.json

* Updating Eryone Thinker Definition

Added changes again due to for reconcile stomping the original

* Update eryone_thinker_fast.inst.cfg

Update the layer height of profile_fast to 0.25mm

* Update eryone_thinker_fast.inst.cfg

Update the layer_height to 0.25mm

* Improving the Eryone Thinker setup

Set Definition to use Monotonic skin by default
Add Fine profile at 0.1 layer height
Change High to 0.15 layer height and number of layers to match
Change Fast to 0.25 layer height and number of layers to match

* Eryone Thinker Profile update, resolving merge

* Eryone Thinker Profile Definition & Quality Clean up

Move all the Normal settings into the core definitions
Move share setting into definition to reduce redundant values for quality profiles
Remove values from definition that match the default fdmprinter definition for easier maintence.
Change definition to only support Monotonic order on top Roof layer.

* Fixing missing [values] from normal profile

* Delete eryone_thinker_extra_fast.inst.cfg

Conflict fix

* Update eryone_thinker_fine.inst.cfg

Fix the setting version incorrectly.

* Eryone Thinker Definition Bug fix for Layer Height 0

Fixing issue when layer_height_0 value was not being resolved correctly in Cura.

* Disable the first layer cooling fan speed

* Update eryone_er20.def.json

* Add the profile

Recovery eryone_thinker_fast.inst.cfg

* Update er20 start gcode and end gcode

1. Update er20 start gcode and end gcode
2. Update nozzle offset

Co-authored-by: Demetrius Apostolopoulos <75643490+dapostol73@users.noreply.github.com>
2021-12-10 17:01:52 +01:00
Ghostkeeper
0d53408487
Merge branch '4.13' 2021-12-10 16:18:55 +01:00
Ghostkeeper
ca9c1111ff
Update version number in header files
We're currently translating for Cura 4.13, not 4.12.

Contributes to issue CURA-8753.
2021-12-10 16:15:34 +01:00
Jaime van Kessel
940c699a10 Add multiprint plugin to gitignore 2021-12-10 14:43:23 +01:00
Jelle Spijker
d876b85259
Don't forcefully remove bundled packages when updating
Contributes to CURA-8587
2021-12-10 12:43:42 +01:00