This commit is contained in:
Daniel 2015-03-12 22:31:18 +02:00
parent 77d5099e99
commit 3789e8eba4

View file

@ -214,8 +214,6 @@ class DistributedSuit(DistributedSuitBase.DistributedSuitBase, DelayDeletable):
def setPathEndpoints(self, start, end, minPathLen, maxPathLen): def setPathEndpoints(self, start, end, minPathLen, maxPathLen):
if self.pathEndpointStart == start and self.pathEndpointEnd == end and self.minPathLen == minPathLen and self.maxPathLen == maxPathLen and self.path != None: if self.pathEndpointStart == start and self.pathEndpointEnd == end and self.minPathLen == minPathLen and self.maxPathLen == maxPathLen and self.path != None:
return return
if start not in self.sp.pointIndexes or end not in self.sp.pointIndexes:
return
self.pathEndpointStart = start self.pathEndpointStart = start
self.pathEndpointEnd = end self.pathEndpointEnd = end
self.minPathLen = minPathLen self.minPathLen = minPathLen
@ -224,9 +222,7 @@ class DistributedSuit(DistributedSuitBase.DistributedSuitBase, DelayDeletable):
self.pathLength = 0 self.pathLength = 0
self.currentLeg = -1 self.currentLeg = -1
self.legList = None self.legList = None
if self.maxPathLen == 0: if self.maxPathLen == 0 or not self.verifySuitPlanner() or start not in self.sp.pointIndexes or end not in self.sp.pointIndexes:
return
if not self.verifySuitPlanner():
return return
self.startPoint = self.sp.pointIndexes[self.pathEndpointStart] self.startPoint = self.sp.pointIndexes[self.pathEndpointStart]
self.endPoint = self.sp.pointIndexes[self.pathEndpointEnd] self.endPoint = self.sp.pointIndexes[self.pathEndpointEnd]