/ - Diff - HYTOS - 일정관리

개정판 0d802026

ID	0d802026c0d55517af621339326c970585c29adf
상위	e9d9cab4
하위	e08d45f9

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

issue #1273: able to move label of nozzle

Change-Id: I261a9aa68c059b68680505f05b422471c3c8a057

             from EngineeringConnectorItem import NozzleData
             res = None
             conn = sqlite3.connect(self.activeDrawing.path)
             conn.execute('PRAGMA foreign_keys = ON')
             with conn:
             with sqlite3.connect(self.activeDrawing.path) as conn:
                 conn.execute('PRAGMA foreign_keys = ON')
                 conn.row_factory = sqlite3.Row
                 cursor = conn.cursor()
                 sql = 'select Pressure, Pressure_Drop, Elevation, Over_Design_CV, CV_Type from Nozzles where Points_UID=?'
                 sql = 'select Pressure, Pressure_Drop, Elevation, Over_Design_CV, CV_Type, B.X, B.Y from Nozzles A ' \
                       'left join Components B on A.Points_UID=B.UID where Points_UID=?'
                 param = (uid,)
                 cursor.execute(sql, param)
                 rows = cursor.fetchall()
-...
         def getComponentListByDrawingUID(self):
             ComponentList = []
             conn = sqlite3.connect(self.activeDrawing.path)
             conn.execute('PRAGMA foreign_keys = ON')
             with conn:
             with sqlite3.connect(self.activeDrawing.path) as conn:
                 conn.execute('PRAGMA foreign_keys = ON')
                 try:
                     conn.row_factory = sqlite3.Row
                     cursor = conn.cursor()

         def rebuild_label(self):
             items = [item for item in self.graphicsView.scene.items() if issubclass(type(item), SymbolSvgItem)]
             items = [item for item in self.graphicsView.scene.items() if issubclass(type(item), SymbolSvgItem) or
                      type(item) is QEngineeringStreamlineItem]
             for item in items:
                 item.build_label()
-...
                 dlg = QOptionsDialog(self)
                 (isAccepted, new_tag_font_size, new_tag_font_color) = dlg.show_dialog()
                 if isAccepted == True:
                 if isAccepted:
                     if app_doc_data.activeDrawing:
                         if str(old_tag_font_size) != str(new_tag_font_size) or old_tag_font_color != new_tag_font_color:
                             self.rebuild_label()
-...
                     QApplication.processEvents()
                 self.rebuild_label()
                 #self.rebuild_label()
                 # """ update scene """
                 self.graphicsView.scene.update(self.graphicsView.sceneRect())

             self.elevation = None
             self.over_design_cv = None
             self.cv_type = None
             self.pos = None
         def parse(self, row):
             """ parse given row """
-...
                     self.over_design_cv = float(row['Over_Design_CV'])
                 if not row['CV_Type'] is None:
                     self.cv_type = row['CV_Type']
                 if not row['X'] is None and not row['Y'] is None:
                     self.pos = (float(row['X']), float(row['Y']))
             except Exception as ex:
                 from App import App
                 from AppDocData import MessageType

             import uuid
             QGraphicsTextItem.__init__(self, text, parent)
             self.setFlags(QGraphicsItem.ItemIsSelectable | QGraphicsItem.ItemIsFocusable | QGraphicsItem.ItemIsMovable)
             self.type = 'EQP DESC'
             self.setHtml(text)
-...
         def set_font_color(self, color):
             self.setDefaultTextColor(QColor(color))
         def toSql(self, conn):
             """ generate sql string to save label to database """
             res = []
             try:
                 cols = ['UID', 'Symbols_UID', 'X', 'Y']
                 values = ['?', '?', '?', '?']
                 param = [str(conn.uid), str(self.parentItem().dbUid), self.pos().x(), self.pos().y()]
                 sql = f"insert or replace into Components({','.join(cols)}) values({','.join(values)})"
                 res.append((sql, tuple(param)))
             except Exception as ex:
                 from App import App
                 from AppDocData import MessageType
                 message = 'error occurred({}) in {}:{}'.format(repr(ex), sys.exc_info()[-1].tb_frame.f_code.co_filename,
                                                                sys.exc_info()[-1].tb_lineno)
                 App.mainWnd().addMessage.emit(MessageType.Error, message)
             return res

                 polygon.append(QPointF(rect.width() * 0.5 + x, rect.height() * 0.5 + y))
             return polygon
         def set_font_size(self, size):
             """set font size"""
             font = QFont('Arial')
             font.setPointSizeF(float(size))
             self.setFont(font)

         @stream_no.setter
         def stream_no(self, value):
             """ set stream no with given value """
             from EngineeringStreamNoTextItem import QEngineeringStreamNoTextItem
             from AppDocData import AppDocData
             self._stream_no = value
             self._stream_no_text = QEngineeringStreamNoTextItem(f"{self._stream_no}", self)
             self.build_path()
             try:
                 self._stream_no = value
                 self.build_label()
                 self.build_path()
             except Exception as ex:
                 from App import App
                 from AppDocData import MessageType
                 message = 'error occurred({}) 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)
         @property
         def data(self):
