3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 16:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

T466: Fixed Nothing to slice bug

Browse source
This commit is contained in:
Victor Larchenko 2016-11-09 14:53:23 +06:00 • committed by Youness Alaoui
parent 2b2eec5643
commit be3a945fb0
3 changed files with 33 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/CuraApplication.py
View file

@ -541,13 +541,10 @@ class CuraApplication(QtApplication):
def loadFile(self, file): def loadFile(self, file):
scene = self.getController().getScene() scene = self.getController().getScene()
def findAny(): for node1 in DepthFirstIterator(scene.getRoot()):
for node1 in DepthFirstIterator(scene.getRoot()): if hasattr(node1, "gcode") and getattr(node1, "gcode") is True:
if hasattr(node1, "gcode") and getattr(node1, "gcode") is True: self.deleteAll()
return True break
return False
if findAny():
self.deleteAll()
if not file.isValid(): if not file.isValid():
return return

5
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -152,6 +152,8 @@ class CuraEngineBackend(Backend):
## Perform a slice of the scene. ## Perform a slice of the scene.
def slice(self): def slice(self):
Logger.log("d", "Starting slice job...") Logger.log("d", "Starting slice job...")
if self._pauseSlicing:
return
self._slice_start_time = time() self._slice_start_time = time()
if not self._enabled or not self._global_container_stack: # We shouldn't be slicing. if not self._enabled or not self._global_container_stack: # We shouldn't be slicing.
# try again in a short time # try again in a short time
@ -395,7 +397,8 @@ class CuraEngineBackend(Backend):
## Manually triggers a reslice ## Manually triggers a reslice
def forceSlice(self): def forceSlice(self):
self._change_timer.start() if not self._pauseSlicing:
self._change_timer.start()
## Called when anything has changed to the stuff that needs to be sliced. ## Called when anything has changed to the stuff that needs to be sliced.
# #

60
plugins/GCodeReader/GCodeReader.py
View file

@ -31,6 +31,8 @@ class GCodeReader(MeshReader):
self.cancelled = False self.cancelled = False
self.message = None self.message = None
self.scene_node = None
@staticmethod @staticmethod
def getInt(line, code): def getInt(line, code):
n = line.find(code) + 1 n = line.find(code) + 1
@ -61,26 +63,17 @@ class GCodeReader(MeshReader):
if m == self.message: if m == self.message:
self.cancelled = True self.cancelled = True
@staticmethod def onParentChanged(self, node):
def onParentChanged(node): backend = Application.getInstance().getBackend()
if node.getParent() is None: if self.scene_node is not None and self.scene_node.getParent() is None:
scene = Application.getInstance().getController().getScene() self.scene_node = None
backend._pauseSlicing = False
isAny = False Application.getInstance().setHideSettings(False)
for node1 in DepthFirstIterator(scene.getRoot()): Application.getInstance().getPrintInformation().setPreSliced(False)
if hasattr(node1, "gcode") and getattr(node1, "gcode") is True: else:
isAny = True backend._pauseSlicing = True
Application.getInstance().getPrintInformation().setPreSliced(True)
backend = Application.getInstance().getBackend() Application.getInstance().setHideSettings(True)
if not isAny:
backend._pauseSlicing = False
Application.getInstance().setHideSettings(False)
Application.getInstance().getPrintInformation().setPreSliced(False)
else:
backend._pauseSlicing = True
backend.backendStateChange.emit(3)
Application.getInstance().getPrintInformation().setPreSliced(True)
Application.getInstance().setHideSettings(True)
@staticmethod @staticmethod
def getNullBoundingBox(): def getNullBoundingBox():
@ -127,21 +120,21 @@ class GCodeReader(MeshReader):
return True return True
def read(self, file_name): def read(self, file_name):
scene_node = None
extension = os.path.splitext(file_name)[1] extension = os.path.splitext(file_name)[1]
if extension.lower() in self._supported_extensions: if extension.lower() in self._supported_extensions:
Logger.log("d", "Preparing to load %s" % file_name) Logger.log("d", "Preparing to load %s" % file_name)
self.cancelled = False self.cancelled = False
Application.getInstance().deleteAll() Application.getInstance().deleteAll()
scene_node = SceneNode() self.scene_node = SceneNode()
scene_node.getBoundingBox = self.getNullBoundingBox self.scene_node.getBoundingBox = self.getNullBoundingBox
scene_node.gcode = True self.scene_node.gcode = True
self.scene_node.parentChanged.connect(self.onParentChanged)
backend = Application.getInstance().getBackend() backend = Application.getInstance().getBackend()
backend._pauseSlicing = True backend._pauseSlicing = True
backend.close() backend.close()
backend.backendStateChange.emit(1) backend.backendStateChange.emit(3)
glist = getattr(Application.getInstance().getController().getScene(), "gcode_list") glist = getattr(Application.getInstance().getController().getScene(), "gcode_list")
glist.clear() glist.clear()
@ -241,7 +234,9 @@ class GCodeReader(MeshReader):
layer_mesh = layer_data.build() layer_mesh = layer_data.build()
decorator = LayerDataDecorator.LayerDataDecorator() decorator = LayerDataDecorator.LayerDataDecorator()
decorator.setLayerData(layer_mesh) decorator.setLayerData(layer_mesh)
scene_node.addDecorator(decorator)
self.scene_node.removeDecorator("LayerDataDecorator")
self.scene_node.addDecorator(decorator)
Logger.log("d", "Finished parsing %s" % file_name) Logger.log("d", "Finished parsing %s" % file_name)
self.message.hide() self.message.hide()
@ -249,18 +244,13 @@ class GCodeReader(MeshReader):
if current_layer == 0: if current_layer == 0:
Logger.log("w", "File %s doesn't contain any valid layers" % file_name) Logger.log("w", "File %s doesn't contain any valid layers" % file_name)
Application.getInstance().getPrintInformation()._pre_sliced = True Application.getInstance().getPrintInformation().setPreSliced(True)
scene_node.parentChanged.connect(self.onParentChanged)
scene_node_parent = Application.getInstance().getBuildVolume()
scene_node.setParent(scene_node_parent)
settings = Application.getInstance().getGlobalContainerStack() settings = Application.getInstance().getGlobalContainerStack()
machine_width = settings.getProperty("machine_width", "value") machine_width = settings.getProperty("machine_width", "value")
machine_depth = settings.getProperty("machine_depth", "value") machine_depth = settings.getProperty("machine_depth", "value")
scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2)) self.scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2))
view = Application.getInstance().getController().getActiveView() view = Application.getInstance().getController().getActiveView()
if view.getPluginId() == "LayerView": if view.getPluginId() == "LayerView":
@ -270,4 +260,4 @@ class GCodeReader(MeshReader):
Logger.log("d", "Loaded %s" % file_name) Logger.log("d", "Loaded %s" % file_name)
return scene_node return self.scene_node