3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -129,6 +129,10 @@ class CuraApplication(QtApplication):
continue
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)
# \sa PluginRegistery

1
plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py
View file

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

3
plugins/LayerView/LayerView.py
View file

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

1
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

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

1
plugins/USBPrinting/USBPrinterManager.py
View file

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

1
resources/machines/fdmprinter.json
View file

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

1
resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
View file

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

1
resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
View file

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

1
resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
View file

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

1
resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
View file

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

1
resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
View file

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

1
resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
View file

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

1
resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
View file

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

2
resources/qml/Cura.qml
View file

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