-...
             self.fittings = fittings
         def build_label(self):
             """build stream no"""
             from AppDocData import AppDocData
             from EngineeringStreamNoTextItem import QEngineeringStreamNoTextItem
             if not self._stream_no_text:
                 self._stream_no_text = QEngineeringStreamNoTextItem(f"{self._stream_no}", self)
             app_doc_data = AppDocData.instance()
             font_size = None
             configs = app_doc_data.getAppConfigs('option', 'TagFontSize')
             if configs and len(configs) == 1:
                 self._stream_no_text.set_font_size(configs[0].value)
         def build_path(self):
             """build path"""
             if not self._vertices or len(self._vertices) < 2:

                     index += 1
                 # up to here
                 '''
                 # Output Pump, Compressor, Control Valve
                 if self.has_attribute():
                     attr = self.attribute
                     for key, value in attr.items():
                         if key == 'Tag_No':
                             continue
                         cols = ['UID', 'Components_UID', 'Key', 'Value']
                         values = ['?', '?', '?', '?']
                         param = [str(uuid.uuid4()), str(self.uid), key, value]
                         sql = 'insert or replace into Result({}) values({})'.format(','.join(cols), ','.join(values))
                         res.append((sql, tuple(param)))
                 '''
                 # save nozzle label
                 for conn, label in self.desc_labels.items():
                     res.extend(label.toSql(conn))
                 # up to here
             except Exception as ex:
                 from App import App
-...
             res = None
             label_rect = label.boundingRect()
             conn_rect = conn.mapRectFromParent(conn.boundingRect())
             dx, dy = conn.dir()
             if dx == 1:
                 res = QPointF(conn_rect.x() + conn_rect.width() * 0.5, conn_rect.y())
             elif dy == -1:
                 res = QPointF(conn_rect.x() + conn_rect.width()*0.5, conn_rect.y() - label_rect.height())
             elif dy == 1:
                 res = QPointF(conn_rect.x() + conn_rect.width()*0.5, conn_rect.y() + conn_rect.height()*0.5)
             elif dx == -1:
                 res = QPointF(conn_rect.x() - label_rect.width(), conn_rect.y() + conn_rect.height()*0.5)
             app_doc_data = AppDocData.instance()
             if conn.data.pos:
                 res = QPointF(conn.data.pos[0], conn.data.pos[1])
             else:
                 label_rect = label.boundingRect()
                 conn_rect = conn.mapRectFromParent(conn.boundingRect())
                 dx, dy = conn.dir()
                 if dx == 1:
                     res = QPointF(conn_rect.x() + conn_rect.width() * 0.5, conn_rect.y())
                 elif dy == -1:
                     res = QPointF(conn_rect.x() + conn_rect.width()*0.5, conn_rect.y() - label_rect.height())
                 elif dy == 1:
                     res = QPointF(conn_rect.x() + conn_rect.width()*0.5, conn_rect.y() + conn_rect.height()*0.5)
                 elif dx == -1:
                     res = QPointF(conn_rect.x() - label_rect.width(), conn_rect.y() + conn_rect.height()*0.5)
             return res
