GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 04:53:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,235 Commits 289 Branches 260 Tags
Commit Graph

96 Commits

Author SHA1 Message Date
Ghostkeeper
7c2c24b8a5
Remove unused function 
Contributes to issue CURA-340.
 2016-06-15 14:38:19 +02:00
Jaime van Kessel
12faf23af8 Added a way to check if a printer is connected 
CURA-1036
 2016-06-15 14:13:54 +02:00
Simon Edwards
92569d63e9 Call the method correctly through the instance. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 13:40:41 +02:00
Simon Edwards
70b2311c59 Use the file name to create the profile name during import. Also moved the createUniqueName() method up into CuraContainerRegistry. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 12:51:47 +02:00
fieldOfView
2460b37c99 Fix check for self._global_container_stack for consistency 
CURA-340
 2016-06-15 11:13:31 +02:00
fieldOfView
a545cde4a8 Force setting fields to update when discarding changes 
Textfields that have the focus don't (always) update when a new value is set.
CURA-1585
 2016-06-13 11:53:57 +02:00
fieldOfView
534a4adc8e Fix showing/hiding variant/material dropdowns when switching between machines 
CURA-340
 2016-06-12 20:55:25 +02:00
fieldOfView
17d1dbd804 Fix updating the sidebar when a setting is changed in an extruder 
CURA-1585
 2016-06-12 14:26:12 +02:00
fieldOfView
293d7c06d9 Revert "Use callLater to set the active machine in MachineManager" 
This reverts commit 0aea7bdb5c67e7dde3be31cfd1a8d48b72c5d322.
Advanced mode showed no settings, and things were generally not working after this commit, so I am reverting the change for now.
 2016-06-12 13:55:47 +02:00
Ghostkeeper
e813c2c08e Merge pull request #787 from Ultimaker/exception_handling_fixes 
Minor Exception handling Fixes
 2016-06-11 15:23:16 +02:00
fieldOfView
e150b1887e Update active variant, material and quality id when switching extruders 
CURA-1585
 2016-06-10 16:50:11 +02:00
fieldOfView
57dfc2ae79 Change active containerstack when the global containerstack is changed 
CURA-1585
 2016-06-10 16:37:43 +02:00
fieldOfView
c4a1bd2fd3 Automatically use global- or extruder- containerstack 
CURA-1585
 2016-06-10 16:13:47 +02:00
Arjen Hiemstra
0aea7bdb5c Use callLater to set the active machine in MachineManager 
This prevents exceptions in setActiveMachine from preventing Cura to
start.
 2016-06-10 14:54:21 +02:00
Jaime van Kessel
e2e9e7964c Fixed duplication if no name was changed 
CURA-1427
 2016-06-10 11:48:33 +02:00
Jaime van Kessel
0cf3fd3624 Removed unused imports 
CURA-1278
 2016-06-10 09:41:51 +02:00
Jaime van Kessel
962b4e84a9 Fixed renaming of profiles. 
They are now correctly renamed (and saved under different name on disk as well)

CURA-1683
 2016-06-10 09:38:47 +02:00
Jaime van Kessel
070a522abb Revert "Temporarily revert "Renaming profiles now also renames them on disk"" 
Starting work on it again, so unreverting the revert (i guess)

This reverts commit d8e8b0740ac2b1d776c13cd8078fe1b8e4f5a45d.
 2016-06-10 09:17:12 +02:00
fieldOfView
d8e8b0740a Temporarily revert "Renaming profiles now also renames them on disk" 
This reverts commit af238d5a7656b243550c426405e2b356de877365.
 2016-06-10 00:12:35 +02:00
Jaime van Kessel
ceef6a003e Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-09 19:17:57 +02:00
Jaime van Kessel
af238d5a76 Renaming profiles now also renames them on disk 
CURA-1683
 2016-06-09 19:17:31 +02:00
fieldOfView
d34d398e96 Change the implementation of creating a profile from the current settings 
The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
 2016-06-09 18:40:42 +02:00
