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
12,148 Commits 295 Branches 268 Tags
Commit Graph

1040 Commits

Author SHA1 Message Date
fieldOfView
cfb062718f Fix creating a clone of criteria 
CURA-2006
 2016-08-22 21:43:32 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles 
CURA-2006, CURA-1774
 2016-08-22 19:21:44 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
aefb36d1ec
Update activeValidationState if setting validation changed 
This was removed from onGlobalSettingChanged but never re-added anywhere.

I've updated it to check for both the global and the active stack, since some settings modify only the global stack (such as layer height).

Contributes to issue CURA-2006.
 2016-08-22 13:42:14 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality 
CURA-2095
 2016-08-22 11:31:31 +02:00
fieldOfView
52dda935fc Switch to a generic quality profile if a material has no specific qualities 
CURA-2095
 2016-08-22 11:14:53 +02:00
fieldOfView
d8d328c491 Code style 2016-08-19 17:22:55 +02:00
Jaime van Kessel
e3d4a33954 Fixed legacy profile reader 
Updated some settings that were changed from 2.1 to 2.2. Also fixed some
architecture changes that were not changed correctly (or at all)

CURA-1493 and CURA-1779
 2016-08-19 10:38:18 +02:00
Ghostkeeper
0c0871656b
Cache container registry before for loop 
Slight performance increase. We should pay more attention to this kind of thing.

Contributes to issue CURA-2006.
 2016-08-18 17:26:51 +02:00
fieldOfView
063faf1520 Move the "Changes on Printer" dialog to JediWifiPrinting 
...to have full control over the terminology
CURA-2116
 2016-08-16 16:48:35 +02:00
fieldOfView
b2143e7d43 Remove code duplication 
CURA-2116
 2016-08-16 15:25:44 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
80214d07bc Prettier number display in Profiles page. CURA-2006 2016-08-16 15:03:01 +02:00
Jack Ha
83b89d09d8 Fix for could not find quality xxx 2016-08-16 13:34:47 +02:00
Jack Ha
759ef29b1d Fix keep user settings dialog. 2016-08-16 13:12:34 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition 
CURA-2116
 2016-08-16 10:18:57 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page 
CURA-2123
 2016-08-15 15:17:59 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Arjen Hiemstra
a14a80be56 Document and simplify the quality/quality changes code in ContainerManager 
Contributes to CURA-2006
 2016-08-11 17:50:54 +02:00
Arjen Hiemstra
9f33fef4ec Use the new generator to simplify some extruder related code in MachineManager 
Contributes to CURA-2006
 2016-08-11 17:50:08 +02:00
Arjen Hiemstra
6049d6f3a5 Introduce a getActiveGlobalAndExtruderStacks method to ExtruderManager 
It can be used to iterate over the active global and extruder stacks

Contributes to CURA-2006
 2016-08-11 17:49:02 +02:00
Arjen Hiemstra
c557cd1a7a Move comment 
Contributes to CURA-2006
 2016-08-11 17:48:22 +02:00
fieldOfView
1848bb5cc4 Fix typo in Changes on the Printer dialog 2016-08-11 16:36:24 +02:00
Arjen Hiemstra
7ba49b4f88 Remove code that is obsolete and moved to ContainerManager 
Contributes to CURA-2006
 2016-08-10 11:58:40 +02:00
Arjen Hiemstra
2c0f0e8559 Move new_id in ContainerManager::duplicate into a general block 
Saves duplication

Contributes to CURA-2006
 2016-08-10 11:57:57 +02:00
Arjen Hiemstra
29c0cc3850 Fix ContainerManager::renameQuality to set a proper unique id 
Contributes to CURA-2006
 2016-08-10 11:57:04 +02:00
Arjen Hiemstra
ba2c60bb0d Implement remove, rename, duplicate quality in containermanager 
Contributes to CURA-2006
 2016-08-10 11:03:33 +02:00
Arjen Hiemstra
1a6b16932a Add a QualitySettingsModel that lists all quality related settings and values 
Contributes to CURA-2006
 2016-08-10 11:00:36 +02:00