-...
                             f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop) if conns[0].data.pressure_drop is not None else 0} {units['Pressure']}<br>"
                             f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                         label_rect = self.desc_labels[conns[0]].boundingRect()
                         self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                     '''
                     for conn in self.connectors:
                         if self.tag_no:
                             if conn.data:
                                 self.desc_labels[conn].setHtml(
                                     f"{self.tag_no}<br>{convert_to_fixed_point(conn.data.pressure_drop)} {units['Pressure']}<br>"
                                     f"{convert_to_fixed_point(conn.data.elevation)} {units['Length']}")
                                 pos = self.get_label_pos_of_connector(conn, self.desc_labels[conn])
                                 self.desc_labels[conn].setPos(pos)
                     '''
                         pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                         self.desc_labels[conns[0]].setPos(pos)
                 elif self.type == 'Filter':
                     if self.tag_no:
                         conns = [conn for conn in self.connectors if conn.data and conn.data.elevation is not None]
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop) if conns[0].data.pressure_drop is not None else 0} {units['Pressure']}<br>"
                                 f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(
                                 QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                         '''
                         for conn in self.connectors:
                             if conn.data:
                                 conn_rect = conn.boundingRect()
                                 self.desc_labels[conn].setHtml(
                                     f"{self.tag_no}<br>{convert_to_fixed_point(conn.data.pressure_drop)} {units['Pressure']}<br>"
                                     f"{convert_to_fixed_point(conn.data.elevation)} {units['Length']}")
                                 pos = self.get_label_pos_of_connector(conn, self.desc_labels[conn])
                                 self.desc_labels[conn].setPos(QPointF(conn_rect.width(), 0))
                         '''
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
                 elif self.type == 'Heat Exchanger':
                     if self.tag_no:
                         nozzles = []
-...
                                     f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop) if conns[0].data.pressure_drop is not None else 0} {units['Pressure']}<br>"
                                     f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                                 label_rect = self.desc_labels[conns[0]].boundingRect()
                                 self.desc_labels[conns[0]].setPos(
                                     QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             '''
                             for conn in self.connectors:
                                 if conn.data:
                                     conn_rect = conn.boundingRect()
                                     self.desc_labels[conn].setHtml(
                                         f"{self.tag_no}<br>{convert_to_fixed_point(conn.data.pressure_drop)} {units['Pressure']}<br>"
                                         f"{convert_to_fixed_point(conn.data.elevation)} {units['Length']}")
                                     pos = self.get_label_pos_of_connector(conn, self.desc_labels[conn])
                                     self.desc_labels[conn].setPos(pos)
                             '''
                                 pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                                 self.desc_labels[conns[0]].setPos(pos)
                     elif self.name == 'M_DP_E':
                         if self.tag_no:
                             nozzles = []
-...
                                     self.desc_labels[self.connectors[0]].setPos(
                                         QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                                     pos = self.get_label_pos_of_connector(self.connectors[2],
                                                                           self.desc_labels[self.connectors[2]])
                                     pos = self.get_label_pos_of_connector(self.connectors[0],
                                                                           self.desc_labels[self.connectors[0]])
                                     self.desc_labels[self.connectors[0]].setPos(pos)
                                 elif 'N1' in nozzles:
                                     self.desc_labels[self.connectors[0]].setHtml(
                                         f"{self.tag_no}<br>[V] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
                                         f"[V] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
                                     pos = self.get_label_pos_of_connector(self.connectors[2],
                                                                           self.desc_labels[self.connectors[2]])
                                     pos = self.get_label_pos_of_connector(self.connectors[0],
                                                                           self.desc_labels[self.connectors[0]])
                                     self.desc_labels[self.connectors[0]].setPos(pos)
                                 elif 'N2' in nozzles:
                                     self.desc_labels[self.connectors[1]].setHtml(
-...
                                     pos = self.get_label_pos_of_connector(self.connectors[2],
                                                                           self.desc_labels[self.connectors[2]])
                                     self.desc_labels[self.connectors[1]].setPos(pos)
                             '''
                             conns = [conn for conn in self.connectors
                                     if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
                             if conns:
                                 self.desc_labels[conns[0]].setHtml(
                                     f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} {units['Pressure']}"
                                     f"<br>{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                                 label_rect = self.desc_labels[conns[0]].boundingRect()
                                 self.desc_labels[conns[0]].setPos(
                                     QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             '''
                     elif self.name == 'M_React':
                         if self.tag_no:
                             nozzles = []
-...
                                         f"[Top] : {convert_to_fixed_point(self.connectors[top_index].data.elevation)} {units['Length']}<br>"
                                         f"[Btm] : {convert_to_fixed_point(self.connectors[btm_index].data.elevation)} {units['Length']}")
                                     pos = self.get_label_pos_of_connector(self.connectors[3],
                                                                           self.desc_labels[self.connectors[3]])
                                     pos = self.get_label_pos_of_connector(self.connectors[top_index],
                                                                           self.desc_labels[self.connectors[top_index]])
                                     self.desc_labels[self.connectors[top_index]].setPos(pos)
                                 elif 'N1' in nozzles or 'N2' in nozzles or 'N6' in nozzles:
-...
                                         f"[DP] : {convert_to_fixed_point(self.connectors[index].data.pressure_drop)} {units['Pressure']}<br>"
                                         f"[Top] : {convert_to_fixed_point(self.connectors[index].data.elevation)} {units['Length']}")
                                     pos = self.get_label_pos_of_connector(self.connectors[3],
                                                                           self.desc_labels[self.connectors[3]])
                                     pos = self.get_label_pos_of_connector(self.connectors[index],
                                                                           self.desc_labels[self.connectors[index]])
                                     self.desc_labels[self.connectors[index]].setPos(pos)
                                 elif 'N3' in nozzles or 'N4' in nozzles or 'N5' in nozzles:
-...
                                         f"[DP] : {convert_to_fixed_point(self.connectors[index].data.pressure_drop)} {units['Pressure']}<br>"
                                         f"[Btm] : {convert_to_fixed_point(self.connectors[index].data.elevation)} {units['Length']}")
                                     pos = self.get_label_pos_of_connector(self.connectors[3],
                                                                           self.desc_labels[self.connectors[3]])
                                     pos = self.get_label_pos_of_connector(self.connectors[index],
                                                                           self.desc_labels[self.connectors[index]])
                                     self.desc_labels[self.connectors[index]].setPos(pos)
                             '''
                             conns = [conn for conn in self.connectors
                                     if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
                             if conns:
                                 self.desc_labels[conns[0]].setHtml(
                                     f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} {units['Pressure']}"
                                     f"<br>{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                                 label_rect = self.desc_labels[conns[0]].boundingRect()
                                 self.desc_labels[conns[0]].setPos(
                                     QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             '''
                 elif self.type == 'Strainer':
                     if self.tag_no:
                         conns = [conn for conn in self.connectors
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} {units['Pressure']}<br>"
                                 f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(
                                 QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
             elif self.category == 'Equipment - [ Pressurized ]':
                 if self.type == 'Battery Limit':
                     if self.tag_no:
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure)} {units['Pressure']}(g)<br>"
                                 f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
                 elif self.type == 'Column':
                     if self.tag_no:
                         for conn in self.connectors:
