GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,340 Commits 292 Branches 265 Tags
Commit Graph

4804 Commits

Author SHA1 Message Date
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
Remco Burema
5133b6300a
Merge pull request #4650 from Ultimaker/CURA-5857_fix_machine_settings_set_diameter 
[3.6] [CURA-5857] Fix setting extruder material diameter in Machine Settings dialog
 2018-10-26 17:35:50 +02:00
Remco Burema
de680f4aac
Merge pull request #4669 from Ultimaker/CURA-5821_fix_camera_memory_leak 
Cura 5821 fix camera memory leak
 2018-10-26 15:00:03 +02:00
Ian Paschal
94d48101d9 Use different lengths for loading skeleton and printer name 
Contributes to CL-1119
 2018-10-25 16:45:49 +02:00
Diego Prado Gesto
f1d94d921c The MachineManager doesn't have the extruder stacks but the active 
machine does, so use it when setting the compatible material diameter to
the current extruder.

Contributes to CURA-5857.
 2018-10-25 16:27:16 +02:00
Diego Prado Gesto
197bf057cc Merge branch '3.6' into CURA-5857_fix_machine_settings_set_diameter 2018-10-25 15:57:26 +02:00
Lipu Fei
6fd7b49937 Fix setting extruder material diameter in Machine Settings dialog 
CURA-5857

It should update the value of the selected Extruder TAB, not the active
extruder on the printer.
 2018-10-25 15:11:04 +02:00
Lipu Fei
31bdeb8b73 Merge remote-tracking branch 'origin/3.6' into CURA-5821_fix_camera_memory_leak 2018-10-25 14:53:42 +02:00
Ghostkeeper
c7b146c9fc
Don't make retract distances negative 
People are reporting that the retraction is reversed. We can't test it since we have no firmware that supports the command at all. So we'll just not make the retract distance negative. That seems more logical anyway if you read the documentation of M600 to the letter.

Fixes #4249.
 2018-10-25 13:54:00 +02:00
Ian Paschal
1a67660196 Hotfix: Show printer selection 2018-10-25 10:54:59 +02:00
Ghostkeeper
12eb43b8fd
Merge branch 'CURA-5769_gcode_retraction' 2018-10-24 16:14:05 +02:00
Lipu Fei
9d07409cce WIP: Use CameraView for UM camera feeds 
CURA-5821

The original implementation that refreshes a QImage seems to cause
memory overflow on MacOSX and Windows. This is a different
implementation. It doesn't cause memory overflow, but it does consume a
lot of CPU power.
 2018-10-24 16:00:22 +02:00
Ghostkeeper
9b74dfd5ec
Correct typo 
intented -> intended
 2018-10-24 15:54:45 +02:00
Ian Paschal
be5c1c8596
Merge pull request #4436 from Ultimaker/clean_print_job_info_block 
CL-897, CL-1051, CL-1111 Cura 3.6 Monitor Tab
 2018-10-24 12:29:46 +02:00
Ian Paschal
d077dcc851 Fix printer card skeleton colors 
Contributes to CL-1051
 2018-10-24 11:13:38 +02:00
Ian Paschal
8662e1a125 Fix override dialog box 
Contributes to CL-897
 2018-10-24 11:13:12 +02:00
Ian Paschal
a247fe204f Fix print job context menu height 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 16:27:45 +02:00
Ian Paschal
0045559d01 QML Clean-up 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 15:45:44 +02:00
Ian Paschal
f9545a339d QML Clean-up 
Contributes to CL-897, CL-1051, CL-1111
 2018-10-23 15:41:56 +02:00
Ian Paschal
1bd488dd6c Remove comments 
Contributes to CL-897
 2018-10-23 15:25:42 +02:00
Remco Burema
3dab627670
Merge pull request #4618 from Ultimaker/CURA-5834_fix_material_model_update 
CURA-5834 Fix material model update
 2018-10-23 14:54:34 +02:00
