GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,749 Commits 295 Branches 268 Tags
Commit Graph

16749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
ebe533bdc8 Move active view panel to previewStage 
CURA-5829
 2018-10-29 13:39:00 +01:00
Jaime van Kessel
9cc7a7ca23 Moved view selection to previewStage 
CURA-5829
 2018-10-29 13:27:47 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
 2018-10-29 13:25:23 +01:00
Ghostkeeper
6df0d1a85d
Merge branch '3.6' 2018-10-29 13:19:16 +01:00
Ghostkeeper
718df14d07
Merge branch 'add_bundled_materials' into 3.6 2018-10-29 13:18:19 +01:00
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 b00ea4719a268ec4b000375343bbc4082783b435.
 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
Lipu Fei
924951815c Merge remote-tracking branch 'origin/3.6' 2018-10-29 10:45:03 +01:00
Lipu Fei
2223ff14f7 Fix extruder index for material diameter box in MachineSettings dialog 
CURA-5857
 2018-10-29 10:40:25 +01:00
Lipu Fei
261a3976d7 Merge remote-tracking branch 'origin/3.6' 2018-10-29 08:13:23 +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
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02: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
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Diego Prado Gesto
3eb71021e2 Change the way the string for the tooltip is formatted. 
Contributes to CURA-5772.
 2018-10-26 15:53:20 +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
Diego Prado Gesto
87086907da Add some Ultimaker materials to the list of bundled materials, so they 
will show as installed in the Toolbox.
 2018-10-26 12:14:27 +02:00
Diego Prado Gesto
a277bd9f3b Don't use the hand cursor in the action buttons by default. 
Contributes to CURA-5784.
 2018-10-26 11:29:05 +02:00
Diego Prado Gesto
54518bdc82 Change the minimum window size to be 1280x800. 
Contributes to CURA-5784.
 2018-10-26 11:14:39 +02:00
Remco Burema
24f9804f03 Disable per-meshgroup settings in the per-mesh settings when in one-at-a-time mode. 
[CURA-5767]

The backend can't handle per mesh-group settings (as opposed to per mesh settings)
when sequence was in one-at-a-time mode. The problem is that the extruder train is
in between the per-meshgroup-settings (child-of) and per-mesh-settings (parent-of).
For any per-mesh-group settings, the possibility exists that they'll be overridden
by settings we always set (and that need to be set) per extruder. Changing this
would require the engine-architecture to change, and _all_ settings would need to
be thouroughly retested. As this was a too extensive change, it was decied just to
disable the per-meshgroup settings when printing one-at-a-time (too).

The issue was originally reported as:
'"Printing Temperature Initial layer" setting per mode does not work'
 2018-10-26 11:01:46 +02:00
Diego Prado Gesto
a8531a335d Fix the alignments for the sliders in the simulation view. 
Contributes to CURA-5772.
 2018-10-26 09:52:02 +02:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00
Ian Paschal
75e351304c
Merge pull request #4652 from Ultimaker/CL-1119_monitor_tab_printer_names_clipped_too_short 
CL-1119 Use shorter machine name for skeleton and longer for text (Fix for 3.6)
 2018-10-25 16:52:50 +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
Jason Scurtu
2227c1debf recheck 2018-10-25 15:52:48 +02:00
Jason Scurtu
2c43294472 use "material_print_temperature" in material profile 2018-10-25 15:52:39 +02:00
Jason Scurtu
2b70613345 fix and improve 4max profile 2018-10-25 15:52:25 +02:00
Jason Scurtu
9532cc70b8 Disable has_machine_quality for now.. 
Needs more adjustment
 2018-10-25 15:52:12 +02:00
Jason Scurtu
73c6bdf028 Add Anycubic 4Max profile 2018-10-25 15:51:59 +02:00
Ghostkeeper
83f0213aa5
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2018-10-25 15:51:51 +02:00
Ghostkeeper
af325238f2
Merge branch 'addVariants' of https://github.com/ValentinPitre/Cura into ValentinPitre-addVariants 2018-10-25 15:48:07 +02:00
Diego Prado Gesto
4fda914dcf
Merge pull request #4472 from jscurtu/master 
Add Anycubic 4Max profile
 2018-10-25 15:26:31 +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
THeijmans
9d5936492a TPU temperatures update 
Removal of all final and initial print temperature offsets, and huge increase in first layer print temperature. These changes should greatly improve first layer extrusion.
 2018-10-25 14:03:58 +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
Lipu Fei
0e1e8d269a Fix the extra setNextStack() 2018-10-25 13:40:34 +02:00
Jason Scurtu
1c5817b5b6 recheck 2018-10-25 13:01:05 +02:00
Jason Scurtu
39749dcaf6 use "material_print_temperature" in material profile 2018-10-25 12:45:01 +02:00
Lipu Fei
0d0384e331 Merge remote-tracking branch 'origin/3.6' 2018-10-25 11:43:06 +02:00