/ - Diff - HYTOS - 일정관리

개정판 24219f3d

ID	24219f3d466c1c7643e35775921ea60b3e1d8504
상위	93128b71
하위	b24ce137

김정우 이(가) 약 7년 전에 추가함

SG_DbHelper 에 있던 메소드를 AppDocData 에 이동

             return self.currentPidSource
         '''
             @brief      Check if Exist data or not, Moved from SG_DbHelper
             @author     Jeongwoo
             @date       2018.05.03
         '''
         def isExistData(self, fieldName, data):
             rows = None
             try:
                 dbPath = self.getCurrentProject().getDbFilePath() + "/ITI_PID.db"
                 conn = sqlite3.connect(dbPath)
                 cursor = conn.cursor()
                 sql = ""
                 if isinstance(data, str):
                     sql = "SELECT * FROM Symbol WHERE " + fieldName + " = '"+ data +"'"
                 else:
                     sql = "SELECT * FROM Symbol WHERE " + fieldName + " = "+ str(data) +""
                 cursor.execute(sql)
                 rows = cursor.fetchall()
             except Error as e:
                 print(e)
             finally:
                 conn.close()
                 if rows is not None and len(rows) > 0:
                     return True
                 else:
                     return False
         '''
             @brief      Check if exist file name or not, Moved from SG_DbHelper
             @author     Jeongwoo
             @date       2018.05.03
         '''
         def isExistFileName(self, name):
             rows = None
             try:
                 dbPath = self.getCurrentProject().getDbFilePath() + "/ITI_PID.db"
                 conn = sqlite3.connect(dbPath)
                 cursor = conn.cursor()
                 sql = "SELECT * FROM Symbol WHERE name = '"+ name +"'"
                 cursor.execute(sql)
                 rows = cursor.fetchall()
             except Error as e:
                 print(e)
             finally:
                 conn.close()
                 if rows is not None and len(rows) > 0:
                     return True
                 else:
                     return False
         '''
             @brief      Insert new symbol into Symbol Table, Moved from SG_DbHelper
             @author     Jeongwoo
             @date       2018.05.03
         '''
         def insertSymbol(self, symbol):
             isAdded = False
             try:
                 dbPath = self.getCurrentProject().getDbFilePath() + "/ITI_PID.db"
                 conn = sqlite3.connect(dbPath)
                 INSERT_SYMBOL_SQL = '''
                     INSERT INTO Symbol(symId, name, type, threshold, minMatchPoint, isDetectOrigin, rotationCount, ocrOption, isContainChild, originalPoint, connectionPoint, baseSymbol, additionalSymbol, isExceptDetect)
                     VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
                 '''
                 cursor = conn.cursor()
                 query = (symbol.getId(), symbol.getName(), symbol.getType(), symbol.getThreshold()
                                , symbol.getMinMatchCount(), symbol.getIsDetectOnOrigin(), symbol.getRotationCount()
                                , symbol.getOcrOption(), symbol.getIsContainChild()
                                , symbol.getOriginalPoint(), symbol.getConnectionPoint()
                                , symbol.getBaseSymbol(), symbol.getAdditionalSymbol(), symbol.getIsExceptDetect())
                 cursor.execute(INSERT_SYMBOL_SQL, query)
                 conn.commit()
                 isAdded = True
             except Error as e:
                 print(e)
             finally:
                 conn.close()
                 return (isAdded, symbol.getType(), symbol.getName(), symbol.getPath())
         '''
             @brief      Update symbol in Symbol Table, Moved from SG_DbHelper
             @author     Jeongwoo
             @date       2018.05.03
         '''
         def updateSymbol(self, symbol):
             isUpdated = False
             try:
                 dbPath = self.getCurrentProject().getDbFilePath() + "/ITI_PID.db"
                 conn = sqlite3.connect(dbPath)
                 UPDATE_SYMBOL_SQL = '''
                     UPDATE Symbol
                     SET
                         symId = ?, name = ?, type = ?, threshold = ?, minMatchPoint = ?, isDetectOrigin = ?,
                         rotationCount = ?, ocrOption = ?, isContainChild = ?, originalPoint = ?, connectionPoint = ?,
                         baseSymbol = ?, additionalSymbol = ?, isExceptDetect = ?
                     WHERE uid = ?
                 '''
                 cursor = conn.cursor()
                 query = (symbol.getId(), symbol.getName(), symbol.getType(), symbol.getThreshold()
                                , symbol.getMinMatchCount(), symbol.getIsDetectOnOrigin(), symbol.getRotationCount()
                                , symbol.getOcrOption(), symbol.getIsContainChild()
                                , symbol.getOriginalPoint(), symbol.getConnectionPoint()
                                , symbol.getBaseSymbol(), symbol.getAdditionalSymbol(), symbol.getIsExceptDetect(), symbol.getUid())
                 cursor.execute(UPDATE_SYMBOL_SQL, query)
                 conn.commit()
                 isUpdated = True
             except Error as e:
                 print(e)
             finally:
                 conn.close()
                 return (isUpdated, symbol.getType(), symbol.getName(), symbol.getPath())
         '''
             @brief      Get Detecting Target Symbol List (Field 'isExceptDetect' == False(0))
             @author     Jeongwoo
             @date       18.04.24

     import os
     import sqlite3
     import sys
     import SG_DbHelper
     import symbol, SymbolBase
     import potrace
-...
         '''
             @history    2018.05.02  Jeongwoo    Add variables (self.offsetX, self.offsetY, self.newSym)
 .05.03  Jeongwoo    Remove parameter in SG_DbHelper()
                                                 Remove self.dbHelper variable
         '''
         def __init__(self, parent, image, project, selectedSymbol = None):
             QDialog.__init__(self, parent)
-...
             self.offsetX = 0
             self.offsetY = 0
             self.newSym = None
             self.dbHelper = SG_DbHelper.SG_DbHelper()
         '''
             @brief  Set up QtImageViewer and QImage
