Thomas Karl Pietrowski
7043a04e22
Merge remote-tracking branch 'Ultimaker/master' into master-layerview-use-resetLayerData
2016-06-10 14:05:45 +02:00
Thomas Karl Pietrowski
c0472e0068
LayerView: Using resetLayerData()
...
Currently resetLayerData() is not used at all, but found in two places
the same code like found in resetLayerData().
So replaced them with resetLayerData().
2016-06-10 13:57:52 +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
Ghostkeeper
598ff1e398
Fix changing active extruder from per-object drop-down
...
Apparently this is the way you do it.
Contributes to issue CURA-340.
2016-06-09 19:06:17 +02:00
Ghostkeeper
f5f711b7dc
On extruder switch create OverrideDecorator if needed
...
The SettingOverrideDecorator is only applied if the node has a per-object setting. Now it also creates a decorator also if you've ever switched the extruder, which was needed because the decorator contains the information which extruder to print with.
Contributes to issue CURA-340.
2016-06-09 19:06:17 +02:00
Ghostkeeper
beb263025b
Make ExtruderSelector invisible if there is no choice in extruders
...
It doesn't yet update well if you keep the panel open while switching machines.
Contributes to issue CURA-340.
2016-06-09 17:01:21 +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
Simon Edwards
b93137545f
Support for importing a profile.
...
Contributes to CURA-1667 Profile import/export
2016-06-09 14:14:50 +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
Jaime van Kessel
3df1bc4e62
Fixed minor issue in buildExtruderMessage
...
CURA-1681
2016-06-09 13:23:09 +02:00
Tim Kuipers
b3cfa62775
Merge branch 'feature_settings_restricted_to_settingsbases'
2016-06-09 13:11:30 +02:00
Jaime van Kessel
d93044a338
Added setting sending per extruder
...
CURA-1681
2016-06-09 13:04:07 +02:00
Tim Kuipers
b6649eab3a
dox: documented proto file (CURA-1681 CURA-1682)
2016-06-09 12:08:10 +02:00
Jaime van Kessel
a01b554ee3
Added extruder to proto message
...
CURA-1681
2016-06-09 11:56:41 +02:00
Jaime van Kessel
899e4cc175
Fixed sending of per-object settings to engine
...
CURA-1681
2016-06-09 11:46:52 +02:00
Jaime van Kessel
123c2f5c85
Moved global settings into slice message (as per API changes)
...
CURA-1681
2016-06-09 11:33:15 +02:00
Tim Kuipers
ce9d8b6dd0
proto file typo fix (CURA-1681 CURA-1682)
2016-06-09 10:48:44 +02:00
Jaime van Kessel
20f657af88
Updated proto file
...
Objects & global settings are now sent in one message.
Also added support for extruder settings
CURA-1681
2016-06-09 10:40:28 +02:00
Tim Kuipers
21ad4713a7
Merge branch '2.1'
2016-06-08 15:35:45 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name
2016-06-08 11:29:24 +02:00
Tim Kuipers
2e2437d163
feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560)
2016-06-08 10:50:40 +02:00
Jaime van Kessel
9a14a3e8b7
Per object settings no longer watches "state" property
...
CURA-1278
2016-06-07 15:46:37 +02:00
Arjen Hiemstra
ca1b199c7e
Fix PerObjectSettings to use the right objects when instantiating setting items
...
Contributes to CURA-1592
2016-06-07 13:19:37 +02:00
Ghostkeeper
c50d0a97da
Load extruder combobox synchronously
...
Asynchronously causes Qt 5.4 to give a segfault.
Contributes to issues CURA-351 and CURA-1278.
2016-06-05 16:18:07 +02:00
Arjen Hiemstra
a81cab5eac
Merge branch '2.1'
2016-06-04 19:11:59 +02:00
Jaime van Kessel
95a0c69662
Bit of code refactoring to prevent duplication
...
CURA-1288
2016-06-02 17:25:34 +02:00
Jaime van Kessel
1ae69b25fa
Added documentation
2016-06-02 16:07:09 +02:00
Jaime van Kessel
2ed518c47e
Removed no longer used code
...
CURA-1278
2016-06-02 16:02:47 +02:00
Jaime van Kessel
edd5eecc3d
Per object settings no longer show depth identation, revert/inherit buttons
...
CURA-1278
2016-06-02 15:53:00 +02:00
Jaime van Kessel
c994cb6bef
Slicing no longer occurs when a perObject setting is in error state
...
CURA-1288
2016-06-02 14:19:39 +02:00
Jaime van Kessel
ca218d7a1f
Removed too generic exception handling
...
CURA-1278
2016-06-02 13:52:11 +02:00
Jaime van Kessel
1af6e63b35
Removed unused model
2016-06-02 13:41:46 +02:00
Arjen Hiemstra
070e791b94
Add a preference to change LayerView top layers between 1 and 5
...
Fixes CURA-1643
2016-06-02 11:23:18 +02:00
Arjen Hiemstra
5873f1d4d0
Limit layer processing to 99% to indicate more stuff needs to happen
...
Fixes CURA-1644
2016-06-02 11:22:39 +02:00
Arjen Hiemstra
eaea940aa2
Add support for some additional properties to XmlMaterialProfile
...
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
90ac1c1380
Add support for hotend-specfic overrides to XmlMaterialProfile
...
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
f491405eb1
Use a copy of the metadata for Xml materials
...
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
e0fab7aa11
Add some logging and documentation to XmlMaterialProfile
...
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
49e5b1938a
Reduce number of top layer to increase processing speed
2016-06-01 15:45:54 +02:00
Jaime van Kessel
29ed8c2f5b
Increased width of per-object settings panel
...
CURA-1278
2016-05-31 11:33:02 +02:00
Jaime van Kessel
152f362562
Hide button is now in correct location
...
CURA-1278
2016-05-31 11:12:22 +02:00
Jaime van Kessel
72d7bd5769
Added hide button to per object settings
...
CURA-1278
2016-05-31 11:06:26 +02:00
Jaime van Kessel
5289d5b4ac
Codestyle
...
CURA-1278
2016-05-31 11:02:22 +02:00
Ghostkeeper
7e33b76fe2
Increment version number
...
Contributes to issue CURA-1583.
2016-05-30 16:18:54 +02:00
Arjen Hiemstra
581b9ce11f
Update AutoSave plugin to work with the new settings API
...
Contributes to CURA-1615
2016-05-30 15:29:10 +02:00
Arjen Hiemstra
79892daa5e
Bump API version of plugins that do not need extra porting
...
Contributes to CURA-1615
2016-05-30 15:29:10 +02:00
Arjen Hiemstra
93873a2ce8
Also trigger a reslice when the containerstack's containers change
...
Contributes to CURA-1278
2016-05-30 14:02:51 +02:00
Arjen Hiemstra
8039184c18
Move setting error checking to StartSliceJob and allow the job to return a proper response
...
Now the job can determine if we can continue with slicing or not and if
not, why not.
This also means we can now show a message when we cannot find any
slicable objects.
Contributes to CURA-1278
2016-05-30 13:03:06 +02:00