Arjen Hiemstra
578191bb8a Expose a list of all active materials in MachineManager 
Contributes to CURA-2006
 2016-08-10 10:59:43 +02:00
Arjen Hiemstra
6de7d0170a Expose quality changes id and quality type and make the profile menu work correctly 
Contributes to CURA-2006
 2016-08-10 10:58:44 +02:00
Arjen Hiemstra
450dcac394 Fix "keep current settings" dialog so it properly clears on "No" 
Contributes to CURA-2006
 2016-08-10 10:57:42 +02:00
Arjen Hiemstra
e2a4aeb8ff Use the new quality_type when setting the active quality 
Contributes to CURA-2006
 2016-08-10 10:57:12 +02:00
Arjen Hiemstra
b894e3888c Introduce a quality_type metadata entry that can be used to distinguish qualities 
Since we want the profile to be selected based on material and we have
profiles like "ABS Normal" and "PLA Normal" we need some way to make
sure we select the same.

Contributes to CURA-2006
 2016-08-10 10:55:25 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +02:00
Ghostkeeper
d53fe9637e
Update documentation for return of getExtruderValue 
It now falls back to global instead of returning None.

Contributes to issue CURA-2024.
 2016-08-08 09:45:08 +02:00
Ghostkeeper
a46f6cc14d
Properly fallback to global if no extruders 
This fixes the extruderValue function for printers such as the Ultimaker 2+.
 2016-08-05 11:36:43 +02:00
Arjen Hiemstra
4a02a9d1e3 Fix updating changed state for all stacks 
Contributes to CURA-2006
 2016-08-04 18:11:36 +02:00
Arjen Hiemstra
bc8c55f8fb Properly return True in updateQualityChanges 
Since it is declared as returning bool

Contributes to CURA-2006
 2016-08-04 18:05:45 +02:00
Arjen Hiemstra
7b9c982c62 Properly fix machinemanager access 
Contributes to CURA-2006
 2016-08-04 18:04:32 +02:00
Arjen Hiemstra
324d1415d7 Fix updating active quality 
Contributes to CURA-2006
 2016-08-04 17:55:16 +02:00
Arjen Hiemstra
354a467d8e Fix circular import bullcrap 
Contributes to CURA-2006
 2016-08-04 17:51:43 +02:00
Arjen Hiemstra
d150acb79c Change setActiveQuality to set quality of extruders & global and also set change containers 
Contributes to CURA-2006
 2016-08-04 17:41:01 +02:00
Arjen Hiemstra
e2045cdb7f Remove obsolete container switcheroo 
Contributes to CURA-2006
 2016-08-04 17:40:16 +02:00
Arjen Hiemstra
5361efcf2c Return the name/id of the quality changes container if it is set for activeQuality 
Contributes to CURA-2006
 2016-08-04 17:39:52 +02:00
Arjen Hiemstra
10de07c08e Remove some code that was moved to ContainerManager 
Contributes to CURA-2006
 2016-08-04 17:39:09 +02:00
Arjen Hiemstra
2ee2bc7348 Properly implement ContainerManager::createQualityChanges 
Contributes to CURA-2006
 2016-08-04 17:37:15 +02:00
Arjen Hiemstra
b76ebbb850 Ensure we have an empty quality changes container in the extruder stack 
Contributes to CURA-2006
 2016-08-04 17:36:39 +02:00
Arjen Hiemstra
ec383b46b9 Emit blurSettings for ContainerManager::merge/clear user containers 
Contributes to CURA-2006
 2016-08-04 17:33:35 +02:00
Ghostkeeper
50cd98f2bb
Allow extruderValue(s) to fallback to global 
If a setting is not defined in the extruder stack, fall back to global. At least it still tries to get the extruder value from the correct stack first. If that stack has no value, then so be it, use global anyway.

Contributes to issue CURA-2024. Also could affect issue CURA-2006.
 2016-08-04 16:54:43 +02:00