GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 17:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,339 Commits 290 Branches 260 Tags
Commit Graph

9307 Commits

Author SHA1 Message Date
c.lamboo
0c79ec738e Fix show/hide button in WorkSpaceDialog printer selector 
CURA-9424
 2022-11-09 23:05:06 +01:00
c.lamboo
27267deb22 Fix clicking PrepareMenu 
CURA-9424
 2022-11-09 17:16:47 +01:00
c.lamboo
79a7b1e064 Round width to prevent drawing text on non-integer offsets 
Contribution from @fieldOfView

CURA-9424
 2022-11-09 16:56:07 +01:00
c.lamboo
8ee5bc2bd4 Remove column with single child 
Just rendering the single child produces the same result

CURA-9424
 2022-11-09 16:04:39 +01:00
c.lamboo
95e0021cce Align dropdown in open project dialog 
CURA-9424
 2022-11-09 15:55:48 +01:00
c.lamboo
948ac84070 Add create new button 
CURA-9424
 2022-11-09 15:49:04 +01:00
c.lamboo
dd4e1c66b7 Make MachineSelector more generic by detaching logic from view 
By detaching the logic from the view custom handlers can be added to selecting printers. This was needed as the MachineSelector in the `WorkspaceDialog` needed to do something different from the `PreparMenu`.

CURA-9424
 2022-11-09 14:16:33 +01:00
Remco Burema
3d645140f2 Fix: Sort updateables on top of others instead of vice-versa. 2022-11-09 10:37:49 +01:00
Joey de l'Arago
088ea0a768 Swap out UpdatableMachinesModel for MachineListModel. 
This has to be instantiated with the WorkspaceDialog but attaching the listeners throws an error because it is done too early. The listeners are not needed anyway, so they have been disabled.

Update WorkspaceDialog.qml to use MachineListModel

CURA-9424
 2022-11-04 16:44:04 +01:00
Joey de l'Arago
ccb4d181e6 Allow buttons to be passed in for drop down. 
The change also remove the "Add Printer" and "Manage Printer" buttons from the monitor page drop down.

CURA-9424
 2022-11-04 15:37:57 +01:00
Joey de l'Arago
2019d8f3af Start MachineSelector refactor by allowing list model to be passed in. 
CURA-9424
 2022-11-04 15:11:04 +01:00
Remco Burema
997b6f830d Manually revert part of PR. 
It shouldn't really be nescesary, but you _can_ put any gcode flavour in relative or absolute, so we should also deal with that in the pause-at-height script.
 2022-11-04 09:12:47 +01:00
Remco Burema
b1138e12d9 Merge branch 'main' 2022-11-04 08:47:50 +01:00
Joey de l'Arago
f8ed660d58 Update icons 
CURA-9424
 2022-11-03 16:54:56 +01:00
Joey de l'Arago
e954de7f01 Adjust dialog margins. 
Move title into full width white square.

CURA-9424

Co-authored-by: Casper Lamboo <casper.lamboo@ultimaker.com>
 2022-11-03 16:43:19 +01:00
Joey de l'Arago
6126135adb Adjust dialog margins. 
Move title into full width white square.

CURA-9424

Co-authored-by: Casper Lamboo <casper.lamboo@ultimaker.com>
 2022-11-03 16:43:01 +01:00
discip
d5099111bb
minor fixes + layer_no instead of height 2022-11-03 00:45:42 +01:00
Joey de l'Arago
c987ef5315 Adjust warning label margins 
CURA-9424
 2022-11-02 18:30:46 +01:00
Joey de l'Arago
8bb6083481 Create custom component for rows in WorkplaceDialog. 
CURA-9424
 2022-11-02 18:25:05 +01:00
Joey de l'Arago
b1e559ff1a Add padding below section titles 
CURA-9424
 2022-11-02 18:09:49 +01:00
Joey de l'Arago
7171249d3f Adjust margins on dialog to match designs 
CURA-9424
 2022-11-02 15:33:47 +01:00
Joey de l'Arago
1764c338a0 fix visibility check 
CURA-9424
 2022-11-02 14:23:36 +01:00
Joey de l'Arago
25ecb0e621 Make types specific 
Remove unused imports

CURA-9424
 2022-11-02 14:21:37 +01:00
Joey de l'Arago
3a07d14b4b remove comboboxheight 
CURA-9424
 2022-11-02 14:19:35 +01:00
Joey de l'Arago
cde07b9fe4 move signal function to bottom of file 
CURA-9424
 2022-11-02 14:18:47 +01:00
Joey de l'Arago
d12b59ec0f Refactor workspace sections into separate qml file. 
Refactor an existing hack to force trigger the onIndexChanged functions of the comboboxes.

CURA-9424
 2022-11-02 14:17:05 +01:00
Joey de l'Arago
f72c980c20 Add icons to the left of titles 
Align title text with values in table

