diff --git a/PVPlantTerrainAnalisys.py b/PVPlantTerrainAnalisys.py index a8d706f..5a9457f 100644 --- a/PVPlantTerrainAnalisys.py +++ b/PVPlantTerrainAnalisys.py @@ -450,35 +450,18 @@ class ContourTaskPanel(): starttime = datetime.now() if self.land is None: - print("No hay objetos para procesar") + FreeCAD.Console.PrintWarning("No hay objetos para procesar\n") return False else: minor = FreeCAD.Units.Quantity(self.inputMinorContourMargin.currentText()).Value mayor = FreeCAD.Units.Quantity(self.inputMayorContourMargin.currentText()).Value - i = 2 - if i == 0: - makeContours(self.land, minor, mayor, self.MinorColor, self.MayorColor, - self.inputMinorContourThickness.value(), self.inputMayorContourThickness.value()) - elif i == 1: - import multiprocessing - p = multiprocessing.Process(target=makeContours, - args=(self.land, minor, mayor, - self.MinorColor, self.MayorColor, - self.inputMinorContourThickness.value(), - self.inputMayorContourThickness.value(), )) - p.start() - p.join() - - else: - import threading - hilo = threading.Thread(target = makeContours, - args = (self.land, minor, mayor, - self.MinorColor, self.MayorColor, - self.inputMinorContourThickness.value(), - self.inputMayorContourThickness.value())) - hilo.daemon = True - hilo.start() + makeContours( + self.land, minor, mayor, + self.MinorColor, self.MayorColor, + self.inputMinorContourThickness.value(), + self.inputMayorContourThickness.value() + ) total_time = datetime.now() - starttime print(" -- Tiempo tardado:", total_time) @@ -569,7 +552,7 @@ class SlopeTaskPanel(_generalTaskPanel): land.ViewObject.DiffuseColor = colorlist # TODO: check this code: - elif obj.isDerivedFrom("Mesh::Feature"): + elif hasattr(land, 'Mesh') and land.isDerivedFrom("Mesh::Feature"): fMesh = Mest2FemMesh(land) import math setColors = [] @@ -602,10 +585,7 @@ class SlopeTaskPanel(_generalTaskPanel): print("Everything OK (", datetime.now() - starttime, ")") def accept(self): - # self.getPointSlope() - import threading - hilo = threading.Thread(target=self.getPointSlope(self.ranges)) - hilo.start() + self.getPointSlope(self.ranges) return True # Orientation Analisys: --------------------------------------------------------------------------------- @@ -809,4 +789,4 @@ if FreeCAD.GuiUp: FreeCADGui.addCommand('SlopeAnalisys', _CommandSlopeAnalisys()) FreeCADGui.addCommand('HeightAnalisys', _CommandHeightAnalisys()) FreeCADGui.addCommand('OrientationAnalisys', _CommandOrientationAnalisys()) - FreeCADGui.addCommand('TerrainAnalisys', CommandTerrainAnalisysGroup())''' \ No newline at end of file + FreeCADGui.addCommand('TerrainAnalisys', CommandTerrainAnalisysGroup())'''