fieldOfView
392d237b47 Fix filtering UM2+ profiles 
Profiles did not show before selecting a material
CURA-1278
 2016-06-09 16:55:04 +02:00
fieldOfView
cd803bc36e Determine readonly state from location in filesystem instead of a metadata property 
CURA-1684
 2016-06-09 13:16:23 +02:00
fieldOfView
8608468802 Add a method to get the id of the current user profile 
CURA-1668
 2016-06-08 16:32:39 +02:00
Arjen Hiemstra
163642f9ad Also remove the "current_settings" container when removing a machine 
Contributes to CURA-1628
 2016-06-08 14:06:14 +02:00
Ghostkeeper
98a0f90dae
Remove unused variable _active_extruder_index 
This index is managed by ExtruderManager.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:38:59 +02:00
fieldOfView
b452af5dbf Update Profile dropdown when renaming a quality profile 
CURA-1585
 2016-06-07 19:31:35 +02:00
fieldOfView
f7480baca2 Fix selecting another quality when the currently active quality is removed 
CURA-1585
 2016-06-07 19:25:12 +02:00
fieldOfView
21b1891c0e Make unique name generation more robust and simpler 
CURA-1585
 2016-06-07 18:55:27 +02:00
fieldOfView
cca432742b Fix creating a name for a new MachineManagerModel 
CURA-1585
 2016-06-07 17:01:08 +02:00
fieldOfView
b2782ced0a Fix "renaming" profiles/machines to their current name without adding an increment 
CURA-1585
 2016-06-07 15:56:59 +02:00
fieldOfView
3257d949eb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 12:00:03 +02:00
fieldOfView
4fb66afe06 Mark duplicated profiles as non-read-only 
CURA-1585
 2016-06-07 11:58:44 +02:00
Ghostkeeper
890303da14
Add function to add all extruder trains of a machine 
This function only adds extruder trains if they have not been added already.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
fieldOfView
bbc33f5d70 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 11:01:24 +02:00
Jaime van Kessel
0a84867132 Fixed multiple typos / missing things in extrudermanager 2016-06-07 09:33:29 +02:00
fieldOfView
05643eca11 Fix renaming profiles from the Profiles page 
CURA-1585
 2016-06-07 08:11:53 +02:00
fieldOfView
5235f74adf Prevent unique names like "profile #10 #2" 
CURA-1606, CURA-1585
 2016-06-06 17:47:33 +02:00
Ghostkeeper
bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura 
Conflicts:
	cura/MachineManagerModel.py
 2016-06-06 16:41:34 +02:00
fieldOfView
df71269f82 Mark custom profiles as not read-only 
CURA-1585
 2016-06-06 15:56:45 +02:00
fieldOfView
0b57728d9d Fix creating a unique name for profiles 
CURA-1585
 2016-06-06 15:55:14 +02:00
Ghostkeeper
d1be5b6c02 Create extruder train for each train in a machine 
We had the functionality, but this function was not yet called!

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
fieldOfView
a2db4740b9 Fix removing custom (quality) profiles 
CURA-1585
 2016-06-06 15:09:21 +02:00
fieldOfView
a139809b75 Fix showing profiles created using the dropdown menu in the dropdown and on the profiles manager 
CURA-1585
 2016-06-06 13:39:11 +02:00
fieldOfView
c21475abd7 Prevent multiple machines having the same custom name 
Caused by container vs containerstack confusion
Fixes CURA-1606 and CURA-1649
 2016-06-05 14:05:56 +02:00
fieldOfView
ead91db062 Fix activating another container stack when the currently active stack is removed 
CURA-1632
 2016-06-05 13:54:55 +02:00
Jaime van Kessel
b63c308694 Changed order of loading containers so extruder stacks don't fail anymore 
CURA-340
 2016-06-05 12:45:02 +02:00
Jaime van Kessel
783134031b Settings can now be set by extruder 
CURA-340
 2016-06-05 12:17:35 +02:00