Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
Tim Kuipers 2016-02-29 16:40:11 +01:00
commit 36f8bb5553
14 changed files with 8 additions and 12 deletions

View File

@ -129,6 +129,10 @@ class CuraApplication(QtApplication):
continue continue
self._recent_files.append(QUrl.fromLocalFile(f)) self._recent_files.append(QUrl.fromLocalFile(f))
@pyqtSlot(result = QUrl)
def getDefaultSavePath(self):
return QUrl.fromLocalFile(os.path.expanduser("~/"))
## Handle loading of all plugin types (and the backend explicitly) ## Handle loading of all plugin types (and the backend explicitly)
# \sa PluginRegistery # \sa PluginRegistery

View File

@ -151,6 +151,7 @@ class ProcessSlicedObjectListJob(Job):
if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView": if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView":
if not self._progress: if not self._progress:
self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0) self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0)
if self._progress.getProgress() != 100:
self._progress.show() self._progress.show()
else: else:
if self._progress: if self._progress:

View File

@ -158,8 +158,7 @@ class LayerView(View):
else: else:
self.setLayer(int(self._max_layers)) self.setLayer(int(self._max_layers))
self.maxLayersChanged.emit() self.maxLayersChanged.emit()
self._top_layer_timer.start()
self._top_layer_timer.start()
maxLayersChanged = Signal() maxLayersChanged = Signal()
currentLayerNumChanged = Signal() currentLayerNumChanged = Signal()

View File

@ -89,7 +89,6 @@ Item {
Button Button
{ {
id: customise_settings_button; id: customise_settings_button;
anchors.right: profileSelection.right;
height: UM.Theme.getSize("setting").height; height: UM.Theme.getSize("setting").height;
visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1 visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1

View File

@ -106,6 +106,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
try: try:
self._printer_connections[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName())) self._printer_connections[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName()))
except FileNotFoundError: except FileNotFoundError:
self._printer_connections[printer_connection].setProgress(100, 100)
Logger.log("w", "No firmware found for printer %s", printer_connection) Logger.log("w", "No firmware found for printer %s", printer_connection)
continue continue

View File

@ -588,7 +588,6 @@
"default": 10, "default": 10,
"min_value": "0", "min_value": "0",
"max_value_warning": "100", "max_value_warning": "100",
"inherit_function": "10 if infill_sparse_density < 95 else 0",
"visible": false "visible": false
}, },
"infill_wipe_dist": { "infill_wipe_dist": {

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 22 infill_sparse_density = 22
infill_overlap = 0.022
infill_wipe_dist = 0.1 infill_wipe_dist = 0.1
retraction_amount = 6 retraction_amount = 6
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 18 infill_sparse_density = 18
infill_overlap = 0.035
infill_wipe_dist = 0.2 infill_wipe_dist = 0.2
retraction_amount = 5.5 retraction_amount = 5.5
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 22 infill_sparse_density = 22
infill_overlap = 0.035
infill_wipe_dist = 0.2 infill_wipe_dist = 0.2
retraction_amount = 5.5 retraction_amount = 5.5
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 20 infill_sparse_density = 20
infill_overlap = 0.035
infill_wipe_dist = 0.2 infill_wipe_dist = 0.2
retraction_amount = 5.5 retraction_amount = 5.5
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 25 infill_sparse_density = 25
infill_overlap = 0.035
infill_wipe_dist = 0.2 infill_wipe_dist = 0.2
retraction_amount = 5.5 retraction_amount = 5.5
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 20 infill_sparse_density = 20
infill_overlap = 0.053
infill_wipe_dist = 0.3 infill_wipe_dist = 0.3
retraction_amount = 6 retraction_amount = 6
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines top_bottom_pattern = lines
infill_sparse_density = 20 infill_sparse_density = 20
infill_overlap = 0.07
infill_wipe_dist = 0.4 infill_wipe_dist = 0.4
retraction_amount = 6 retraction_amount = 6
retraction_min_travel = 0.5 retraction_min_travel = 0.5

View File

@ -667,7 +667,7 @@ UM.MainWindow
//TODO: Support multiple file selection, workaround bug in KDE file dialog //TODO: Support multiple file selection, workaround bug in KDE file dialog
//selectMultiple: true //selectMultiple: true
nameFilters: UM.MeshFileHandler.supportedReadFileTypes; nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
folder: Printer.getDefaultSavePath()
onAccepted: onAccepted:
{ {
//Because several implementations of the file dialog only update the folder //Because several implementations of the file dialog only update the folder