GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,411 Commits 290 Branches 260 Tags
Commit Graph

4832 Commits

Author SHA1 Message Date
Ghostkeeper
7f54cacd0f
Code style 
Discovered during work on CURA-5840.
 2018-11-09 14:11:38 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application 
CURA-5840
 2018-11-08 12:04:43 +01:00
Jaime van Kessel
44954c4cad Fixes required for semantic versioning 
CURA-5840
 2018-11-01 14:15:16 +01:00
Remco Burema
5cb72e298d
Merge pull request #4700 from Ultimaker/CURA-5873_fix_duplicated_generic_materials 
Fix duplicated generic materials
 2018-10-31 11:47:09 +01:00
Ian Paschal
7960772ac8 Do show "delete" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:46:19 +01:00
Ian Paschal
ac7a566ae1 Do not show "move to top" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:45:30 +01:00
Ian Paschal
903054190d Fixing some spacing issues with camera button 
Contributes to CL-1063
 2018-10-31 11:23:57 +01:00
Diego Prado Gesto
3e37f2a09d Reset the list of generic materials to emtpy when creating the models. 
Contributes to CURA-5873.
 2018-10-31 10:31:20 +01:00
Diego Prado Gesto
2c7e7a4ad7 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:47:33 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Remco Burema
e887c260ab Add contributors to printer-defs section in the 3.6-changelog. 
part of [CURA-5871] Release notes Cura 3.6 Beta
 2018-10-31 09:30:41 +01:00
Diego Prado Gesto
e2254fe039 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:20:38 +01:00
Simon Edwards
03dd26e6e2
Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements 
Monitor tab spacing improvements
 2018-10-30 14:57:18 +01:00
Ian Paschal
30c7a2cbe5 Monitor tab spacing improvements 
Fixing CL-1063 (adding camera button at all times) introduced a few small spacing issues. This PR fixes them.
 2018-10-30 13:58:42 +01:00
Ian Paschal
0273cd2a0e Don't show the context menu for printed jobs (only active ones and queued ones) 
Contributes to CL-1118
 2018-10-30 13:44:24 +01:00
Ian Paschal
1680548a39 Remove extra empty line 2018-10-30 13:36:52 +01:00
Simon Edwards
d64465ca48
Merge pull request #4689 from Ultimaker/CL-1063_always_show_camera_monitor 
CL-1063 Always show camera icon in monitor tab
 2018-10-30 11:49:58 +01:00
Ghostkeeper
ab7f69bc1b
Add change log for Cura 3.6 
Implements CURA-5871.
 2018-10-30 11:10:45 +01:00
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +01:00
Ghostkeeper
e2b6a3f411
Add white background to thumbnails 
Regardless of the theme, the thumbnail should always have a white background so that the author can base their colours on that. Also this properly renders transparent images with a white background so that the Ultimaker robot is visible again in the dark theme.
 2018-10-30 10:39:29 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Lipu Fei
39158a643c Revert "Ignore per-meshgroup settings in per object stack" 
CURA-5767

This reverts commit 54afa799c54bf3727481241e5e5f45dffb7e3442.
 2018-10-30 07:33:55 +01:00
Lipu Fei
54afa799c5 Ignore per-meshgroup settings in per object stack 
CURA-5767
 2018-10-29 15:05:49 +01:00
Lipu Fei
248bf0f61e Merge remote-tracking branch 'origin/3.6' into CURA-5767_disable_per_meshgroup_settings_for_one_at_a_time 2018-10-29 14:32:44 +01:00
Lipu Fei
1623f66c93
Merge pull request #4656 from fieldOfView/fix_network_camera_memory_leak 
[3.6] Fix memory leak in print monitor
 2018-10-29 14:12:31 +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
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
Lipu Fei
2223ff14f7 Fix extruder index for material diameter box in MachineSettings dialog 
CURA-5857
 2018-10-29 10:40:25 +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
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
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