GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 289 Branches 260 Tags
Commit Graph

9382 Commits

Author SHA1 Message Date
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
Casper Lamboo
6abce2a81a
Merge pull request #13195 from Ultimaker/CURA-9278_choose_printer_dialog 
[CURA-9278] Press print on abstract cloud printer. User should see dialog.
 2022-09-13 10:42:36 +02:00
c.lamboo
f6442d1950 Only display buildplate for glass buildplates 
CURA-9622
 2022-09-12 14:03:15 +02:00
c.lamboo
880724d2e4 Add material information to ufp output 
CURA-9224
 2022-09-10 09:47:31 +02:00
Michael Sims
7a3aa87232 Added ability to have multiple gcode commands before and after pausing print job 2022-09-09 15:44:48 -07:00
Remco Burema
b7611da95e Connect buttons for selected printers: Print and refresh. 
part of CURA-9278
 2022-09-09 15:14:29 +02:00
Remco Burema
6adf05bbf0 Complete interface for selecting cloud printer. 
CURA-9278
 2022-09-09 11:05:05 +02:00
Jaime van Kessel
bdcbaeb65c
Merge pull request #11690 from jimduchek/usbprint_exception_fix 
USBPrinterOutputDevice.py: Convert estimated time to int
 2022-09-08 14:23:07 +02:00
Remco Burema
5866560540 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 23:33:45 +02:00
Jaime van Kessel
2f1325259c
Fix 3mf workspace reader crashing on certain invalid files 
CURA-4DP (Sentry crash)
 2022-09-06 14:47:32 +02:00
Jaime van Kessel
f2edc1ac49
Fix typo 2022-09-06 13:56:24 +02:00
Remco Burema
6baf14a516 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 12:08:05 +02:00
Jaime van Kessel
26b9bcf4f5
Merge pull request #12981 from digitalfrost/080822b 
X3DReader.py: Iterate directly over list in readIndex()
 2022-09-05 13:58:13 +02:00
Jaime van Kessel
bad161ef06
Merge pull request #13022 from digitalfrost/130822 
VersionUpgrade.py: Use enumerate
 2022-09-05 13:28:09 +02:00
joeydelarago
599fddd6dd Add all settitngs to the json. 
Change default -> all_settings. This better reflects the purpose of the list.

CURA-9224
 2022-09-05 10:43:21 +02:00
joeydelarago
ef36d3f6bd Refactoring 
CURA-9224
 2022-09-05 10:43:11 +02:00
joeydelarago
b1090728c0 Add settings changes 
CURA-9224
 2022-09-05 10:42:59 +02:00
joeydelarago
ee7c8d1f02 Move creatFlattenedContainerInstnance into CuraStackBuilder so it can be reused. 
CURA-9224
 2022-09-05 10:42:48 +02:00
joeydelarago
42c3eb0c64 Save settings to json file in .ufp 
CURA-9224
 2022-09-05 10:42:33 +02:00
Remco Burema
a56a21cf93 W.I.P.: Press print on abstract cloud printer. User should see dialog. 
Start of implementation. When printing on an abstract printer, a user should see a dialog with the matching concrete cloud printers to pick from to actually print. Names are not final. Very much a work in progress. Very not finished also.

start of implementation for CURA-9278
 2022-09-02 17:49:39 +02:00
Jaime van Kessel
023046370a
Throttle how often the local cluster updates 
This puts it in line with how often the cloud does it
Might contribute to #11608
 2022-09-02 10:03:24 +02:00
Remco Burema
053437a502 UX: The color needs to be the same. 2022-09-01 14:15:16 +02:00
Jaime van Kessel
6563ba32b4
Fix crash with removedPrinterMessage 2022-09-01 14:12:02 +02:00
Jaime van Kessel
3040a7c830
Always check if an abstract machine needs to be added 
CURA-9289
 2022-08-31 18:11:24 +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
Remco Burema
4ea437ba28 Make send to DF in monitor for abstract printer work (again-ish). 
Already moslty implemented, but a new approach of the base feature (abstract cloud printers) made a more? elegant and functioning implementation possible.

(re)implements CURA-9422
 2022-08-31 14:13:47 +02:00
Jaime van Kessel
4c55befad7
Merge branch 'main' of github.com:Ultimaker/Cura into CURA-8463_cloud_configuration 2022-08-31 10:39:05 +02:00
Jaime van Kessel
b9e8bca012
Remove commented out properties 
CURA-8463
 2022-08-31 10:33:46 +02:00