CURA-9424
 2022-11-01 18:19:50 +01:00
Joey de l'Arago
b01ff2f57e Add open with above printer drop down. 
CURA-9424
 2022-11-01 17:10:59 +01:00
Joey de l'Arago
41fd36a038 Adjust margins 
CURA-9424
 2022-11-01 17:10:24 +01:00
Joey de l'Arago
fa317a9e14 Use unique id for WorkspaceDialog 
CURA-9424
 2022-11-01 16:31:24 +01:00
Joey de l'Arago
afd3d92c5e Use wide button spacing 
CURA-9424
 2022-11-01 16:28:23 +01:00
Joey de l'Arago
25a0355cfe Update dialog size 
CURA-9424
 2022-11-01 16:20:09 +01:00
Remco Burema
45fb71e966 Engine should know to (not) offset the nozzles w.r.t. disallowed areas. 
part of CURA-9066
 2022-10-30 17:07:21 +01:00
c.lamboo
efe3014d55 Merge branch '5.2' of github.com:Ultimaker/Cura into 5.2 
# Conflicts:
#	plugins/UFPWriter/UFPWriter.py
 2022-10-06 16:05:59 +02:00
c.lamboo
598e093b5e Revert "Flatten equation in UFP settings export" 
This reverts commit ccf9a47f085ac66bf57ec04e99a04bd984770641.
 2022-10-06 16:05:53 +02:00
c.lamboo
ccf9a47f08 Flatten equation in UFP settings export 2022-10-06 15:49:51 +02:00
Casper Lamboo
cb6c19c1c6
Merge pull request #13481 from Ultimaker/CURA-9714_crash_loading_abstract_machine_3mf 
[CURA-9714] Crash loading abstract machine 3mf
 2022-10-05 16:37:58 +02:00
Joey de l'Arago
04ff78c704
Merge pull request #13471 from Ultimaker/CURA-9719 
Add intent and quality fields to slice metadata
 2022-10-05 16:11:31 +02:00
Joey de l'Arago
8e56631972 3mf project files saved with an abstract printer would crash on loading when selecting a non abstract printer to load the project with. 
This was because the metadata "is_abstract_machine" was being loaded into the non abstract machine. This caused a crash in MachineListModel.py by trying to delete this non abstract machine from a list where it didn't exist.

The solution is to ignore the "is_abstract_machine" metadata when loading settings from saved machines in 3mf files.

CURA-9711
 2022-10-05 15:27:39 +02:00
Maël Kerbiriou
058824d2f4 UFPWriter: fix settings serialization 2022-10-04 23:35:15 +02:00
c.lamboo
a1a2784ef9 Add intent and quality fields to slice metadata 
CURA-9719
 2022-10-04 11:47:53 +02:00
MariskaMaas
d0ddb5fafe [CURA-9688] Fix View Printers in Digital Factory 
Send the user to the welcome page instead of the printjobs page to get a more comprehensive overview coming from the monitor page.
 2022-10-03 14:37:41 +02:00
Joey de l'Arago
39e3a18bf6 Disconnect signal on deletion of CloudOutputDevice 
CURA-9678
 2022-09-23 10:50:26 +02:00
Joey de l'Arago
c729b87f3c Duplicate print jobs were being sent when printing via cloud from abstract printers. 
This was due to the connect function not being called on the CloudOutputDevice used to print on the cloud. This function is only called when it becomes an active printer (AbstractCloudOutputDevice is the active printer instead now).

The fix is to always listen for signals to reset the print job even when not the active printer.

I've chosen different signals now so there is not too much spam on the reset function.

The BackendStateDone signal catches new slices. The SceneChanged signal catches ufp files being loaded (These do not trigger BackendState changes)

CURA-9678
 2022-09-23 10:32:03 +02:00
Jaime van Kessel
ce71cbb57b
Merge pull request #13209 from Ultimaker/CURA-9224_approver_settings_json 
[CURA-9224] Approver settings json
 2022-09-13 14:07:42 +02:00
Jaime van Kessel
4e785c3b61
Merge branch 'CURA-9224_approver_settings_json' of github.com:Ultimaker/Cura into CURA-9224_approver_settings_json 2022-09-13 13:36:49 +02:00
Jaime van Kessel
356da40dde
Remove unused function 
CURA-9224
 2022-09-13 13:36:28 +02:00
Jaime van Kessel
8dc2eaf783
Move CreateFlattendContainerInstance to InstanceContainer 
It didn't really belong in the stack builder, as it's not a containerstack

CURA-9224
 2022-09-13 13:35:37 +02:00
Jaime van Kessel
a27bf8f7ed
Update formatting 
CURA-9224
 2022-09-13 11:16:02 +02:00
Jaime van Kessel
aa28f8abfb
Remove unused import 
CURA-9224
 2022-09-13 11:15:04 +02:00