/ - Diff - HYTOS - 일정관리

개정판 c9478bf6

ID	c9478bf6b4437dca6e29e4efa38a7f03809984f9
상위	9777bbd1
하위	266c591e

백흠경이(가) 5년 이상 전에 추가함

Revert "issue #000: improve open xml file, fix explode, not exist item reference"

This reverts commit 9777bbd18e4de6c8e9f43cc311021237a0a92d48.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I70c11ad9ebc528a5611440d2b8c5bb5396c93995

             self._titleBlockProperties = None
             self.needReOpening = None
             self.configTable = None
         def clearItemList(self, trim):
             '''
                 @brief      clear item list
-...
             @date   2018.04.16
             @history kyouho 2018.07.09 change query method
         '''
         '''
         def getConfigs(self, section, key=None):
             res = []
-...
                 conn.close()
             return res
             '''
         def getConfigs(self, section, key=None):
             res = []
             if self.configTable is None:
                 self.configTable = []
                 try:
                     # Creates or opens a file called mydb with a SQLite3 DB
                     dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), AppDocData.DATABASE)
                     conn = sqlite3.connect(dbPath)
                     # Get a cursor object
                     cursor = conn.cursor()
                     sql = "select * from configuration"
                     cursor.execute(sql)
                     rows = cursor.fetchall()
                     for row in rows:
                         self.configTable.append(Config(row[0], row[1], row[2]))
                     # Catch the exception
                 except Exception as ex:
                     # Roll back any change if something goes wrong
                     conn.rollback()
                     print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
                 finally:
                     # Close the db connection
                     conn.close()
             if key is not None:
                 for con in self.configTable:
                     if con.section == section and con.key == key:
                         res.append(con)
             else:
                 for con in self.configTable:
                     if con.section == section:
                         res.append(con)
             return res
         def getAppConfigs(self, section, key=None):
             """

DTI_PID/DTI_PID/ConfigurationAreaDialog.py
686	686	# up to here
687	687
688	688	docData.saveConfigs(configs)
689		docData.configTable = None
690	689
691	690	self.isAccepted = True
692	691	except Exception as ex:

                 docData.saveConfigs(configs)
                 docData.lineTypeConfigs = None  # clear line type configurations
                 NominalPipeSizeTable.instance().pipe_sizes = None    # clear nominal pipe size table
                 docData.configTable = None
             except Exception as ex:
                 from App import App
                 from AppDocData import MessageType

                         menu.addAction(lineTypeAction)
                         line_no = item.parent().data(0, self.TREE_DATA_ROLE)
                         freeze = line_no.prop('Freeze')
                         explode_action = QAction(self.tr("Explode"))
                         explode_action.setEnabled(not freeze)
                         explode_action = QAction(self.tr("Explode"))
                         explode_action.triggered.connect(lambda : self.explode_line_run(item))
                         menu.addAction(explode_action)
                         menu.exec_(self.viewport().mapToGlobal(position))

                 while len(pool) > 0:
                     sign, obj = pool.pop()
                     #print(type(obj))
                     """ check obj is upstream or downstream of spec break """
                     matches = [spec_break for spec_break in self._spec_breaks if spec_break.is_connected(obj)]
                     if matches or issubclass(type(obj), QEngineeringEquipmentItem): continue
                     #print('obj={} pool={}'.format(obj, pool))
                     """ end loop if obj is to """
                     if to is not None and str(obj.uid) == str(to.uid): break
-...
                         #for s in self._symbols:
                         #    print(s)
                         #    print(s.owner)
                         #print(symbolMatches)
                     # order connected objects
                     matches = []
                     matches.extend(symbolMatches)
-...
                         rhs = matches
                     for match in lhs:
                         #print(match)
                         pool.append((-1, match))
                         visited.insert(0, match)
                     for match in rhs:
                         #print(match)
                         pool.append((1, match))
                         visited.append(match)
                     # up to here
-...
                 message = 'error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno)
                 App.mainWnd().addMessage.emit(MessageType.Error, message)
             #print(visited)
             return visited
     '''

             if type(self._connectedItem) is uuid.UUID:
                 matches = [x for x in self.scene().items() if hasattr(x, 'uid') and str(x.uid) == str(self._connectedItem)]
                 if matches:
                     self._connectedItem = matches[0]
                 else:
                     self._connectedItem = None
                 if matches: self._connectedItem = matches[0]
             return self._connectedItem

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 c9478bf6