13295 Commits

Author SHA1 Message Date
Tim Kuipers
f8c129f4c7
Update ISSUE_TEMPLATE.md
Allow for uploading curaproject files in github directly
2018-03-06 12:46:48 +01:00
Aleksei S
42ac725705 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-06 12:40:55 +01:00
Aleksei S
1f883f3312 Remove reply hanlder to prevent crash after canceling a printing job
CURA-4960
2018-03-06 12:39:54 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up
CURA-4606
2018-03-06 11:55:24 +01:00
Mark Burton
1ed5a00198 Added skin densities and layer 3 settings + tweaked various defaults. 2018-03-06 10:47:28 +00:00
Lipu Fei
27b3a71a98 Sort branded materials for dropdown menu
CURA-4606
2018-03-06 11:26:16 +01:00
ChrisTerBeke
96b40433a9 Merge branch 'master' into docker 2018-03-06 11:19:30 +01:00
Ian Paschal
8d5a643c9b Removed print() statement 2018-03-06 10:51:39 +01:00
Diego Prado Gesto
d11d850f7c CURA-4870 Add spacing to the list of configurations 2018-03-06 10:42:24 +01:00
Diego Prado Gesto
13e18c9d54 Merge branch 'master' into feature_sync_button 2018-03-06 10:24:11 +01:00
Diego Prado Gesto
731a1092c5 CURA-4870 Add callback function to apply remote configuration 2018-03-06 10:18:54 +01:00
Ghostkeeper
3e8f29d380
Allow floating point values for moving print head
The X, Y, Z coordinates and speed don't necessarily have to be full millimetres or millimetres per minute.

Fixes #3271.
2018-03-06 09:37:47 +01:00
Diego Prado Gesto
d02d845d1b CURA-4870 Update the selected configuration in the UI when the
configuration in the printer changes.
Modify again the hash function.
2018-03-06 09:24:42 +01:00
Diego Prado Gesto
d83eb383d9 CURA-4870 Fix an error in the hash function that detects a matching when
the extruders are inverted.
Add pretty output to the configuration model.
2018-03-06 08:44:43 +01:00
ChrisTerBeke
5a8f2040d3 Add method to machine manager to get a machine stack by definition id 2018-03-05 17:53:40 +01:00
Diego Prado Gesto
51686943e6 CURA-4870 Create an extruder configuration model to store the extruder configuration.
Connect the signals coming from the printer to correctly update the UI
2018-03-05 17:15:09 +01:00
Aleksei S
9901780dbc Merge branch 'master' of github.com:Ultimaker/cura 2018-03-05 16:45:42 +01:00
Aleksei S
a35d4ae400 Fix: After clicking "cancel" button while sending a print job
the connection is disconnected
CURA-4960
2018-03-05 16:43:58 +01:00
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
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
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