|
@@ -61,7 +61,7 @@ Item
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
- var density = parseInt(UM.ActiveProfile.settingValues.getValue("infill_sparse_density"));
|
|
|
+// var density = parseInt(UM.ActiveProfile.settingValues.getValue("infill_sparse_density"));
|
|
|
for(var i = 0; i < infillModel.count; ++i)
|
|
|
{
|
|
|
if(density > infillModel.get(i).percentageMin && density <= infillModel.get(i).percentageMax )
|
|
@@ -116,7 +116,7 @@ Item
|
|
|
onClicked: {
|
|
|
if (infillListView.activeIndex != index)
|
|
|
{
|
|
|
- UM.MachineManager.setSettingValue("infill_sparse_density", model.percentage)
|
|
|
+// UM.MachineManager.setSettingValue("infill_sparse_density", model.percentage)
|
|
|
}
|
|
|
}
|
|
|
onEntered: {
|
|
@@ -213,13 +213,13 @@ Item
|
|
|
text: catalog.i18nc("@option:check","Generate Brim");
|
|
|
style: UM.Theme.styles.checkbox;
|
|
|
|
|
|
- checked: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("adhesion_type") == "brim" : false;
|
|
|
+// checked: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("adhesion_type") == "brim" : false;
|
|
|
MouseArea {
|
|
|
anchors.fill: parent
|
|
|
hoverEnabled: true
|
|
|
onClicked:
|
|
|
{
|
|
|
- UM.MachineManager.setSettingValue("adhesion_type", !parent.checked?"brim":"skirt")
|
|
|
+// UM.MachineManager.setSettingValue("adhesion_type", !parent.checked?"brim":"skirt")
|
|
|
}
|
|
|
onEntered:
|
|
|
{
|
|
@@ -246,13 +246,13 @@ Item
|
|
|
text: catalog.i18nc("@option:check","Generate Support Structure");
|
|
|
style: UM.Theme.styles.checkbox;
|
|
|
|
|
|
- checked: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("support_enable") : false;
|
|
|
+// checked: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("support_enable") : false;
|
|
|
MouseArea {
|
|
|
anchors.fill: parent
|
|
|
hoverEnabled: true
|
|
|
onClicked:
|
|
|
{
|
|
|
- UM.MachineManager.setSettingValue("support_enable", !parent.checked)
|
|
|
+// UM.MachineManager.setSettingValue("support_enable", !parent.checked)
|
|
|
}
|
|
|
onEntered:
|
|
|
{
|
|
@@ -271,15 +271,15 @@ Item
|
|
|
|
|
|
function populateExtruderModel()
|
|
|
{
|
|
|
- extruderModel.clear()
|
|
|
- var extruder_count = UM.MachineManager.getSettingValue("machine_extruder_count");
|
|
|
- for(var extruder = 0; extruder < extruder_count ; extruder++) {
|
|
|
- extruderModel.append({
|
|
|
- name: catalog.i18nc("@label", "Extruder %1").arg(extruder),
|
|
|
- text: catalog.i18nc("@label", "Extruder %1").arg(extruder),
|
|
|
- value: extruder
|
|
|
- })
|
|
|
- }
|
|
|
+// extruderModel.clear()
|
|
|
+// var extruder_count = UM.MachineManager.getSettingValue("machine_extruder_count");
|
|
|
+// for(var extruder = 0; extruder < extruder_count ; extruder++) {
|
|
|
+// extruderModel.append({
|
|
|
+// name: catalog.i18nc("@label", "Extruder %1").arg(extruder),
|
|
|
+// text: catalog.i18nc("@label", "Extruder %1").arg(extruder),
|
|
|
+// value: extruder
|
|
|
+// })
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
Rectangle {
|
|
@@ -290,7 +290,7 @@ Item
|
|
|
width: parent.width
|
|
|
height: childrenRect.height
|
|
|
// Use both UM.ActiveProfile and UM.MachineManager to force UM.MachineManager.getSettingValue() to be reevaluated
|
|
|
- visible: UM.ActiveProfile.settingValues.getValue("machine_extruder_count") || (UM.MachineManager.getSettingValue("machine_extruder_count") > 1)
|
|
|
+// visible: UM.ActiveProfile.settingValues.getValue("machine_extruder_count") || (UM.MachineManager.getSettingValue("machine_extruder_count") > 1)
|
|
|
|
|
|
Label {
|
|
|
id: mainExtruderLabel
|
|
@@ -308,9 +308,9 @@ Item
|
|
|
anchors.top: parent.top
|
|
|
anchors.left: supportExtruderLabel.right
|
|
|
style: UM.Theme.styles.combobox
|
|
|
- currentIndex: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("extruder_nr") : 0
|
|
|
+// currentIndex: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("extruder_nr") : 0
|
|
|
onActivated: {
|
|
|
- UM.MachineManager.setSettingValue("extruder_nr", index)
|
|
|
+// UM.MachineManager.setSettingValue("extruder_nr", index)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -331,7 +331,7 @@ Item
|
|
|
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
|
|
anchors.left: supportExtruderLabel.right
|
|
|
style: UM.Theme.styles.combobox
|
|
|
- currentIndex: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("support_extruder_nr") : 0
|
|
|
+// currentIndex: UM.ActiveProfile.valid ? UM.ActiveProfile.settingValues.getValue("support_extruder_nr") : 0
|
|
|
onActivated: {
|
|
|
UM.MachineManager.setSettingValue("support_extruder_nr", index)
|
|
|
}
|
|
@@ -341,12 +341,12 @@ Item
|
|
|
id: extruderModel
|
|
|
Component.onCompleted: populateExtruderModel()
|
|
|
}
|
|
|
- Connections
|
|
|
- {
|
|
|
- id: machineChange
|
|
|
- target: UM.MachineManager
|
|
|
- onActiveMachineInstanceChanged: populateExtruderModel()
|
|
|
- }
|
|
|
+// Connections
|
|
|
+// {
|
|
|
+// id: machineChange
|
|
|
+// target: UM.MachineManager
|
|
|
+// onActiveMachineInstanceChanged: populateExtruderModel()
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
Rectangle {
|