GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,975 Commits 294 Branches 267 Tags
Commit Graph

2143 Commits

Author SHA1 Message Date
Ghostkeeper
20e9d19587
Update tests to account for new way of getting version numbers 
The normal version number is multiplied by a million. Currently these tests fail, so nice to have them.

Contributes to issue CURA-3427.
 2017-05-12 14:50:43 +02:00
Lipu Fei
fe11819ce9 Handle "new" resolve strategy for definition&quality changes 
CURA-3756
 2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341 Check definition changes conflicts in preRead() 
CURA-3756
 2017-05-12 14:34:41 +02:00
Ghostkeeper
a472fd8163
Remove debug print 
Oops again.

Contributes to issue CURA-3427.
 2017-05-12 14:33:44 +02:00
Ghostkeeper
1e4c394b71
Remove getting superfluous material density 
The density is already put in the 'properties' metadata entry. Don't need to put it in there doubly. Turns out that this density line was originally just superfluous.

Contributes to issue CURA-3427 or something.
 2017-05-12 14:12:36 +02:00
Ghostkeeper
98662bc6f6
Also update import to renamed package 
Oops.

Contributes to issue CURA-3427.
 2017-05-12 14:07:21 +02:00
Ghostkeeper
c8295434f3
Load setting_version from XML material profile 
The setting_version is translated from the version number. The setting_version number currently happens to be the same as the version number of XML but that won't always be the case so we introduce a translation-step as well.

Contributes to issue CURA-3427.
 2017-05-12 14:04:56 +02:00
Ghostkeeper
38f081539a
Fix deserialising density 
That density variable was never used. Hope this fixes some unaccounted-for bug.

Doesn't contribute to CURA-3427 but I'm listing it as if it does anyway.
 2017-05-12 14:01:06 +02:00
Ghostkeeper
6e01c6ba60
Initialise config_name 
Just a mistake that I saw because my IDE warned me about this. If a variant in Cura 2.3 has no general/name keyword, then it would break here. Now it doesn't break any more and gives a nonsensical name.

Contributes to issue CURA-3427.
 2017-05-11 17:33:46 +02:00
Ghostkeeper
0a84a181c4
Track cfg version numbers with major-minor, sorta 
We now have a (format) version and a setting version. Ideally we'd like major-minor version numbers in our profiles. However, introducing major-minor version numbers requires substantial changes to the version upgrade manager to compare version numbers, find a path towards the current version, or even keeping track of the current version. Therefore we just collapse the two version numbers into one: Multiply the major version number by a million and you'll never exceed it in the minor versioning. The only problem is that we now have to update the versioning for all of our three upgrade plug-ins, because they all need to know locally how to find the version number of their file types (because the upgrade manager has no knowledge of the file types) and they have no access to each other because a plug-in may be disabled.

Contributes to issue CURA-3427.
 2017-05-11 17:31:37 +02:00
Ghostkeeper
639e86ca59
Set setting_version in 2.6's profiles 
Contributes to issue CURA-3427.
 2017-05-11 16:53:59 +02:00
Ghostkeeper
30321607d0
Remove Cubic Subdivision Radius from users' configuration 
The setting no longer exists. This removes it from all instance containers and preference files.

Contributes to issue CURA-3427.
 2017-05-11 15:30:24 +02:00
Lipu Fei
8a94f94258 WIP: use .userChanges property to replace user containers in project loading 
CURA-3756
 2017-05-11 14:54:00 +02:00
Lipu Fei
3baec9b742 WIP: set dirty after overriding a user container with deserialize() 
CURA-3756
 2017-05-11 14:53:04 +02:00
Ghostkeeper
22cfaddba5
Fix import 
Oops.

The test passes again now.

Contributes to issue CURA-3427.
 2017-05-11 14:35:54 +02:00
Ghostkeeper
833ad65507
Also rename test 
Forgot that, sorry.

Contributes to issue CURA-3427.
 2017-05-11 14:34:11 +02:00
Ghostkeeper
b57cb16f6d
Rename 24to25 to 25to26 
The upgrade now upgrades profiles from the 2.5 format to 2.6, since we delayed the update for the 2.5 release.

Contributes to issue CURA-3427.
 2017-05-11 14:32:45 +02:00
Ghostkeeper
99cb8bc169
Re-enable Version 2.4 to 2.5 upgrade 
So that we can remove settings again, among which the Cubic Subdivision Radius setting.

Contributes to issue CURA-3427.
 2017-05-11 14:29:25 +02:00
