Commit graph

17030 commits

Author SHA1 Message Date
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading
CURA-5056
2018-03-07 16:38:24 +01:00
Lipu Fei
77e3be68b3 Add removeMaterialByRootId() in MaterialManager
CURA-5056
2018-03-07 16:38:24 +01:00
Lipu Fei
29792bbdd8 Reschedule update upon incomplete data in MaterialManager
CURA-5056
2018-03-07 16:38:24 +01:00
Ian Paschal
a704f59034
Merge pull request #3175 from smartavionics/mb-add-bridge-settings
Add bridge settings to experimental category.
2018-03-07 16:30:08 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output
model so it can be used to show the buildplate name in the configuration
list.
2018-03-07 13:57:13 +01:00
Diego Prado Gesto
0beee79c3a CURA-4870 Revert skipping stack checks 2018-03-07 13:17:55 +01:00
Jack Ha
859ac88357 Merge branch 'master' into feature_enable_disable_extruder 2018-03-07 12:59:40 +01:00
Diego Prado Gesto
7b772ffad7 Merge branch 'master' into feature_sync_button 2018-03-07 11:49:25 +01:00
Lipu Fei
27cce56467 Add error message for possible bugs in MaterialManager
CURA-5056
2018-03-07 11:45:49 +01:00
Lipu Fei
c0d55ac2a8 Postpone signals in project loading to avoid incomplete data update
CURA-5056
2018-03-07 11:45:49 +01:00
Jack Ha
ff1c378c08 CURA-4400 fix start slicing when disabled extruder is incompatible 2018-03-07 11:38:35 +01:00
Aleksei S
23653d7357 Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page
CURA-4960
2018-03-07 11:34:10 +01:00
Ghostkeeper
507de9c22c
Catch timeout exceptions when printing via USB
If the firmware froze or something...
2018-03-07 11:30:36 +01:00
Jack Ha
4568fab531 CURA-4400 fix quality profiles model to not use disabled extruder and update Not Supported or select a valid quality when enabling/disabling extruder 2018-03-07 11:27:23 +01:00
Diego Prado Gesto
6abbe7381a CURA-4870 Adjust a little bit the maximum size so three printers of two
different types can fit
2018-03-07 11:26:50 +01:00
Diego Prado Gesto
bb3d706c92 CURA-4870 Adapt the size of the sync dropdown to the height of the
contents or a maximum size defined manually.
Create sections in the list view depending on the machine types that are
in the group.
2018-03-07 11:24:02 +01:00
Ghostkeeper
ecfb62b69e
Rename ColorChange to FilamentChange
I think this is more clear to the users what this should actually do.
2018-03-07 11:01:00 +01:00
Lipu Fei
6cae5c2e35 Remove unnecessary signal connection in MaterialsModel
CURA-5052
2018-03-07 10:39:23 +01:00
Diego Prado Gesto
813f4e83e0 CURA-4870 Adjust colors for the selected configuration
Remove the printer icon since it doesn't look as expected
2018-03-07 09:56:38 +01:00
Jack Ha
bab46d7048 CURA-4400 only reevaluate non printing mesh if the setting actually matters 2018-03-06 17:19:31 +01:00
Lipu Fei
75d9297c7d Optimize 3MF writer and XML material serialization
CURA-5049
2018-03-06 17:05:58 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Ian Paschal
5b2ff705e7 CURA-4870 Add menu icons 2018-03-06 17:03:44 +01:00
Jack Ha
ab49bd9016 Merge branch 'feature_enable_disable_extruder' of github.com:Ultimaker/Cura into feature_enable_disable_extruder 2018-03-06 17:02:07 +01:00
Jack Ha
095d9fbdf6 CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 17:01:30 +01:00
Diego Prado Gesto
987794c515 CURA-4870 Update the Sync Button accordingly to changes both in the
output device or in the current configuration, in order to check wether
a configuration matches or not.
2018-03-06 16:59:51 +01:00
Jack Ha
92e80fa26a CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 16:28:40 +01:00
Jack Ha
63e679e4a0 CURA-4400 updated UM3 machine_head_with_fans_polygon 2018-03-06 16:28:00 +01:00
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
Ghostkeeper
3b0a9bf16c
Fix checking whether to render objects in X-ray pass
Otherwise nothing gets drawn there.

Contributes to issue CURA-5040.
2018-03-06 15:53:34 +01:00
Ghostkeeper
b179edf60e
Document which layer is which pass
Contributes to issue CURA-5040.
2018-03-06 15:53:34 +01:00
Lipu Fei
eb84e6aa3e Disable not supported custom profiles
CURA-5051
2018-03-06 15:47:49 +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
Lipu Fei
31b7374689 Fix material settings saving upon dialog close
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
2018-03-06 13:40:32 +01:00
Tim Kuipers
5950d147ac
Update ISSUE_TEMPLATE.md
More focus on printer and attaching project file
2018-03-06 13:20:15 +01:00
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
Jack Ha
8ebd778224 CURA-4400 force update all settings if something changed with the extruder 2018-03-06 11:48:22 +01:00
Mark Burton
1ed5a00198 Added skin densities and layer 3 settings + tweaked various defaults. 2018-03-06 10:47:28 +00:00
fieldOfView
0578e74e71 Merge branch 'master' into feature_xmlmaterials_cura_settings
# Conflicts:
#	plugins/XmlMaterialProfile/XmlMaterialProfile.py
2018-03-06 11:40:58 +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
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