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

3470 Commits

Author SHA1 Message Date
fieldOfView
11be8f158f Merge branch 'master' into feature_support_eraser_ux 2018-03-15 11:10:49 +01:00
Lipu Fei
496c8f2f79 Cleanup MachineManagementModel 2018-03-15 10:44:02 +01:00
fieldOfView
e4a416258b Fix code-style and type hinting 2018-03-15 09:03:50 +01:00
Diego Prado Gesto
7c875c154f Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 16:56:52 +01:00
Diego Prado Gesto
2fdd51fc23 CURA-4870 Bind the network information with the output devices changed 
signal.
 2018-03-14 16:47:01 +01:00
Jack Ha
6909c9263a CURA-4400 fix setting extruder number on a group printed with mixed extruders 2018-03-14 16:32:53 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +01:00
Lipu Fei
241611546e Fix quality details view 
CURA-5054
 2018-03-14 14:41:44 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing 
CURA-4946
 2018-03-14 14:31:30 +01:00
Lipu Fei
0655ef0bc5 Fix quality profile import 
CURA-4946
 2018-03-14 14:22:46 +01:00
Lipu Fei
191faaba19 Fix machine definition in quality importing 
CURA-4946
 2018-03-14 13:49:16 +01:00
Ian Paschal
05c59ddaa7 CURA-4946 Handle gcode with wrong quality definition 
Some gcode has its quality definition set to, say, UM2 extended, which is _actually_ just UM2 gcode. Thus, we check if the definition in the profile matches the current machine or what it in theory should be, either one being valid. See comments in code for details.
 2018-03-14 13:29:48 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Lipu Fei
53626d3c67 Also force update validationState 
CURA-5048
 2018-03-14 13:02:52 +01:00
Jaime van Kessel
561b97c255 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:32:52 +01:00
Jaime van Kessel
8dd2243399 Fixed stupid mistake that made all snapshots be taken from the back of model 2018-03-14 11:32:36 +01:00
Jack Ha
f50e78d9bb Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:07:47 +01:00
Jack Ha
9f40e3925d CURA-5090 added timer to SettingInheritanceManager._update 2018-03-14 11:07:38 +01:00
Ian Paschal
4a16d04dd7 CURA-5053 Changed printer type checking 
"Still hard coded but at least doesn't use `elif` because `elif`/`else if` should not exist in any programming language." - Grumpy Pedants & Ian >:[
 2018-03-14 10:50:54 +01:00
Lipu Fei
3cefacdfcc Remove root_material_nod is None check in MaterialManager 
CURA-5056

This will no longer happen.
 2018-03-14 09:28:35 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00
Ghostkeeper
9f89678e42
Update when switching printers 
I confused globalContainerChanged with activeStackChanged.

Contributes to issue CURA-4606.
 2018-03-14 08:26:12 +01:00
fieldOfView
a536da503b Rename DepthPass to PickingPass 
The map created by the shader is not strictly a depth map; not only is the "depth" encoded in the rgb channels, but it is also a distance to the camera instead of a "scene depth".
 2018-03-13 20:40:41 +01:00
fieldOfView
d88724aff5 Move ray picking to DepthPass 2018-03-13 20:05:49 +01:00
fieldOfView
73558c9e36 Fix rendering depth pass 2018-03-13 19:44:53 +01:00
Lipu Fei
b83fd17038 Fix GUI update upon material data change 
CURA-5084
 2018-03-13 17:43:01 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar 
CURA-5084
 2018-03-13 17:41:15 +01:00
Jack Ha
406e546195 CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way 2018-03-13 17:29:20 +01:00
Jaime van Kessel
7b3598e992 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 16:54:09 +01:00
Jaime van Kessel
00f5e6ff7c Only trigger platform physics update if the node has meshdata 2018-03-13 16:53:28 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button 
[Feature] Sync Button
 2018-03-13 16:52:39 +01:00
Jaime van Kessel
283d08a0d6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 16:46:51 +01:00
Jaime van Kessel
40d300f5cc Change default direction of snapshot, so robot looks in the same direction as our beautifull logo; the ultibot 2018-03-13 16:46:02 +01:00
Aleksei S
e2cbfa8cec Fix: Retrieve printer type during creating outputDevice 
CURA-5053
 2018-03-13 16:37:09 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility 
Cura 5059 reset icon visibility
 2018-03-13 16:11:58 +01:00
Lipu Fei
c8a882849f Simplify task queue for machine error check 
CURA-5059
 2018-03-13 16:08:46 +01:00
Jack Ha
9e0a78929a CURA-5059 changed error check timer interval and added measured time in logging 2018-03-13 16:02:57 +01:00
Diego Prado Gesto
180139090a CURA-4870 Reuse the filter in findContainerStacks to find specific 
printers.
Allow to show configurations with empty material or variant.
 2018-03-13 15:54:00 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Jack Ha
76f853c5fb Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 13:53:49 +01:00
Jack Ha
cf3032605c CURA-4400 fix extruderValue / getExtruderValue for extruder_index -1 2018-03-13 13:53:41 +01:00
Aleksei S
09d01f2207 Fix: Group models were not slicable 
CURA-5082
 2018-03-13 13:51:19 +01:00
Lipu Fei
934d297e6c Split error checking into smaller sub-tasks 
CURA-5059

Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
 2018-03-13 13:21:44 +01:00
Diego Prado Gesto
dfb903fb81 CURA-4870 Wait until the configuration has all the mandatory data before 
add it to the list of unique configurations.
Remove some connections to signals and reuse already defined listeners.
 2018-03-13 13:14:29 +01:00
Jack Ha
0897c740b0 Fix typo in log 2018-03-13 12:57:03 +01:00
Ian Paschal
6d2d9c8fe2 CURA-4946 Fixed typo 2018-03-13 12:39:10 +01:00
fieldOfView
0caea24afc Add depth pass for picking a location 2018-03-13 12:14:05 +01:00
Diego Prado Gesto
fa2b5f141c CURA-4870 Remove dinamic connections to the signals in the machine 
model. The model is still updated when the container changed.
 2018-03-13 10:35:48 +01:00
Ian Paschal
b90a9c490d Don't loop extruders before checking if there is a global extruder stack 2018-03-13 09:57:07 +01:00