Lipu Fei
1675ad4ba5
Merge pull request #4487 from fieldOfView/fix_marlin_press_to_resume 
Fix "press to resume" message after heating bed when usb is connected
 2018-10-23 10:27:40 +02:00
Diego Prado Gesto
94ef0b92fe Fix typo in the getCompatibleMaterialDiameter function. 
Contributes to CURA-5834.
 2018-10-23 10:25:13 +02:00
Ian Paschal
9a16d45be5 Round divisions 
Contributes to CL-1051, CL-897, CL-1111
 2018-10-22 16:02:55 +02:00
Ian Paschal
34abc48a1a Remove binding loops 
Contributes to CL-1051
 2018-10-22 15:31:38 +02:00
Lipu Fei
ea9aa2c777 Add doc for using setCompatibleMaterialDiameter() in QML 
CURA-5834
 2018-10-22 10:56:11 +02:00
Ian Paschal
817899686a Dark mode theme improvements 
Contributes to CL-1111
 2018-10-19 16:23:16 +02:00
fieldOfView
68c3023a46 Make sure firmware name is only requested once 2018-10-19 14:38:25 +02:00
fieldOfView
71d365c0c6 Fix case where Cura and the firmware could be waiting for eachother 2018-10-19 14:37:20 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Aleksei S
22db3cb32b Show retraction for G92 command 
CURA-5769
 2018-10-19 13:18:42 +02:00
Lipu Fei
ea10d5e608 Rename to comptabileMaterialDiameter 
CURA-5834

This property returns the material diameter an extruder is compatible
with, so this makes it more clear.
 2018-10-19 11:36:12 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion 
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
 2018-10-19 09:55:23 +02:00
Ghostkeeper
9aa7b76dbe
Update change log with 3.5.1 changes 
Too little, too late. But at least you'll be able to look back on it.
 2018-10-19 07:55:39 +02:00
fieldOfView
777470db7f Don't force sending M105 requests without OK 
This prevents serial buffer overflow on the printer.
 2018-10-18 15:47:25 +02:00
fieldOfView
f4c88aff0f Merge branch 'master' into fix_marlin_press_to_resume 2018-10-18 15:35:57 +02:00
Ian Paschal
1ad008f45c Style improvements 
Contributes to CL-897 and CL-1051
 2018-10-17 16:32:30 +02:00
Ian Paschal
6f33c4410c Review tweaks 
Contributes to CL-897 and CL-1051
 2018-10-17 14:39:42 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received 
Contributes to CL-1051
 2018-10-17 14:28:17 +02:00
alekseisasin
a7be605b9d Typing error in CI CURA-5769 2018-10-17 09:50:22 +02:00
Aleksei S
20fa7f4dd8 Display retractions lines for the loaded Gcode files 
CURA-5769
 2018-10-16 16:47:05 +02:00
Ian Paschal
b99bc06d1c Clean up more errors 
Contributes to CL-1051
 2018-10-16 09:34:50 +02:00
Ian Paschal
1fa7a8880b Clean up some QML warnings 
Contributes to CL-1051
 2018-10-15 17:02:27 +02:00
Ghostkeeper
b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
 2018-10-15 16:52:22 +02:00
Ghostkeeper
c680050040
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-15 15:41:17 +02:00
Ghostkeeper
95f89044c0
Merge branch 'CURA-5483_add_s5_to_firmware_checker' 2018-10-15 15:25:29 +02:00
Ghostkeeper
53dc28db89
Change URL of firmware update page for Ultimaker 3 and S5 
I just got word of a new page to read up about the firmware update. Apparently we now have to link to this one.

Contributes to issue CURA-5483.
 2018-10-15 15:12:42 +02:00
Ghostkeeper
56a383814b
Code style: Spaces around binary operators 
Contributes to issue CURA-5483.
 2018-10-15 14:48:18 +02:00
Remco Burema
2e3abbc904 Put the firmware-update meta-data in the 'normal' printer definitions and make the code handle that. 2018-10-13 21:55:33 +02:00