GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 07:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/cura

Browse Source
This commit is contained in:
Aleksei S 2018-03-06 12:40:55 +01:00
commit 42ac725705
4 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Machines/Models/BrandMaterialsModel.py
View File

@ -120,12 +120,19 @@ class BrandMaterialsModel(ListModel):
material_type_item = {"name": material_type, material_type_item = {"name": material_type,
"colors": BaseMaterialsModel(self)} "colors": BaseMaterialsModel(self)}
material_type_item["colors"].clear() material_type_item["colors"].clear()
# Sort materials by name
material_list = sorted(material_list, key = lambda x: x["name"])
material_type_item["colors"].setItems(material_list) material_type_item["colors"].setItems(material_list)
material_type_item_list.append(material_type_item) material_type_item_list.append(material_type_item)
# Sort material type by name
material_type_item_list = sorted(material_type_item_list, key = lambda x: x["name"])
brand_item["materials"].setItems(material_type_item_list) brand_item["materials"].setItems(material_type_item_list)
brand_item_list.append(brand_item) brand_item_list.append(brand_item)
# Sort brand by name
brand_item_list = sorted(brand_item_list, key = lambda x: x["name"])
self.setItems(brand_item_list) self.setItems(brand_item_list)

20
cura/PrinterOutput/PrinterOutputModel.py
View File

@ -103,32 +103,32 @@ class PrinterOutputModel(QObject):
self._head_position = Vector(x, y, z) self._head_position = Vector(x, y, z)
self.headPositionChanged.emit() self.headPositionChanged.emit()
@pyqtProperty("long", "long", "long") @pyqtProperty(float, float, float)
@pyqtProperty("long", "long", "long", "long") @pyqtProperty(float, float, float, float)
def setHeadPosition(self, x, y, z, speed = 3000): def setHeadPosition(self, x, y, z, speed = 3000):
self.updateHeadPosition(x, y, z) self.updateHeadPosition(x, y, z)
self._controller.setHeadPosition(self, x, y, z, speed) self._controller.setHeadPosition(self, x, y, z, speed)
@pyqtProperty("long") @pyqtProperty(float)
@pyqtProperty("long", "long") @pyqtProperty(float, float)
def setHeadX(self, x, speed = 3000): def setHeadX(self, x, speed = 3000):
self.updateHeadPosition(x, self._head_position.y, self._head_position.z) self.updateHeadPosition(x, self._head_position.y, self._head_position.z)
self._controller.setHeadPosition(self, x, self._head_position.y, self._head_position.z, speed) self._controller.setHeadPosition(self, x, self._head_position.y, self._head_position.z, speed)
@pyqtProperty("long") @pyqtProperty(float)
@pyqtProperty("long", "long") @pyqtProperty(float, float)
def setHeadY(self, y, speed = 3000): def setHeadY(self, y, speed = 3000):
self.updateHeadPosition(self._head_position.x, y, self._head_position.z) self.updateHeadPosition(self._head_position.x, y, self._head_position.z)
self._controller.setHeadPosition(self, self._head_position.x, y, self._head_position.z, speed) self._controller.setHeadPosition(self, self._head_position.x, y, self._head_position.z, speed)
@pyqtProperty("long") @pyqtProperty(float)
@pyqtProperty("long", "long") @pyqtProperty(float, float)
def setHeadZ(self, z, speed = 3000): def setHeadZ(self, z, speed = 3000):
self.updateHeadPosition(self._head_position.x, self._head_position.y, z) self.updateHeadPosition(self._head_position.x, self._head_position.y, z)
self._controller.setHeadPosition(self, self._head_position.x, self._head_position.y, z, speed) self._controller.setHeadPosition(self, self._head_position.x, self._head_position.y, z, speed)
@pyqtSlot("long", "long", "long") @pyqtSlot(float, float, float)
@pyqtSlot("long", "long", "long", "long") @pyqtSlot(float, float, float, float)
def moveHead(self, x = 0, y = 0, z = 0, speed = 3000): def moveHead(self, x = 0, y = 0, z = 0, speed = 3000):
self._controller.moveHead(self, x, y, z, speed) self._controller.moveHead(self, x, y, z, speed)

1
plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
View File

@ -181,7 +181,6 @@ class PerObjectSettingsTool(Tool):
def _checkStackForErrors(self, stack): def _checkStackForErrors(self, stack):
print("checking for errors")
if stack is None: if stack is None:
return False return False

18
resources/qml/Preferences/MaterialsPage.qml
View File

@ -52,6 +52,24 @@ Item
return base.currentItem.root_material_id == root_material_id; return base.currentItem.root_material_id == root_material_id;
} }
Component.onCompleted:
{
// Select the activated material when this page shows up
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
const active_root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
var itemIndex = -1;
for (var i = 0; i < materialsModel.rowCount(); ++i)
{
var item = materialsModel.getItem(i);
if (item.root_material_id == active_root_material_id)
{
itemIndex = i;
break;
}
}
materialListView.currentIndex = itemIndex;
}
Row // Button Row Row // Button Row
{ {
id: buttonRow id: buttonRow