mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 14:37:29 -06:00
removed the preference made it a member of class platformphysics
CURA-10542
This commit is contained in:
parent
fbf21e2b6f
commit
f54d6099cd
5 changed files with 28 additions and 13 deletions
|
@ -1082,6 +1082,10 @@ class CuraApplication(QtApplication):
|
||||||
def getTextManager(self, *args) -> "TextManager":
|
def getTextManager(self, *args) -> "TextManager":
|
||||||
return self._text_manager
|
return self._text_manager
|
||||||
|
|
||||||
|
@pyqtSlot(bool)
|
||||||
|
def getLocalDropToBuildplate(self, drop_to_build_plate: bool) ->None:
|
||||||
|
return self._physics.setAppPerModelDropDown(drop_to_build_plate)
|
||||||
|
|
||||||
def getCuraFormulaFunctions(self, *args) -> "CuraFormulaFunctions":
|
def getCuraFormulaFunctions(self, *args) -> "CuraFormulaFunctions":
|
||||||
if self._cura_formula_functions is None:
|
if self._cura_formula_functions is None:
|
||||||
self._cura_formula_functions = CuraFormulaFunctions(self)
|
self._cura_formula_functions = CuraFormulaFunctions(self)
|
||||||
|
|
|
@ -39,7 +39,13 @@ class PlatformPhysics:
|
||||||
|
|
||||||
Application.getInstance().getPreferences().addPreference("physics/automatic_push_free", False)
|
Application.getInstance().getPreferences().addPreference("physics/automatic_push_free", False)
|
||||||
Application.getInstance().getPreferences().addPreference("physics/automatic_drop_down", False)
|
Application.getInstance().getPreferences().addPreference("physics/automatic_drop_down", False)
|
||||||
Application.getInstance().getPreferences().addPreference("physics/per_model_drop", False)
|
self._app_per_model_drop = Application.getInstance().getPreferences().getValue("physics/automatic_drop_down")
|
||||||
|
|
||||||
|
def getAppPerModelDropDown(self):
|
||||||
|
return self._app_per_model_drop
|
||||||
|
|
||||||
|
def setAppPerModelDropDown(self, drop_to_buildplate):
|
||||||
|
self._app_per_model_drop = drop_to_buildplate
|
||||||
|
|
||||||
def _onSceneChanged(self, source):
|
def _onSceneChanged(self, source):
|
||||||
if not source.callDecoration("isSliceable"):
|
if not source.callDecoration("isSliceable"):
|
||||||
|
@ -55,9 +61,6 @@ class PlatformPhysics:
|
||||||
app_preferences = app_instance.getPreferences()
|
app_preferences = app_instance.getPreferences()
|
||||||
app_automatic_drop_down = app_preferences.getValue("physics/automatic_drop_down")
|
app_automatic_drop_down = app_preferences.getValue("physics/automatic_drop_down")
|
||||||
app_automatic_push_free = app_preferences.getValue("physics/automatic_push_free")
|
app_automatic_push_free = app_preferences.getValue("physics/automatic_push_free")
|
||||||
# silent preference setting to mimic preference automatic_drop_down only different when user changes it explicitely while opening model
|
|
||||||
app_per_model_drop = app_preferences.getValue("physics/per_model_drop")
|
|
||||||
|
|
||||||
|
|
||||||
root = self._controller.getScene().getRoot()
|
root = self._controller.getScene().getRoot()
|
||||||
build_volume = app_instance.getBuildVolume()
|
build_volume = app_instance.getBuildVolume()
|
||||||
|
@ -85,11 +88,10 @@ class PlatformPhysics:
|
||||||
# Move it downwards if bottom is above platform
|
# Move it downwards if bottom is above platform
|
||||||
move_vector = Vector()
|
move_vector = Vector()
|
||||||
|
|
||||||
# if per model drop is different then app_automatic_drop
|
# if per model drop is different then app_automatic_drop, in case of 3mf loading when user changes this setting for that model
|
||||||
# in case of 3mf loading when user changes this setting for that model
|
if (self._app_per_model_drop != app_automatic_drop_down):
|
||||||
if (app_per_model_drop != app_automatic_drop_down):
|
node.setSetting(SceneNodeSettings.AutoDropDown, self._app_per_model_drop)
|
||||||
node.setSetting(SceneNodeSettings.AutoDropDown, app_per_model_drop)
|
if node.getSetting(SceneNodeSettings.AutoDropDown, self._app_per_model_drop) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down
|
||||||
if node.getSetting(SceneNodeSettings.AutoDropDown, app_per_model_drop) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down
|
|
||||||
z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
|
z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
|
||||||
move_vector = move_vector.set(y = -bbox.bottom + z_offset)
|
move_vector = move_vector.set(y = -bbox.bottom + z_offset)
|
||||||
|
|
||||||
|
@ -177,8 +179,8 @@ class PlatformPhysics:
|
||||||
op = PlatformPhysicsOperation.PlatformPhysicsOperation(node, move_vector)
|
op = PlatformPhysicsOperation.PlatformPhysicsOperation(node, move_vector)
|
||||||
op.push()
|
op.push()
|
||||||
|
|
||||||
# setting this silent preference same as app_automatic_drop_down
|
# setting this drop to model same as app_automatic_drop_down
|
||||||
app_preferences.setValue("physics/per_model_drop", app_automatic_drop_down)
|
self._app_per_model_drop = app_automatic_drop_down
|
||||||
# After moving, we have to evaluate the boundary checks for nodes
|
# After moving, we have to evaluate the boundary checks for nodes
|
||||||
build_volume.updateNodeBoundaryCheck()
|
build_volume.updateNodeBoundaryCheck()
|
||||||
|
|
||||||
|
|
|
@ -299,6 +299,11 @@ class WorkspaceDialog(QObject):
|
||||||
|
|
||||||
Application.getInstance().getBackend().close()
|
Application.getInstance().getBackend().close()
|
||||||
|
|
||||||
|
@pyqtSlot(bool)
|
||||||
|
def setDropToBuildPlateForModel(self, drop_to_buildplate: bool) -> None:
|
||||||
|
CuraApplication.getInstance().getLocalDropToBuildplate(drop_to_buildplate)
|
||||||
|
|
||||||
|
|
||||||
def setMaterialConflict(self, material_conflict: bool) -> None:
|
def setMaterialConflict(self, material_conflict: bool) -> None:
|
||||||
if self._has_material_conflict != material_conflict:
|
if self._has_material_conflict != material_conflict:
|
||||||
self._has_material_conflict = material_conflict
|
self._has_material_conflict = material_conflict
|
||||||
|
|
|
@ -311,7 +311,7 @@ UM.Dialog
|
||||||
id: checkDropModels
|
id: checkDropModels
|
||||||
text: catalog.i18nc("@text:window", "Drop models to buildplate")
|
text: catalog.i18nc("@text:window", "Drop models to buildplate")
|
||||||
checked: UM.Preferences.getValue("physics/automatic_drop_down")
|
checked: UM.Preferences.getValue("physics/automatic_drop_down")
|
||||||
onCheckedChanged: UM.Preferences.setValue("physics/per_model_drop", checked)
|
onCheckedChanged: manager.setDropToBuildPlateForModel(checked)
|
||||||
}
|
}
|
||||||
function reloadValue()
|
function reloadValue()
|
||||||
{
|
{
|
||||||
|
|
|
@ -509,7 +509,11 @@ UM.PreferencesPage
|
||||||
id: dropDownCheckbox
|
id: dropDownCheckbox
|
||||||
text: catalog.i18nc("@option:check", "Automatically drop models to the build plate")
|
text: catalog.i18nc("@option:check", "Automatically drop models to the build plate")
|
||||||
checked: boolCheck(UM.Preferences.getValue("physics/automatic_drop_down"))
|
checked: boolCheck(UM.Preferences.getValue("physics/automatic_drop_down"))
|
||||||
onCheckedChanged: UM.Preferences.setValue("physics/automatic_drop_down", checked)
|
onCheckedChanged:
|
||||||
|
{
|
||||||
|
UM.Preferences.setValue("physics/automatic_drop_down", checked)
|
||||||
|
CuraApplication.getLocalDropToBuildplate(checked)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue