3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 20:57:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 306 branches 270 tags 779 MiB
Commit graph

4854 commits

Author SHA1 Message Date
Jaime van Kessel
3248a05819 Add PreviewStagePlugin stubs 
Since we are going to move all the views into a seperate stage, we need to add another stage to do that.

CURA-5829
 2018-10-29 11:28:08 +01:00
fieldOfView
0c1b3931db Revert "WIP: Add custom CameraView for UM camera feed" 
This reverts commit b00ea4719a.
 2018-10-29 11:18:55 +01:00
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
736bf040a8 Fix typing and typos 2018-10-29 11:18:54 +01:00
fieldOfView
484b1e5ec6 Remove CameraImageProvider and NetworkCamera 2018-10-29 11:18:53 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
fieldOfView
890ddc015e Add Cura.NetworkMJPGImage widget 2018-10-29 11:17:41 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
fieldOfView
7899b249fc Use preferred material instead of generic PLA when creating a new material 2018-10-28 12:12:14 +01:00
fieldOfView
517428a308 Fix typing error in NetworkedPrinterOutputDevice.post 
Strictly speaking the QNetworkManager.post() method takes a QByteArray instead of Python bytes, but according to the PyQt documentation, PyQt handles that conversion transparently:
http://pyqt.sourceforge.net/Docs/PyQt5/gotchas.html#python-strings-qt-strings-and-unicode
 2018-10-28 11:27:08 +01: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
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
Lipu Fei
0e1e8d269a Fix the extra setNextStack() 2018-10-25 13:40:34 +02:00
Lipu Fei
5e8dba5266 Remove some duplicate addExtruder() and setNextStack() calls 2018-10-25 11:42:47 +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
eea340d57a
Add typing 2018-10-24 15:54:14 +02:00
Lipu Fei
b00ea4719a WIP: Add custom CameraView for UM camera feed 
CURA-5821
 2018-10-24 15:44:19 +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
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
Diego Prado Gesto
45d4c1a0db
Merge pull request #4600 from Ultimaker/STAR-273_update_oauth2_requested_scopes 
Update OAuth2 scopes
 2018-10-23 14:01:03 +02:00
Remco Burema
fb9d85557e Missed one of the getCompatibleMaterialDiameter typo's in the previous commit. 
part of [CURA-5834]
 2018-10-23 13:57:42 +02:00
Diego Prado Gesto
94ef0b92fe Fix typo in the getCompatibleMaterialDiameter function. 
Contributes to CURA-5834.
 2018-10-23 10:25:13 +02:00
Lipu Fei
89cb67017f Add unit test for addDefaultMachineActions() 
CURA-5812
 2018-10-23 08:49:23 +02:00
Lipu Fei
cbd8c8739d Merge from master 2018-10-23 08:08:37 +02:00
Lipu Fei
eef7be3ed6 Use empty string for empty build plate 
CURA-5844

Or there can be a configuration mismatch.
 2018-10-22 11:54:13 +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
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
Lipu Fei
afa3e62dc1
Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown 
CURA-5814 material cost now always shown
 2018-10-19 11:20:29 +02:00
Lipu Fei
537108032e Fix typing in PrinterOutputModel 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
0e772beb14 Fix typing in MachineActionManager 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
59704e4c0e Make sure that a machine's default actions are added before it gets activated 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
c67abb61a8 Remove unused argument "index" in addFirstStartAction() 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
6dc01d4c08 Add typing for MachineActionsManager 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
c1b9d527bb Add typing for MachineAction 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Lipu Fei
e5efd1e41f Move constant definition into constructor 
CURA-5812
 2018-10-19 09:57:57 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
Ghostkeeper
db0da61506
Forbid interpolation in setting visibility preset files 
We might use characters that collide with this.

Contributes to issue CURA-5734.
 2018-10-18 14:54:20 +02:00
Diego Prado Gesto
a4c609d514 Remove email label from the account widget. 
It's not needed and it's not currently public data that is published
with the user token.

Contributes to CURA-5784.
 2018-10-18 14:28:00 +02:00
ChrisTerBeke
38b615c734
Update OAuth2 scopes 
Part of STAR-273.
 2018-10-17 17:43:04 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Jaime van Kessel
907ecc54bd Use the material weight as fallback 
CURA-5814
 2018-10-17 14:49:03 +02:00
Jaime van Kessel
3ad113f70f Added some missing typing. 
Since i was changing some stuff here, i better leave it more typed as I found it.

CURA-5814
 2018-10-17 14:14:12 +02:00
Jaime van Kessel
45da5b9130 Added more specific overrides for get/set globalContainerStack 
This helps a lot with the type hinting in other bits of the code, since for CuraApplicaiton we know it's always going to be a GlobalStack

CURA-5814
 2018-10-17 14:07:12 +02:00
Jaime van Kessel
ccb0d63041 Rename print_time_message_values to something print_times_per_feature 
Since this actually makes sense and describes what it holds. CURA-5814
 2018-10-17 13:50:52 +02:00
Jaime van Kessel
440dee2191 Removed unused code 
CURA-5814
 2018-10-17 13:32:26 +02:00
Jaime van Kessel
3fd9d35ea4 Removed outdated documentation 
CURA-5814
 2018-10-17 13:31:58 +02:00
Jaime van Kessel
6555f4d4f3 Add typing 
Because of boyscouting. CURA-5814
 2018-10-17 13:31:03 +02:00
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00