122 Commits

Author SHA1 Message Date
Remco Burema
24bb1e96fa Fix unlinked brim settings behaviour.
Some brim settings seemed to behave as if they where linked, when in fact for any extruder set to -1 the 'default extruder' was set by some hacky code that supposedly fixes a 'dissallowed area' issue, very likely also related to the skirt/brim settings. Since dissalowed area for skirt/brim will not be a thing anymore, at least in the front-end, due to CURA-9066 (the 'parent' jira ticket that was blocked by this bug); it was sinplest just to remove the hack altogether. (Otherwise we'd have to make an artificial distinction between -1 and None as it relates to 'Not Set/Used' versus 'Not Overridden', only to then force it back to -1 in situations that call for it -- like communicating to the engine.)

CURA-9553
2022-10-30 11:09:12 +01:00
c.lamboo
148263a068 Move hasNetworkedConnection to GlobalStack
From code review

CURA-9277
Co-authored-by: Joey <j.delarago@ultimaker.com>
2022-09-06 13:52:10 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like).
done as part of CURA-9422
2022-08-31 14:15:05 +02:00
Jaime van Kessel
506f2b9820
Remove code duplication in createAbstractMachine
This also caused a crash when an abstract machine with multiple extruders was selected

CURA-8463
2022-08-26 14:08:03 +02:00
c.lamboo
f000b75661 Move getMachinesWithDefinition to MachinesManager
CURA-9514, CURA-9277
2022-08-26 11:16:10 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-26 10:45:45 +02:00
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/UI/CuraSplashScreen.py
2022-03-28 15:02:18 +02:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack
CURA-7810
2022-03-24 14:26:03 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Ghostkeeper
f82384d93c
Revert "Revert CURA-8055 in the 4.10 branch. This should not have been merged in there."
This reverts commit 4d29de45796dc42f76c774a216a0601bb57cf790.
Effectively this re-applies the changes for CURA-8055 / #9957.
2021-06-24 14:20:38 +02:00
Ghostkeeper
4d29de4579
Revert CURA-8055 in the 4.10 branch. This should not have been merged in there.
Revert "Change file extension to .umm"

This reverts commit 56db7f7144083df4bca77746d7ee30f2a54fda36.

Revert "Re-enable compression"

This reverts commit 62bc9be22bbc5595dbfce69893163c3a0ebc4415.

Revert "Add documentation"

This reverts commit e9031f1aff5d40f3c69ac625edf11963a3253eb8.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a667f9aa9618005d2a5875383a3658f4f.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068c3ac2cab7f95fb88c5d4d101e28e17.

Revert "Basic implementation of exporting all materials in a .zip archive"

This reverts commit bdcaef134f556f455f352786123476ec40e3ae4c.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664bf73dd9b1e3c6af6f01321763470d2e.

Revert "Implement a sync button and file dialogue to export all materials"

This reverts commit abba3bdd10a994a1b38bcb426a27ba379febeac7.

Revert "Add notion of whether printers support the material export archive"

This reverts commit f436cb8e7b879a8913b25f2a049413ec0721f1c5.
2021-06-24 14:15:54 +02:00
Ghostkeeper
f436cb8e7b
Add notion of whether printers support the material export archive
Contributes to issue CURA-8055.
2021-06-08 16:50:03 +02:00
Jaime van Kessel
9c904f95ce
Add a cache for settable_per_extruder property 2020-08-14 14:51:46 +02:00
Jaime van Kessel
51737dccd6
Don't create a context when it's not provided
The rest of the functions already assume that None is an empty context
2020-08-14 14:19:19 +02:00
Jaime van Kessel
4c00a8ff2c
Add extra short-circuit for resolve 2020-08-14 13:57:09 +02:00
Jaime van Kessel
9a0264644b
Simplify the _shouldResolve function
This increases the speed of the setting resolvement.
2020-08-14 13:41:20 +02:00
Jaime van Kessel
f0002e265b
Mark recently constructed stacks as not dirty
The stacks would get marked dirty for setting some metadata, but since thats
part of their construction, they aren't really dirty.

Previously, every single stack that was loaded would be marked as dirty, which causes unneeded
saving.
2020-06-18 17:39:58 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
c2c96faf5f Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Lipu Fei
b6d591c64c Add typing
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
1f3a7c976f Remove deprecated MachineManager.activeMachineHasRemoteConnection
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
74e7de1b54 Add intent into stats
CURA-6632
2019-10-07 21:11:40 +02:00
ChrisTerBeke
558698add7 Merge branch '4.3' 2019-09-12 12:04:01 +02:00
Jaime van Kessel
a279ee5f22
Fix sync issues when printer was added by cloud
CURA-6769
2019-09-12 11:21:09 +02:00
Ghostkeeper
eb401defdf
Add deprecated marker on extruders: Use extruderList
Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.
2019-09-09 14:21:57 +02:00
ChrisTerBeke
1aa70748af Consistent naming, some bug fixes 2019-07-29 17:24:10 +02:00
Jaime van Kessel
05a5f66856 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
2019-05-03 14:10:21 +02:00
Lipu Fei
0cc00efa79 Add doc for group_id
CURA-6483
2019-04-30 12:53:47 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
2019-04-29 15:53:08 +02:00
Lipu Fei
5fc91e797e Remove mistake code 2019-04-24 13:22:53 +02:00
Lipu Fei
24f28fe03e Calculate AABB for non printing meshes
CURA-6480
2019-04-24 13:06:01 +02:00
Jaime van Kessel
c2a00d6b53 Fix copy paste error
Simple fix that caused crash for getHasVariantBuildplates
2019-04-16 10:53:06 +02:00
Lipu Fei
ba37812793 Correct some deprecations and remove duplicated code 2019-04-15 09:47:09 +02:00
Lipu Fei
32fcc79dd8 Fix _shouldResolve()
CURA-6456
2019-04-11 16:34:57 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Jaime van Kessel
5e66564c00 Ensure that configurationTypes doesn't crash if a None is in the list
Fixes #5551
2019-04-02 12:05:08 +02:00
Lipu Fei
449740a631 WIP: MachineSettings Printer tab 2019-03-18 14:48:24 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Jaime van Kessel
87070aefce Fixed typing issues for configuredConnectionTypes
CURA-6159
2019-01-30 17:17:46 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation
According to our style. Not just single line comments without anything else.

Contributes to issue CURA-6159.
2019-01-30 12:52:58 +01:00
Ghostkeeper
232498980c
Merge branch '4.0'
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
2019-01-28 16:45:45 +01:00
Jaime van Kessel
bc8a08bb44 Add documentation to the configuredConnectionTypes 2019-01-28 14:57:24 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types.
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
2019-01-28 14:29:41 +01:00
Jaime van Kessel
e4af883f25 Add missing signal 2018-12-21 18:19:34 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
2018-12-11 09:24:22 +01:00
fieldOfView
09742f0cf5 Simplify code 2018-09-28 13:09:59 +02:00
fieldOfView
bc52830c89 Move getDefaultFirmwareName() into GlobalStack 2018-09-28 11:49:00 +02:00
Jaime van Kessel
f585afe77b Fix spacing 2018-09-27 17:31:45 +02:00