/ - Diff - HYTOS - 일정관리

개정판 73a9aa93

ID	73a9aa930ff727a2a8ff4e4b0c8e291b19b96927
상위	9ec5f5cc
하위	a626d5a8, 6a7f6d46

김정우 이(가) 6년 이상 전에 추가함

Merge Line 부분에서 특정 Line이 생략되는 부분 및 관련 부분 수정

     #DB_NAME = AppDocData.instance().getCurrentProject().getPath() + "/db/" + "DTI_PID.db"
     #DB_NAME = os.path.dirname(os.path.realpath(__file__)) + "\\db\\DTI_PID.db"
     THREAD_MAX_WORKER = 1
     THREAD_MAX_WORKER = 4
     threadLock = threading.Lock()
     ACCEPT_OVERLAY_AREA = 10

             @brief  connect given lines
             @author humkyung
             @date   2018.04.11
             @history    2018.05.16  Jeongwoo    Connect Lines with long distance points
         '''
         def connectLines(self, lines, toler):
             res = []
             if len(lines) == 2:
                 lhs = lines[0]
                 rhs = lines[1]
                 # start - start
                 dx = lhs[0][0] - rhs[0][0]
                 dy = lhs[0][1] - rhs[0][1]
                 length = math.sqrt(dx*dx + dy*dy)
                 if length < toler:
                     for i in reversed(range(len(lhs))):
                         res.append(lhs[i])
                     for i in range(1,len(rhs)):
                         res.append(rhs[i])
                 # end - start
                 dx = lhs[-1][0] - rhs[0][0]
                 dy = lhs[-1][1] - rhs[0][1]
                 length = math.sqrt(dx*dx + dy*dy)
                 if length < toler:
                     for i in range(len(lhs)):
                         res.append(lhs[i])
                     for i in range(1,len(rhs)):
                         res.append(rhs[i])
                 # start - end
                 dx = lhs[0][0] - rhs[-1][0]
                 dy = lhs[0][1] - rhs[-1][1]
                 length = math.sqrt(dx*dx + dy*dy)
                 if length < toler:
                     for i in reversed(range(len(lhs))):
                         res.append(lhs[i])
                     for i in reversed(range(len(rhs)-1)):
                         res.append(rhs[i])
                 # end - end
                 dx = lhs[-1][0] - rhs[-1][0]
                 dy = lhs[-1][1] - rhs[-1][1]
                 length = math.sqrt(dx*dx + dy*dy)
                 if length < toler:
                     for i in range(len(lhs)):
                         res.append(lhs[i])
                     for i in reversed(range(len(rhs)-1)):
                         res.append(rhs[i])
                 # align line along x or y axis
                 dx = math.fabs(res[-1][0] - res[0][0])
                 dy = math.fabs(res[-1][1] - res[0][1])
                 length = math.sqrt(dx*dx + dy*dy)
                 dx /= length
                 dy /= length
                 if dx < 0.1:
                     for pt in res:
                         pt[0] = res[0][0]
                 elif dy < 0.1:
                     for pt in res:
                         pt[1] = res[0][1]
                 # up to here
                 return res
             return None
             pts = []
             for line in lines:
                 pts.append(line[0])
                 pts.append(line[1])
             maxLength = None
             for lpt in pts:
                 for rpt in pts:
                     if lpt != rpt:
                         dx = rpt[0] - lpt[0]
                         dy = rpt[1] - lpt[1]
                         length = math.sqrt(dx * dx + dy * dy)
                         if maxLength is None or maxLength < length:
                             maxLength = length
                             res.clear()
                             res.append(lpt)
                             res.append(rpt)
             return res
         '''
             @brief      symbol을 기준으로 양쪽으로 이미지에서 직선을 검출한다.
