GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-20 02:39:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,982 Commits 295 Branches 268 Tags
Commit Graph

7710 Commits

Author SHA1 Message Date
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
fieldOfView
7aab8ad397 Change "object" to "model" 
UXD-83
 2016-08-10 17:55:51 +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
e551898e04 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:43:09 +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
Thomas Karl Pietrowski
35c520a787 Merge pull request #836 from Ultimaker/master-updates-for-Linux 
Updating NVidia workaround
 2016-08-07 07:59:34 +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
Jack Ha
30898f9642 Merge branch 'feature_quality_changes' into cura-2008 2016-08-04 18:26:14 +02:00
Jack Ha
bfabf8d11a Merge, fix qml files. Contributes to CURA-2007. 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
 2016-08-04 18:22:36 +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
Arjen Hiemstra
b6d0c40852 Store "quality_changes" type containers in the quality directory 
Contributes to CURA-2006
 2016-08-04 17:32:38 +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
fieldOfView
0faa7f4abb Fix error in PrinterOutputDevice.acceptsCommands 
CURA-1851
 2016-08-04 15:49:07 +02:00
fieldOfView
ed669925ad Disable print monitor if the printer is not (yet) ready to receive commands 
CURA-1851
 2016-08-04 15:06:22 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value. 
Contributes to CURA-2007
 2016-08-04 14:30:48 +02:00
fieldOfView
a74d5dd8cb Show error text in print monitor 
CURA-1990
 2016-08-04 13:25:28 +02:00
Arjen Hiemstra
9ef709962f Start implementing a createQualityChanges method in ContainerManager 
It will be used to create the quality change containers from the
existing user containers.

Contributes to CURA-2006
 2016-08-04 02:12:32 +02:00
Arjen Hiemstra
0934ae70a8 Introduce clearUserContainers and updateQualityChanges methods in ContainerManager 
They are moved from MachineManager which is really getting too large and
complicated.

Contributes to CURA-2006
 2016-08-04 02:11:35 +02:00
Arjen Hiemstra
95c3aa8251 Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work 
Contributes to CURA-2006
 2016-08-04 02:10:28 +02:00
Arjen Hiemstra
aa8561fec7 Remove globalPropertyChanged 
There should be no need for this if we properly store settings where
they should be stored.

Contributes to CURA-2006
 2016-08-04 02:05:12 +02:00
Arjen Hiemstra
d42f390ed6 Add the new empty quality_changes container to new machines 
Contributes to CURA-2006
 2016-08-04 02:03:57 +02:00
Arjen Hiemstra
ab99100c56 Introduce an empty quality_changes container 
Contributes to CURA-2006
 2016-08-04 02:02:47 +02:00
Arjen Hiemstra
81f3422e36 Make settable_per_* properties read-only 
Contributes to CURA-2006
 2016-08-04 02:02:14 +02:00