3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
17030 commits 302 branches 270 tags 773 MiB
Commit graph

1652 commits

Author SHA1 Message Date
Jaime van Kessel
94c4366194 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 17:55:13 +01:00
Jaime van Kessel
854755277c Fix styling of comments 
Because sentences should start with capitals
 2018-11-27 14:37:01 +01:00
Jaime van Kessel
3ad1802ab6 Prevent a KeyError from messing 
CURA-5978
 2018-11-27 14:34:29 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb Merge branch 'master' into ui_rework_4_0 2018-11-27 11:12:48 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders 
CURA-5978
 2018-11-27 08:45:45 +01:00
Diego Prado Gesto
692868a0b4 Create a function that given a printer type name, it will return and 
abbreviated name.

Contributes to CURA-5942.
 2018-11-22 15:45:38 +01:00
Diego Prado Gesto
20285f26d6 Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-20 11:20:26 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly 
CURA-5785
 2018-11-16 16:04:11 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Jaime van Kessel
401a6b5f8b
Merge pull request #4794 from fieldOfView/fix_adhesion_type_error 
Fix adhesion type error during startup
 2018-11-16 11:24:29 +01:00
fieldOfView
b671a3153a Catch an error getting an extruder value before extruders are added to the global stack 2018-11-14 14:21:39 +01:00
Ghostkeeper
6d1b64465a
Fix URL in error message 
Contributes to issue CURA-5929.
 2018-11-12 12:50:18 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues 
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
 2018-11-12 12:48:49 +01:00
Ghostkeeper
9c555bf67f
Add typing and always add error message if loading failed 
There were some places where it would return None. Then in the QML it would give a QML error that the null object has no dictionary items.

Contributes to issue CURA-5929.
 2018-11-12 11:02:43 +01:00
Jaime van Kessel
2c7bdba7d0 Update ConfigurationSelector header to that it looks more like the new design 
CURA-5785
 2018-11-09 15:23:10 +01:00
Lipu Fei
0e1e8d269a Fix the extra setNextStack() 2018-10-25 13:40:34 +02:00
Lipu Fei
5e8dba5266 Remove some duplicate addExtruder() and setNextStack() calls 2018-10-25 11:42:47 +02:00
Remco Burema
3dab627670
Merge pull request #4618 from Ultimaker/CURA-5834_fix_material_model_update 
CURA-5834 Fix material model update
 2018-10-23 14:54:34 +02:00
Diego Prado Gesto
94ef0b92fe Fix typo in the getCompatibleMaterialDiameter function. 
Contributes to CURA-5834.
 2018-10-23 10:25:13 +02:00
Lipu Fei
89cb67017f Add unit test for addDefaultMachineActions() 
CURA-5812
 2018-10-23 08:49:23 +02:00
Lipu Fei
cbd8c8739d Merge from master 2018-10-23 08:08:37 +02:00
Lipu Fei
eef7be3ed6 Use empty string for empty build plate 
CURA-5844

Or there can be a configuration mismatch.
 2018-10-22 11:54:13 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Lipu Fei
ea10d5e608 Rename to comptabileMaterialDiameter 
CURA-5834

This property returns the material diameter an extruder is compatible
with, so this makes it more clear.
 2018-10-19 11:36:12 +02:00
Lipu Fei
59704e4c0e Make sure that a machine's default actions are added before it gets activated 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Ghostkeeper
db0da61506
Forbid interpolation in setting visibility preset files 
We might use characters that collide with this.

Contributes to issue CURA-5734.
 2018-10-18 14:54:20 +02:00
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Jaime van Kessel
d086e6fa86 Fix review comments 
CURA-5734
 2018-10-17 10:47:34 +02:00
Jaime van Kessel
6eb8b75490 Update typing and fixed the bug it exposes. 2018-10-16 11:31:33 +02:00
Ghostkeeper
7c6970bec3
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-11 16:42:11 +02:00
Ghostkeeper
4c6744b6fc
Code style: Space around binary operators 
I just looked for lines with interpolation = None because I was looking for another possible bug, but fixing this in the meanwhile too.
 2018-10-10 14:28:50 +02:00
Ghostkeeper
b37252f124
Minor code style fixes 
Contributes to issue CURA-5734.
 2018-10-10 14:18:37 +02:00
Jaime van Kessel
937c2dfa8c Merge branch 'WIP_kill_extruder_manager' of github.com:Ultimaker/Cura 2018-10-09 11:05:21 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +02:00
Lipu Fei
7d7de32dbd Add ExtruderStack to GlobalStack in single extrusion machine fix 2018-10-03 16:53:07 +02:00
Lipu Fei
18cb21186c Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 2018-10-03 15:45:18 +02:00
fieldOfView
c4919d65f4 Merge branch 'master' into feature_firmware_updater 2018-10-03 14:02:24 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Lipu Fei
b97f4ea30c Merge remote-tracking branch 'origin/3.5' 2018-10-03 11:49:38 +02:00
Lipu Fei
c3e7e426ff Fix getDefaultVariantNode for UM2 
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
 2018-10-03 11:24:27 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Jaime van Kessel
4def636fc9 Minor codecleanup (Typing & removing unused imports) 
CURA-5734
 2018-10-01 14:54:08 +02:00
Jaime van Kessel
edb5de9954 Added unit test for settingvisibility presets 
CURA-5734
 2018-10-01 14:50:53 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +02:00
Lipu Fei
f69005fef9 Rename to CuraFormulaFunctions 
to avoid confusion with "SettingFunction" in Uranium.
 2018-10-01 11:24:34 +02:00
fieldOfView
09742f0cf5 Simplify code 2018-09-28 13:09:59 +02:00
fieldOfView
a12c0e8d9e Remove superfluous import 2018-09-28 11:51:33 +02:00
fieldOfView
bc52830c89 Move getDefaultFirmwareName() into GlobalStack 2018-09-28 11:49:00 +02:00