Commit graph

4854 commits

Author SHA1 Message Date
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
2018-03-06 16:08:50 +01:00
Aleksei S
6bb42da056 Removed related commits to Settins per Object validation and
added short validation in StartScliceJob
CURA-4972
2018-03-06 15:40:26 +01:00
Lipu Fei
fb798ab7e5 Small refactor in MachineManager and add more loggings
CURA-4606

 - Added more info loggings
 - Changed some variant names
 - Use some shortcut variables instead of getInstance()s
2018-03-06 15:30:39 +01:00
Lipu Fei
cb7677347d Fix material model update upon variant change
CURA-5052
2018-03-06 15:27:05 +01:00
Jack Ha
8ebd778224 CURA-4400 force update all settings if something changed with the extruder 2018-03-06 11:48:22 +01: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
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
Jack Ha
00a173b1bf CURA-4400 when enabling / disabling extruder, remove user changes that are no longer enabled 2018-03-06 09:55:43 +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
fieldOfView
6c1aee2c47 Update copyright 2018-03-05 23:55:23 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +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
Jack Ha
7fd0a9b98b CURA-4400 fixed multiply 2018-03-05 17:01:53 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +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
Jack Ha
01f4e7c0e3 CURA-4400 on load mesh, set the extruder to the default extruder 2018-03-05 16:31:49 +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
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
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
Jack Ha
b0801d40e3 CURA-4400 added metadata entry for enabled instead of internal variable 2018-03-05 12:47:32 +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
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
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
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
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
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
Lipu Fei
51fadc9868 Remove unnecessary _onMaterialsUpdated() 2018-03-03 15:53:46 +01:00
Lipu Fei
632be11323 Remove "#NEW"s 2018-03-03 15:51:51 +01:00
Lipu Fei
a2c2282b44 Use context to evaluate materialDiameter 2018-03-03 15:50:33 +01:00
Lipu Fei
7216641fad Update doc for _fixMaterialDiameterAndNozzleSize() 2018-03-03 15:44:28 +01:00
Lipu Fei
a09bf7faa6 Move comments for _fixMaterialDiameterAndNozzleSize() 2018-03-03 15:31:59 +01:00
Lipu Fei
6db26eaca5 Add getDefaultMaterial() in MaterialManager 2018-03-03 15:29:49 +01:00