GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,832 Commits 289 Branches 260 Tags
Commit Graph

671 Commits

Author SHA1 Message Date
Diego Prado Gesto
13e18c9d54 Merge branch 'master' into feature_sync_button 2018-03-06 10:24:11 +01:00
Diego Prado Gesto
731a1092c5 CURA-4870 Add callback function to apply remote configuration 2018-03-06 10:18:54 +01:00
Jack Ha
00a173b1bf CURA-4400 when enabling / disabling extruder, remove user changes that are no longer enabled 2018-03-06 09:55:43 +01:00
Diego Prado Gesto
d83eb383d9 CURA-4870 Fix an error in the hash function that detects a matching when 
the extruders are inverted.
Add pretty output to the configuration model.
 2018-03-06 08:44:43 +01:00
ChrisTerBeke
5a8f2040d3 Add method to machine manager to get a machine stack by definition id 2018-03-05 17:53:40 +01:00
Diego Prado Gesto
51686943e6 CURA-4870 Create an extruder configuration model to store the extruder configuration. 
Connect the signals coming from the printer to correctly update the UI
 2018-03-05 17:15:09 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Diego Prado Gesto
a992487589 CURA-4870 Check wether the current configuration matches one of the unique configurations available on the printer output device. 
Improve some elements in the UI
 2018-03-05 14:39:49 +01:00
Jack Ha
37d02da1f1 CURA-4400 restore correct default extruder, added extruders_enabled_count and use that in fdmprinters (result: i.e. one at a time can be enabled by disabling an extruder) 2018-03-05 14:01:39 +01:00
Diego Prado Gesto
1ee5b44187 CURA-4870 Fix references to the extruder stacks 2018-03-04 18:20:42 +01:00
Diego Prado Gesto
22b1c2127f CURA-4870 Add information of the current configuration selected in the active printer 2018-03-04 18:13:27 +01:00
Lipu Fei
174bc7dbd7 Remove commented code in MachineManager 2018-03-03 16:04:30 +01:00
Lipu Fei
a220b55856 Simplify code in MachineManager 2018-03-03 16:01:59 +01:00
Lipu Fei
413e4ca55d Add doc for _setEmptyQuality() 2018-03-03 15:59:59 +01:00
Lipu Fei
bb04afa2ab Remove non-sense comments in MachineManager 2018-03-03 15:57:28 +01:00
Lipu Fei
89716acc11 Remove redundant code in MachineManager 2018-03-03 15:56:08 +01:00
Lipu Fei
51fadc9868 Remove unnecessary _onMaterialsUpdated() 2018-03-03 15:53:46 +01:00
Lipu Fei
632be11323 Remove "#NEW"s 2018-03-03 15:51:51 +01:00
Jack Ha
53ec846436 CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager 2018-03-01 17:21:35 +01:00
Jack Ha
2538c689f1 CURA-4400 make extruder combobox disabled items grey 2018-03-01 16:22:40 +01:00
Jack Ha
ba7b18a88b CURA-4400 corrected getProperty in correctExtruderSettings 2018-03-01 15:02:35 +01:00
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Jack Ha
657a52a5e7 CURA-4400 add checking for enabled extruder in setting _outside_buildarea, cleaned up a bit and factored some functions out BuildVolume 2018-03-01 11:54:31 +01:00
Jack Ha
11bad271d3 CURA-4400 set extruder numbers of settings to an enabled extruder; added SettingOverrideDecorator by default in CuraSceneNode 2018-02-28 15:56:45 +01:00
Jack Ha
86c13e86c7 CURA-4400 first version that disables extruder and updates available quality profiles 2018-02-28 12:56:00 +01:00
Lipu Fei
6b0095014a Fix merge conflicts from master 2018-02-28 12:52:45 +01:00
Lipu Fei
ab4cfa5fbb Use userChanges instead of getContainer(0) 
CURA-4916
 2018-02-28 12:49:41 +01:00
Lipu Fei
07824c21e1 Move getMachineDefinitionIDForQualitySearch() into QualityManager.py 2018-02-28 11:48:20 +01:00
Aleksei S
e533c4604c Update infill scroll bar if setting is changed in custom mode 
CURA-4916
 2018-02-28 10:52:46 +01:00
Jack Ha
ae00fc2a7e CURA-4606 change activeQualityLayerHeight to use self._current_quality(_changes)_group 2018-02-27 15:15:04 +01:00
Jack Ha
cbeaf3b287 CURA-4606 set empty quality when setting active machine when the current quality type is not in the available qualities 2018-02-27 15:14:34 +01:00
Jack Ha
fae82ef242 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-27 13:57:37 +01:00
Jack Ha
08bfe93385 CURA-4606 CURA-5020 switching to quality changes now also checks and shows keep or discard user settings 2018-02-27 13:57:30 +01:00
Lipu Fei
a2e84bbe97 Fix set quality group in init machine 2018-02-27 13:49:20 +01:00
Lipu Fei
5412a29ef9 Fix update quality upon material change 2018-02-27 13:05:19 +01:00
Lipu Fei
0b8678d2ae Explicitly create MachineManager 2018-02-26 19:33:16 +01:00
Lipu Fei
a3a206c6dd Quality groups are QObjects 2018-02-22 23:07:49 +01:00
Lipu Fei
e53048079d Remove debugging logs 2018-02-22 23:05:06 +01:00
Lipu Fei
32e1015f25 WIP: Cleanup PrintInformation 2018-02-22 16:07:56 +01:00
Lipu Fei
b415a36110 WIP: Remove delayed update in MachineManager 2018-02-22 13:58:35 +01:00
Lipu Fei
25dd63dc21 WIP: Cleanup MachineManager 2018-02-22 13:45:46 +01:00
Lipu Fei
7a2c25226a Fix initial quality_changes group setup 2018-02-22 12:59:26 +01:00
Lipu Fei
b014800eac Fix various quality related issues 2018-02-22 11:00:32 +01:00
Lipu Fei
3095140bc3 Fix quality/qualityChanges group initialization 2018-02-22 10:27:18 +01:00
Lipu Fei
d83b803fe0 Fix: Update active material names if materials lookup table gets updated 2018-02-21 16:47:12 +01:00
Lipu Fei
7a3ebe1a42 Fix NozzleMenu active nozzle bullet 2018-02-21 16:36:42 +01:00
Jack Ha
244b109403 CURA-4606 CURA-4995 switching print core now correctly updates the material 2018-02-21 16:30:45 +01:00
Jack Ha
5ba0ac8a43 CURA-4606 switch to first extruder when switching machines; this prevents crashing when switching to single extruder machine 2018-02-21 15:59:49 +01:00
Lipu Fei
02472f6ad2 WIP: Fix material name update upon machine switching 2018-02-21 12:39:04 +01:00
Lipu Fei
6cd47453bb WIP: Fix activeMaterialsCompatible() 2018-02-21 11:36:46 +01:00