-...
                                     f"{convert_to_fixed_point(conns[0].data.pressure_drop) if conns[0].data.pressure_drop is not None else 0} {units['Pressure']}<br>"
                                     f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                                 label_rect = self.desc_labels[conns[0]].boundingRect()
                                 self.desc_labels[conns[0]].setPos(
                                     QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                                 pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                                 self.desc_labels[conns[0]].setPos(pos)
                 elif self.type == 'Pump':
                     if self.tag_no:
                         conns = [conn for conn in self.connectors if conn.data and conn.data.elevation is not None]
-...
                                 f"{convert_to_fixed_point(conns[0].data.pressure_drop) if conns[0].data.pressure_drop is not None else 0} {units['Pressure']}<br>"
                                 f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(
                                 QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
             elif self.category == 'Instrument':
                 if self.type == 'Flowmeter':
                     if self.tag_no:
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(data.pressure_drop)} "
                                 f"{units['Pressure']}<br>{convert_to_fixed_point(data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[self.connectors[0]].boundingRect()
                             self.desc_labels[self.connectors[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(self.connectors[0], self.desc_labels[self.connectors[0]])
                             self.desc_labels[self.connectors[0]].setPos(pos)
                 elif self.type == 'Line Splitter':
                     if self.tag_no:
                         conns = [conn for conn in self.connectors
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} "
                                 f"{units['Pressure']}<br>{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
                 elif self.type == 'Reducer':
                     if self.tag_no:
                         conns = [conn for conn in self.connectors
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} "
                                 f"{units['Pressure']}<br>{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
                 elif self.type == 'Valve':
                     if self.tag_no and self.name in ('CV_H', 'CV_V'):
                         conns = [conn for conn in self.connectors if conn.data and conn.data.elevation is not None]
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop) if conns[0].data.pressure_drop is not None else 0} {units['Pressure']}<br>"
                                 f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width())*0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
                     elif self.tag_no and self.name in ('MV_H', 'MV_V'):
                         conns = [conn for conn in self.connectors
                                  if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
-...
                                 f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} "
                                 f"{units['Pressure']}<br>{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
                             label_rect = self.desc_labels[conns[0]].boundingRect()
                             self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
                             pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
                             self.desc_labels[conns[0]].setPos(pos)
             font_size = None
             configs = app_doc_data.getAppConfigs('option', 'TagFontSize')

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 0d802026