13519 Commits

Author SHA1 Message Date
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
Diego Prado Gesto
a992487589 CURA-4870 Check wether the current configuration matches one of the unique configurations available on the printer output device.
Improve some elements in the UI
2018-03-05 14:39:49 +01:00
ChrisTerBeke
cd01b096b5 Emit backend errors so we can process them differently than through a qml notification 2018-03-05 14:33:13 +01:00
Jack Ha
37d02da1f1 CURA-4400 restore correct default extruder, added extruders_enabled_count and use that in fdmprinters (result: i.e. one at a time can be enabled by disabling an extruder) 2018-03-05 14:01:39 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager
CURA-4606
2018-03-05 13:36:13 +01:00
ChrisTerBeke
52735fb9a9 Merge branch 'docker' of https://github.com/Ultimaker/Cura into docker 2018-03-05 13:34:35 +01:00
Lipu Fei
91e3e6b50c
Merge pull request #3377 from Ultimaker/refactoring_machine_manager
CURA-4606 Refactoring MachineManager
2018-03-05 13:27:21 +01:00
Lipu Fei
6199e8e15a Fix merge conflicts with master 2018-03-05 13:27:00 +01:00
Ghostkeeper
32fedf9559
Obtain filament diameter from stack for length calculation
Otherwise we get it from the global stack which is always 2.85mm.

Fixes #3284.
2018-03-05 13:02:11 +01:00
Ghostkeeper
08f114ee6e
Don't make print estimates translateable
This was very very confusing for our translators. And all of the translators basically came down to the same translation: Leave it untranslated. So let's make it a bit easier on them and don't allow this to be translated.
If we really want the currency to be translated to the correct position, Qt has currency printing in its locale as an option too.
2018-03-05 13:02:11 +01:00
Jack Ha
b0801d40e3 CURA-4400 added metadata entry for enabled instead of internal variable 2018-03-05 12:47:32 +01:00
Diego Prado Gesto
f779a20a6e CURA-4870 Cleanup UI and add buildplate icon 2018-03-05 12:13:46 +01:00
Diego Prado Gesto
871f0a130e CURA-4870 Frontend formatting to show the configurations 2018-03-05 11:44:26 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Lipu Fei
072c85bacf Put authors back for 3rd party variants 2018-03-05 11:16:47 +01:00
Ian Paschal
1c7fdfd871 CURA-5032 Incorporated additional feedback 2018-03-05 11:13:38 +01:00
Lipu Fei
c99fca0890 Put adhesion_type back to imade3d profiles 2018-03-05 11:09:54 +01:00
Lipu Fei
6d97fd8dc2 Revert "WIP: Fix quality profiles for abax_pri3"
This reverts commit c338e1b7d69c252ae80d9590700823108a37f320.
2018-03-05 11:01:52 +01:00
Lipu Fei
eb5ce04229 Fix code style in materialspage 2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021 Fix code style in materialspage 2018-03-05 10:57:36 +01:00
Lipu Fei
6c42b662c8 Add doc for apply_to_all in XMLMaterialProfile 2018-03-05 10:54:01 +01:00
Aleksei S
6781627672 Fix: Flat model and reset all rotation did not work
CURA-5039
2018-03-05 10:42:09 +01:00
Lipu Fei
d79a9f6449 Add logging for quality settings model 2018-03-05 10:35:54 +01:00
Lipu Fei
f86c2a2f8a Add comments for quality settings model 2018-03-05 10:32:59 +01:00
Lipu Fei
2255dc628b Remove unnecessary comments 2018-03-05 10:31:04 +01:00
Lipu Fei
b4deb3e828 Better logging in quality profile model 2018-03-05 10:23:36 +01:00
Lipu Fei
1e467b66c0 Fix protected variable access 2018-03-05 10:22:11 +01:00
Mark
17920bcf87
Merge pull request #3207 from FABtotum/master
TPU FAbtotum's profiles
2018-03-05 09:54:21 +01:00
Diego Prado Gesto
b8ad0959a7 CURA-4870 Add call to the QObject constructor 2018-03-05 09:41:22 +01:00
Ghostkeeper
396ea274c4
Invert Y direction of nozzle offsets
If there is a Y offset it should now move the disallowed areas in the correct direction

The initial placement of the disallowed borders was already correct.

Fixes #1977.
2018-03-05 09:24:21 +01:00
Mark Burton
4a498fd622 Tweak various bridge setting values & descriptions. 2018-03-04 21:56:44 +00:00
Diego Prado Gesto
1ee5b44187 CURA-4870 Fix references to the extruder stacks 2018-03-04 18:20:42 +01:00
Diego Prado Gesto
22b1c2127f CURA-4870 Add information of the current configuration selected in the active printer 2018-03-04 18:13:27 +01:00
Diego Prado Gesto
49fcf35d9b CURA-4870 Prepare the UI to show the list of configurations 2018-03-04 17:26:37 +01:00
Diego Prado Gesto
6e35fc5035 CURA-4870 Modify printer menu visibility of the items. Show local or network submenu only when there is local or network printers respectively 2018-03-04 12:53:16 +01:00
Mark Burton
754e85815a Additional second bridge skin settings. 2018-03-04 09:00:41 +00:00
Diego Prado Gesto
dead2122dd CURA-4870 Add list of unique configurations to the output device. The printer output model calculates the configuration every time a change is received from the output device 2018-03-03 20:29:06 +01:00
Lipu Fei
6a14e39610 Remove outdated TODOs in ProfilesPage 2018-03-03 16:34:31 +01:00
Lipu Fei
730048d2b2 Simplify code in MaterialsPage.qml 2018-03-03 16:32:29 +01:00
Lipu Fei
86b75ae3b6 Remove outdated TODO 2018-03-03 16:29:31 +01:00
Lipu Fei
0e5aff84e9 Remove outdated comment in MaterialsPage.qml 2018-03-03 16:26:03 +01:00
Lipu Fei
575f38e63e Fix code style in MaterialView.qml 2018-03-03 16:25:09 +01:00
Lipu Fei
d24bc0b41b Fix code style in MaterialView.qml 2018-03-03 16:23:54 +01:00
Lipu Fei
2567642626 Remove outdated TODO 2018-03-03 16:13:35 +01:00
Lipu Fei
ca88e0df88 Add doc for calllater active machine in project loading 2018-03-03 16:12:33 +01:00
Lipu Fei
174bc7dbd7 Remove commented code in MachineManager 2018-03-03 16:04:30 +01:00
Lipu Fei
a220b55856 Simplify code in MachineManager 2018-03-03 16:01:59 +01:00
Lipu Fei
413e4ca55d Add doc for _setEmptyQuality() 2018-03-03 15:59:59 +01:00
Lipu Fei
bb04afa2ab Remove non-sense comments in MachineManager 2018-03-03 15:57:28 +01:00
Lipu Fei
89716acc11 Remove redundant code in MachineManager 2018-03-03 15:56:08 +01:00