GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-28 05:53:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_separate_stage_qml

Browse Source
This commit is contained in:
fieldOfView 2018-03-29 14:47:58 +02:00
commit 3a9371837c
5 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -742,7 +742,7 @@ class CuraApplication(QtApplication):
# Initialize camera tool # Initialize camera tool
camera_tool = controller.getTool("CameraTool") camera_tool = controller.getTool("CameraTool")
camera_tool.setOrigin(Vector(0, 100, 0)) camera_tool.setOrigin(Vector(0, 100, 0))
camera_tool.setZoomRange(0.1, 200000) camera_tool.setZoomRange(0.1, 2000)
# Initialize camera animations # Initialize camera animations
self._camera_animation = CameraAnimation.CameraAnimation() self._camera_animation = CameraAnimation.CameraAnimation()

2
cura/PreviewPass.py
View File

@ -95,7 +95,7 @@ class PreviewPass(RenderPass):
diffuse_color[2] * shade_factor, diffuse_color[2] * shade_factor,
1.0] 1.0]
uniforms["diffuse_color"] = prettier_color(diffuse_color) uniforms["diffuse_color"] = prettier_color(diffuse_color)
uniforms["diffuse_color_2"] = prettier_color(diffuse_color2) uniforms["diffuse_color_2"] = diffuse_color2
batch_support_mesh.addItem(node.getWorldTransformation(), node.getMeshData(), uniforms = uniforms) batch_support_mesh.addItem(node.getWorldTransformation(), node.getMeshData(), uniforms = uniforms)
else: else:
# Normal scene node # Normal scene node

3
cura/Settings/MachineManager.py
View File

@ -342,9 +342,6 @@ class MachineManager(QObject):
self._initMachineState(containers[0]) self._initMachineState(containers[0])
self._onGlobalContainerChanged() self._onGlobalContainerChanged()
#The signal should update/reset settings of all connected USB devices
#self.usbOutputDeviceChanged.emit()
self.__emitChangedSignals() self.__emitChangedSignals()
## Given a definition id, return the machine with this id. ## Given a definition id, return the machine with this id.

12
resources/qml/MachineSelection.qml
View File

@ -83,16 +83,4 @@ ToolButton
} }
menu: PrinterMenu { } menu: PrinterMenu { }
// Make the toolbutton react when the global container changes, otherwise if Cura is not connected to the printer,
// switching printers make no reaction
Connections
{
target: Cura.MachineManager
onGlobalContainerChanged:
{
base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
}
}
} }

12
resources/qml/PrepareSidebar.qml
View File

@ -610,16 +610,4 @@ Rectangle
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: 0 storeIndex: 0
} }
// Make the ConfigurationSelector react when the global container changes, otherwise if Cura is not connected to the printer,
// switching printers make no reaction
Connections
{
target: Cura.MachineManager
onGlobalContainerChanged:
{
base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
}
}
} }