3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
9473 commits 340 branches 299 tags 734 MiB
Commit graph

2283 commits

Author SHA1 Message Date
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 b69f337ddb.
 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 452a6a095c.
 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
Ghostkeeper
281a01dd1f
Remove unused variable 
Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00
Ghostkeeper
2137c30bd6
Also check extruders for definitions of error settings 
Contributes to issue CURA-3772.
 2017-05-08 13:35:28 +02:00
fieldOfView
98b127851b Fix setting number of extruders when hasVariants is set 2017-05-08 12:54:12 +02:00
Lipu Fei
a3d92d557d GCodeProfileReader: make deserialization more robust 
CURA-3770
 2017-05-08 11:33:50 +02:00
Lipu Fei
3a5a28cc38 Use CuraStack.qualityChanges to get quality changes 
CURA-3770
 2017-05-08 11:33:50 +02:00
Ghostkeeper
e19d5411c2
Expand log message when getting no definition when listing error settings 
So that someone reading the log gets a clue where the error message occurs and why.

Contributes to issue CURA-3772.
 2017-05-08 11:17:37 +02:00
Jaime van Kessel
8ba0ee126e Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 10:31:10 +02:00
Jaime van Kessel
63eceda75e Added handling for if definition for error handling was not found 
CURA-3772
 2017-05-08 10:28:31 +02:00
Lipu Fei
a039f9552e Trigger extruderTabsCount update when MachineSettings dialog shows 
CURA-3755
 2017-05-08 09:47:42 +02:00
Ghostkeeper
6f0b81d046
Merge branch 'master' of https://github.com/rmcolbert/Cura into rmcolbert-master 2017-05-08 09:38:56 +02:00