Lipu Fei
bb0e711577 WIP: fix material container renaming in project loading 
CURA-3756
 2017-05-11 14:20:11 +02:00
Lipu Fei
f436da8674 WIP: fix project loading and container renaming 
CURA-3756
 2017-05-11 14:20:11 +02:00
Jaime van Kessel
c5371842c2 Merge branch 'fix_per_model_settings_single_extrusion' of https://github.com/fieldOfView/Cura 2017-05-11 13:25:22 +02:00
Ghostkeeper
078fd16109
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 10:29:42 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature 2017-05-11 09:53:50 +02:00
Lipu Fei
9060bbf3b2 Update extruderCount when extrudersModel got changed 
CURA-3755

The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
 2017-05-11 09:47:37 +02:00
Mark
04611b06af Fix two spelling errors 
TRI-1450
 2017-05-10 20:14:03 +02:00
fieldOfView
93c5b382ba Fix selecting settings for Per Model Settings with single extrusion printers 2017-05-10 17:37:35 +02:00
Ghostkeeper
e187b96455
Add period after sentence 
Contributes to issue CURA-3742.
 2017-05-10 17:15:47 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jack Ha
d9f0e1fd4b WIP project loading - at least it mostly works again. CURA-3756 2017-05-10 15:37:22 +02:00
Lipu Fei
77864f4237 WIP: Fix definition_changes handling in 3mf reader 
CURA-3756
 2017-05-10 13:07:45 +02:00
Lipu Fei
577fc0f082 Fix WorkspaceDialog to include resolve for definition_changes 
CURA-3756
 2017-05-10 13:07:45 +02:00
Jack Ha
b688178a2e Fix one part of project load - update existing. CURA-3756 2017-05-10 10:56:19 +02:00
Jaime van Kessel
82d38490c4 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 09:50:02 +02:00
Jaime van Kessel
316f2bbdb5 Fixed switching g-code flavors with machineAction 2017-05-10 09:49:33 +02:00
Lipu Fei
c60fefc927 Add non-existing instance containers when opening a project file 
CURA-3756
 2017-05-09 14:58:18 +02:00
Lipu Fei
acde348c6d Use ConfigParser hack to replace connect_signals=False hack 
CURA-3756
 2017-05-09 13:07:42 +02:00
Jack Ha
0d76ce72b0 Add comments CURA-3756 2017-05-09 13:07:42 +02:00
Lipu Fei
711b493ebf Fix code style 2017-05-09 13:07:42 +02:00
Lipu Fei
3e6d4b9230 document why no signals connecting in project file pre-read 
CURA-3756
 2017-05-09 13:07:41 +02:00
Lipu Fei
9c747733c4 Project Reader: Use ".<ext>" for profile type detection 
CURA-3756
 2017-05-09 13:07:41 +02:00
Ghostkeeper
61f7b6aa68 Add spaces around binary operator 
According to our code style.

Contributes to issue CURA-3756.
 2017-05-09 13:07:41 +02:00
Lipu Fei
53141303d2 WIP: Fix project loading 
CURA-3756
 2017-05-09 13:07:41 +02:00
Jaime van Kessel
7632b9df79 Removed unused connection 2017-05-09 10:27:50 +02:00
Jaime van Kessel
bb0d534f4a Revert "Set machine_extruder_count in sync with defined extruders" 
This reverts commit b69f337ddb50bb8e5dc39107f75d4112b14527d1.
 2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336 Revert "Starting machineSettingAction no longer resets extruder count to 1" 
This reverts commit 452a6a095c0866a080e19d89a71e1857e011456f.
 2017-05-08 15:30:39 +02:00
Jaime van Kessel
bd25448021 Changes to make um2 upgrade work with new stack changes 
CURA-3742
 2017-05-08 15:03:39 +02:00
Jaime van Kessel
293f1ac029 Merge branch 'feature_um2_olsson' of https://github.com/fieldOfView/Cura 2017-05-08 14:35:37 +02:00
Jaime van Kessel
452a6a095c Starting machineSettingAction no longer resets extruder count to 1 2017-05-08 14:25:13 +02:00
Jaime van Kessel
8efbbbb3f3 Merge pull request #1809 from fieldOfView/fix_multiextruder_machinesettings 
Fix multiextruder machinesettings
 2017-05-08 14:08:01 +02:00
Ghostkeeper
a9813146c4
Evaluate global stack first 
The global stack has 99% of all settings. So most of the times the setting definition we are looking for is here. This should make it a bit faster to find.

Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00