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

7710 Commits

Author SHA1 Message Date
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
Ghostkeeper
f302e06654
Reslice when per-object extruder changes 
Not when you activate the dropdown but it doesn't change though.

Contributes to issue CURA-340.
 2016-06-10 14:24:21 +02:00
Ghostkeeper
df1ca39c7b
Fix getting proper container stack in decorator 
Using the filter function now but the resulting list wasn't properly accounted for.

Contributes to issue CURA-340.
 2016-06-10 14:24:21 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Jaime van Kessel
179b6eeaac Fixed issue where not having a machine caused extruder retrieval to fail 
CURA-1689
 2016-06-10 13:16:54 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
Jaime van Kessel
9672b3360c Changing settings in extruder stack now also triggers reslice 
CURA-1689
 2016-06-10 12:26:11 +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
fieldOfView
2287c2daa6 Show that a value is being calculated instead of showing "QVariant..." 
CURA-1668
 2016-06-09 21:40:53 +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
Ghostkeeper
9e86cd5c85
Fix call to findContainerStack[s] 
Was a typo. Now it also checks if the stack ID is correct here. Not because it went wrong, but for defensive programming.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +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
Ghostkeeper
3206650f39
Fix signal, repair per-object settings 
This was the wrong type of signal, which gave an error.

Contributes to issue CURA-340.
 2016-06-09 17:05:21 +02:00
Ghostkeeper
9f3752276f
Fix check if machine's extruders are processed 
Luckily this did never occur anyway since the rest of the code was sound.

Contributes to issue CURA-340.
 2016-06-09 17:05:21 +02:00
Ghostkeeper
9d618282ed
Save default material colour statically 
So if you wish to change that colour, you only need to change it in one place.

Contributes to issue CURA-340.
 2016-06-09 17:01:21 +02:00
Jaime van Kessel
e793ce1a2c Use ID instead of definition 2016-06-09 16:57:40 +02:00
fieldOfView
d31153cdbb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 16:55:17 +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
Jaime van Kessel
1db74b00fd Merge branch 'feature_send_extruder_settings' of github.com:Ultimaker/Cura 2016-06-09 16:41:22 +02:00
Ghostkeeper
bd76c3e30f
Add drop-down in per-object settings to select extruder 
Actually selecting an extruder has no effect because there are dragons in that area and I need better armour with bonus damage against bugs before I venture in there.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 15:47:06 +02:00
Tim Kuipers
12a7b99cf7 fix: merge b3cfa62 went wrong, no slicing happened (CURA-1558) 2016-06-09 15:43:18 +02:00
Simon Edwards
97d64a0749 Move ProfileReader and ProfileWriter over to Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-09 14:14:49 +02:00
Simon Edwards
c03588c6e5 Profile export now goes via the plugin system, and does the same filename checks as before. 
Contributed to CURA-1667 Profile import/export
 2016-06-09 14:14:48 +02:00
Arjen Hiemstra
d57e2b2e22 Add an ID role and addGlobal property to ExtrudersModel 
Contributes to CURA-340
 2016-06-09 13:47:34 +02:00
Arjen Hiemstra
627d5e3c0d Merge branch 'master' of github.com:ultimaker/Cura 
* 'master' of github.com:ultimaker/Cura:
  Determine readonly state from location in filesystem instead of a metadata property
  Change focus upon extruder switch
  Fix extruder number attached to extruders
  Fix duplicating the first item on the Profiles page
  Fix spelling
  Document setActiveExtruderIndex
  Inheritance button now works if instance containers contain functions
  JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560)
  feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally for fdmextruder settings (CURA-1558)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally (CURA-1558)
 2016-06-09 13:31:08 +02:00
Arjen Hiemstra
8729dce531 Store the actual extruder stack in ExtruderManager instead of just the ID 
Contributes to CURA-340
 2016-06-09 13:30:17 +02:00
fieldOfView
f498f0237c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 13:16:38 +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
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
Jaime van Kessel
8ebc75e09a Merge branch 'master' of github.com:Ultimaker/Cura into feature_send_extruder_settings 2016-06-09 13:05:50 +02:00
Jaime van Kessel
d93044a338 Added setting sending per extruder 
CURA-1681
 2016-06-09 13:04:07 +02:00
Ghostkeeper
4bdd5713f1
Fix extruder number attached to extruders 
It reads that from position in the extruder definition file.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-09 11:48:37 +02:00
Ghostkeeper
14b9294a39
Document setActiveExtruderIndex 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 10:45:48 +02:00
fieldOfView
a6dd9e7415 Fix initialization of ContainerSettingsModel 
CURA-1668
 2016-06-09 08:14:06 +02:00
fieldOfView
b85a8ca404 Update ContainerSettingsModel when its containers have property changes 
CURA-1668
 2016-06-09 07:54:13 +02:00
Ghostkeeper
4d418a7c1a
When switching active extruder, get the extruder train from definition id 
Not from extruder container stack ID.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +02:00
fieldOfView
485ae53660 Show quality profile and user profile settings side-by-side on Profiles manager 
Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model.

Towards CURA-1668
 2016-06-08 16:35:10 +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
Ghostkeeper
59c8a4e66d
Fix validation of extruder-type settings 
Based on how ints are validated, since the data is the same.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 14:16:13 +02:00
Ghostkeeper
0a34577fdb
Add documentation for createExtruderTrain 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 14:09:37 +02:00
Ghostkeeper
fffe9b3a94
Better naming for extruder slot 
The name of the extruder stack is now the same as the name for the extruder definition. The IDs are different though!

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 14:09:37 +02:00
Ghostkeeper
32f90ad867
Re-add per-extruder nozzles, materials, qualities 
Slightly more efficient and correct implementation.Contributes to issue CURA-340.
 2016-06-08 14:09:36 +02:00
Ghostkeeper
f6ece126c3
Don't re-create user profile if one is loaded from files 
The user profiles are also saved because they are added to the container registry. So if one exists for this extruder, don't create a new blank name, but use the pre-loaded one which contained the user settings the user had before he closed down Cura previously.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 14:09:36 +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
Tim Kuipers
56b00ad425 JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560) 
removed:settable_globally: true
settable_per_meshgroup: true
settable_per_extruder: true when settable_per_mesh was also true
 2016-06-08 11:54:25 +02:00