GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 17:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,259 Commits 290 Branches 260 Tags
Commit Graph

692 Commits

Author SHA1 Message Date
Ghostkeeper
e308c69c54 Merge pull request #804 from thopiekar/master-eclipse-markers 
Adding a marker for a correctly unresolved import on Linux and OSX
 2016-06-16 11:07:27 +02:00
Aldo Hoeben
3d53bc38b7 Merge pull request #803 from thopiekar/master-CURA-1615 
[CURA-1615] Updating firmware manager for API 3
 2016-06-15 17:49:20 +02:00
Thomas Karl Pietrowski
7ef64cd05b Return an empty string just to be sure 2016-06-15 17:43:28 +02:00
Thomas Karl Pietrowski
6b41608db2 Correcting the last comment.. 2016-06-15 17:33:52 +02:00
Thomas Karl Pietrowski
51222325b0 Last cleanup 
Removing useless comments and replacing the log message with something
more simple.
 2016-06-15 17:29:49 +02:00
Thomas Karl Pietrowski
77961e83c2 Adding a marker for a correctly unresolved import on Linux and OSX 2016-06-15 15:05:36 +02:00
Thomas Karl Pietrowski
536e0f489a Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform 2016-06-15 14:59:34 +02:00
Thomas Karl Pietrowski
2e7db9b732 Adding check whether getGlobalContainerStack() returns None or not. 
If we get None here, the firmware-updater will be closed and detailed
error returned to the logs with an explanation why.
 2016-06-15 14:38:23 +02:00
Thomas Karl Pietrowski
a7fc3258a7 Only use Application.[...].getGlobalContainerStack() to get all values 2016-06-15 11:16:13 +02:00
Thomas Karl Pietrowski
5128ea41c4 Getting "machine_heated_bed" (hopefully) correctly + little fix 2016-06-15 10:57:58 +02:00
Thomas Karl Pietrowski
9e6f5a4a68 CURA-1615 - Updating for API 3 
This updates the firmware updater to use the new MachineManagerModel

Additionally renamed "machine_type" to "machine_id", which makes it more
selfexplaining, when reading the code.

My printers firmware is not available here and has no heated bed, so
please test this commit!
 2016-06-15 10:04:47 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
 2016-06-13 18:23:53 +02:00
fieldOfView
213e20bf4b Enable per object settings for objects inside a group 
CURA-1054
 2016-06-13 16:55:10 +02:00
fieldOfView
33c4e86163 Change abbreviation of "seconds" to IEEE-recommended "s" (instead of "sec") 2016-06-13 16:14:16 +02:00
Thomas Karl Pietrowski
3df124e3cf CuraEngineBackend: Removing duplicate close() 
close() is already defined in this class. This removes the useless code.
 2016-06-12 12:46:19 +02:00
Thomas Karl Pietrowski
6d43ec700d CuraEngineBackend: Using Platform.isWindows() 2016-06-12 11:02:15 +02:00
Ghostkeeper
d89c9d8827
Make getSelectedActiveExtruder return its misbegotten gains 
It was getting a value from the decorator, then keeping it to itself all greedy like. It must return what it found.

Contributes to issue CURA-340.
 2016-06-10 17:04:26 +02:00
Ghostkeeper
204bf4d7dd
Update visibility of extruder dropdown on change 
It currently only works when switching to a dual-extrusion printer, since the model is not updated when switching away to a non-dual-extrusion printer...

Contributes to issue CURA-340.
 2016-06-10 17:04:26 +02:00
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