-...
             @author     humkyung
             @date       2018.04.11
             @history    humkyung 2018.04.12 continue loop if line is not in connectedLines
                         Jeongwoo 2018.05.16 Make comments if-statement
         '''
         def mergeLines(self, connectedLines, toler):
             try:
-...
                     matches = [param for param in connectedLines if (line != param) and self.isCollinear(line, param, toler)]
                     if len(matches) > 0:
                         matches.append(line)
                         if len(matches) > 2: matches = matches[-2:] # pick last two objects
                         #if len(matches) > 2: matches = matches[0:2] # pick last two objects
                         mergedLine = self.connectLines(matches, toler)
                         if mergedLine is not None:
                         if mergedLine is not None and len(mergedLine) > 0:
                             connectedLines.append(mergedLine)
                             for match in matches: connectedLines.remove(match)
             except Exception as ex:
-...
         '''
         def connectLineToLine(self, lhs, rhs):
             try:
                 polyline = [(rhs[0][0], rhs[1][1]), (rhs[-1][0], rhs[-1][1])]
                 shapelyPoly = shapely.geometry.LineString(polyline)
                 dx = rhs[-1][0] - rhs[0][0]
                 dy = rhs[-1][1] - rhs[0][1]
                 length = math.sqrt(dx*dx + dy*dy)
                 dx /= length
                 dy /= length
                 rightLine = [(rhs[0][0]-dx*20, rhs[0][1]-dy*20), (rhs[-1][0]+dx*20, rhs[-1][1]+dy*20)]
                 shapelyRightLine = shapely.geometry.LineString(rightLine)
                 dx = lhs[0][0] - lhs[-1][0]
                 dy = lhs[0][1] - lhs[-1][1]
                 dx = lhs[-1][0] - lhs[0][0]
                 dy = lhs[-1][1] - lhs[0][1]
                 length = math.sqrt(dx*dx + dy*dy)
                 dx /= length
                 dy /= length
                 line = [(lhs[0][0]+dx*20, lhs[0][1]+dy*20), (lhs[-1][0]-dx*20, lhs[-1][1]-dy*20)]
                 line = [(lhs[0][0]-dx*20, lhs[0][1]-dy*20), (lhs[-1][0]+dx*20, lhs[-1][1]+dy*20)]
                 shapelyLine = shapely.geometry.LineString(line)
                 pt = shapelyPoly.intersection(shapelyLine)
                 pt = shapelyRightLine.intersection(shapelyLine)
                 if (pt is not None) and (type(pt) == shapely.geometry.point.Point):
                     if self.distanceTo(lhs[0], (pt.x, pt.y)) < self.distanceTo(lhs[-1], (pt.x, pt.y)):
                         lhs[0][0] = pt.x
                         lhs[0][1] = pt.y
                     else:
                         lhs[-1][0] = pt.x
                         lhs[-1][1] = pt.y
                     if self.isExternalPoint(lhs, pt):
                         if self.distanceTo(lhs[0], (pt.x, pt.y)) < self.distanceTo(lhs[-1], (pt.x, pt.y)):
                             lhs[0][0] = pt.x
                             lhs[0][1] = pt.y
                         else:
                             lhs[-1][0] = pt.x
                             lhs[-1][1] = pt.y
                     if self.isExternalPoint(rhs, pt):
                         if self.distanceTo(rhs[0], (pt.x, pt.y)) < self.distanceTo(rhs[-1], (pt.x, pt.y)):
                             rhs[0][0] = pt.x
                             rhs[0][1] = pt.y
                         else:
                             rhs[-1][0] = pt.x
                             rhs[-1][1] = pt.y
             except Exception as ex:
                 print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
         def isExternalPoint(self, line, pt):
             try:
                 dx = line[1][0] - line[0][0]
                 dy = line[1][1] - line[0][1]
                 lineLength = math.sqrt(dx * dx + dy * dy)
                 dx = pt.x - line[0][0]
                 dy = pt.y - line[0][1]
                 length = math.sqrt(dx * dx + dy * dy)
                 if length > lineLength:
                     return True
                 dx = pt.x - line[1][0]
                 dy = pt.y - line[1][1]
                 length = math.sqrt(dx * dx + dy * dy)
                 if length > lineLength:
                     return True
                 return False
             except Exception as ex:
                 print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
-...
                 if ([1,0] == dir):
                     image = self.image[(pt[1]-yHalf):(pt[1]+yHalf), pt[0]:self.width]
                     imgWidth, imgHeight = image.shape[::-1]
                     i = 0
                     for i in range(imgWidth-windowSize[0]):
                         window = image[0:windowSize[1], i:i+windowSize[0]]
                         if (white == window[0:windowSize[1],0:windowSize[0]]).all(): break
-...
                 elif ([-1,0] == dir):
                     image = self.image[(pt[1]-yHalf):(pt[1]+yHalf), 0:pt[0]]
                     imgWidth, imgHeight = image.shape[::-1]
                     i = 0
                     for i in range(imgWidth-windowSize[0], -1, -1):
                         window = image[0:windowSize[1], i:i+windowSize[0]]
                         if (white == window[0:windowSize[1],0:windowSize[0]]).all(): break
-...
                     image = self.image[0:pt[1], int(pt[0]-xHalf):int(pt[0]+xHalf)]
                     imgWidth, imgHeight = image.shape[::-1]
                     i = 0
                     for i in range(imgHeight-windowSize[1], -1, -1):
                         window = image[i:i+windowSize[1], 0:windowSize[0]]
                         if (white == window[0:windowSize[1],0:windowSize[0]]).all(): break

             @author humkyung
             @date   2018.04.21
             @history    Jeongwoo 2018.05.15 Add normalize
                         Jeongwoo 2018.05.16 Add length == 0 check
         '''
         def intersection(self, line):
             import math
-...
             dx = endPt[0] - startPt[0]
             dy = endPt[1] - startPt[1]
             length = math.sqrt(dx*dx + dy*dy)
             if length == 0:
                 return None
             dx /= length
             dy /= length
             lhs = LineString([(startPt[0] - dx*20, startPt[1] - dy*20), (endPt[0] + dx*20, endPt[1] + dy*20)])
-...
             @author humkyung
             @date   2018.05.12
             @history    Jeongwoo 18.05.15 Add check pt's type
                         Jeongwoo 18.05.16 Add length == 0 check
         '''
         def isConnectable(self, line):
             import math
-...
             dx = endPt[0] - startPt[0]
             dy = endPt[1] - startPt[1]
             length = math.sqrt(dx*dx + dy*dy)
             if length == 0:
                 return False
             dx /= length
             dy /= length
             extendedLine = [(startPt[0] - dx*20, startPt[1] - dy*20), (endPt[0] + dx*20, endPt[1] + dy*20)]

             @brief      Check if given text is Note No Text (ex : NOTE 1, NOTE 2, ...)
             @author     Jeongwoo
             @date       2018.04.26
             @history    2018.05.16  Jeongwoo    Modify Validator flag
         '''
         def isNoteNoText(self, text):
             if QRegExpValidator(QRegExp("NOTE\s\d+")).validate(text, 0)[0] != QValidator.Invalid:
             if QRegExpValidator(QRegExp("NOTE\s\d+")).validate(text, 0)[0] == QValidator.Acceptable :
                 return True
             else:
                 return False

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 73a9aa93