-...
                     If the [Name] exists, add number like [FILE_NAME(1), FILE_NAME(2), ...]
                     Recursive function
             @history    2018.05.02  Jeongwoo    Change isExistFileName's parameter (Dir → newName)
 .05.03  Jeongwoo    Change self.dbHelper to AppDocData
         '''
         def makeFileName(self, type, originName, newName):
             imageFolderDir = self.project.getImageFilePath()
             imageDir = imageFolderDir + "/" + type + "/" + newName + ".png"
             svgFolderDir = self.project.getSvgFilePath()
             svgDir = svgFolderDir + "/" + type + "/" + newName + ".svg"
             if (os.path.exists(imageDir)) or (self.dbHelper.isExistFileName(newName) or (os.path.exists(svgDir))):
             if (os.path.exists(imageDir)) or (AppDocData.instance().isExistFileName(newName) or (os.path.exists(svgDir))):
                 self.FILE_NUMBER = self.FILE_NUMBER + 1
                 imgName = originName + "({})".format(self.FILE_NUMBER)
                 return self.makeFileName(originName, imgName)
-...
             @brief  Called when Save Button Clicked
                     Validation Check → Make Symbol Data → Insert Symbol Data into DB → Save png and svg files
             @history    2018.05.03  Jeongwoo    Change parameters on method 'deleteImageAndSvg'
                                                 Change self.dbHelper to AppDocData
         '''
         def accept(self):
             print("save")
-...
                 print("valid symbol info")
                 if self.selectedSymbol is None:
                     isSuccess, fileType, fileName, imagePath = self.dbHelper.insertSymbol(self.makeSymbolData())
                     isSuccess, fileType, fileName, imagePath = AppDocData.instance().insertSymbol(self.makeSymbolData())
                 else:
                     isSuccess, fileType, fileName, imagePath = self.dbHelper.updateSymbol(self.makeSymbolData())
                     isSuccess, fileType, fileName, imagePath = AppDocData.instance().updateSymbol(self.makeSymbolData())
                 if isSuccess:
                     try:
-...
         '''
             @history    2018.05.03  Jeongwoo    Change Parameters
                                                 Change self.dbHelper to AppDocData
         '''
         def resetUpdateSymbol(self, imagePath, svgPath):
             self.deleteImageAndSvg(imagePath, svgPath)
             SG_DbHelper.SG_DbHelper().updateSymbol(self.selectedSymbol)
             AppDocData.instance().updateSymbol(self.selectedSymbol)
         def keyPressEvent(self, event):
             if event.key() == QtCore.Qt.Key_Delete:
-...
         '''
             @brief  Validation Check
             @return (isValid, errorMsg)
             @history    2018.05.03  Jeongwoo    Change self.dbHelper to AppDocData
         '''
         def isValidSymbolInfo(self):
             print("isValid")
-...
             lastId = -1
             if self.selectedSymbol is not None:
                 lastId = self.selectedSymbol.getId()
             if lastId != id and self.dbHelper.isExistData('symId', id):
             if lastId != id and AppDocData.instance().isExistData('symId', id):
                 infoTitle = self.ui.idLabel.text()
                 return (False, EXCEPTION_MSG_DUPLICATED_FORMAT.format(infoTitle))

     from sqlite3 import Error
     from AppDocData import AppDocData
     #############################################################
     #           NOT USED
     #############################################################
     class SG_DbHelper():
         ROOT_DIR = ""
         DB_PATH = "db"

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 24219f3d