개정판 4baf4459
issue #1171: separate component sql
Change-Id: Ie07b30134fffd37db04817792954e9eaa50a6452
| DTI_PID/DTI_PID/Shapes/EngineeringEquipmentItem.py | ||
|---|---|---|
| 251 | 251 |
sql = 'insert into EQUIPMENT_DATA_LIST({}) values({})'.format(','.join(cols), ','.join(values))
|
| 252 | 252 |
res.append((sql, (tuple(param),))) |
| 253 | 253 |
|
| 254 |
cols = ['UID', 'Drawings_UID', 'Symbol_UID', 'X', 'Y', 'Width', 'Height', 'Rotation', 'Area', 'Owner', 'Connected', '[Supplied By]', \ |
|
| 255 |
'SpecialItemTypes_UID', 'OriginIndex'] |
|
| 256 |
values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?'] |
|
| 257 |
param = [(str(self.uid), str(appDocData.activeDrawing.UID), str(self.dbUid), self.loc[0], self.loc[1], self.size[0], self.size[1], str(self.angle), |
|
| 258 |
self.area, str(self.owner) if self.owner else None, \ |
|
| 259 |
str(self.conns[0]) if self.conns else None, \ |
|
| 260 |
self.prop('Supplied By'), \
|
|
| 261 |
str(self.special_item_type) if self.special_item_type else None,\ |
|
| 262 |
self.currentPointModeIndex)] |
|
| 263 |
sql = 'insert into Components({}) values({})'.format(','.join(cols), ','.join(values))
|
|
| 264 |
res.append((sql, tuple(param))) |
|
| 265 |
|
|
| 254 |
res.append(self.toSql_Components()) |
|
| 255 |
|
|
| 266 | 256 |
_attrs = self.getAttributes() |
| 267 | 257 |
if _attrs: |
| 268 | 258 |
cols = ['UID', 'Components_UID', 'SymbolAttribute_UID', 'Value'] |
| DTI_PID/DTI_PID/Shapes/EngineeringInstrumentItem.py | ||
|---|---|---|
| 299 | 299 |
sql = 'insert into INSTRUMENT_DATA_LIST({}) values({})'.format(','.join(cols), ','.join(values))
|
| 300 | 300 |
res.append((sql, tuple(param))) |
| 301 | 301 |
|
| 302 |
cols = ['UID', 'Drawings_UID', 'Symbol_UID', 'X', 'Y', 'Width', 'Height', 'Rotation', 'Area', 'Owner', 'Connected', '[Supplied By]', \ |
|
| 303 |
'SpecialItemTypes_UID'] |
|
| 304 |
values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?'] |
|
| 305 |
param = [(str(self.uid), str(appDocData.activeDrawing.UID), str(self.dbUid), self.loc[0], self.loc[1], self.size[0], self.size[1], str(self.angle), |
|
| 306 |
self.area, str(self.owner) if self.owner else None, \ |
|
| 307 |
str(self.conns[0]) if self.conns else None, \ |
|
| 308 |
self.prop('Supplied By'), \
|
|
| 309 |
str(self.special_item_type) if self.special_item_type else None)] |
|
| 310 |
sql = 'insert into Components({}) values({})'.format(','.join(cols), ','.join(values))
|
|
| 311 |
res.append((sql, tuple(param))) |
|
| 302 |
res.append(self.toSql_Components()) |
|
| 312 | 303 |
|
| 313 | 304 |
_attrs = self.getAttributes() |
| 314 | 305 |
if _attrs: |
| DTI_PID/DTI_PID/Shapes/EngineeringReducerItem.py | ||
|---|---|---|
| 164 | 164 |
sql = 'insert into VALVE_DATA_LIST({}) values({})'.format(','.join(cols), ','.join(values))
|
| 165 | 165 |
res.append((sql, tuple(param))) |
| 166 | 166 |
|
| 167 |
cols = ['UID', 'Drawings_UID', 'Symbol_UID', 'X', 'Y', 'Width', 'Height', 'Rotation', 'Area', 'Owner', 'Connected', '[Supplied By]', \ |
|
| 168 |
'SpecialItemTypes_UID'] |
|
| 169 |
values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?'] |
|
| 170 |
param = [(str(self.uid), str(appDocData.activeDrawing.UID), str(self.dbUid), self.loc[0], self.loc[1], self.size[0], self.size[1], str(self.angle), |
|
| 171 |
self.area, str(self.owner) if self.owner else None, \ |
|
| 172 |
str(self.conns[0]) if self.conns else None, \ |
|
| 173 |
self.prop('Supplied By'), \
|
|
| 174 |
str(self.special_item_type) if self.special_item_type else None)] |
|
| 175 |
sql = 'insert into Components({}) values({})'.format(','.join(cols), ','.join(values))
|
|
| 176 |
res.append((sql, tuple(param))) |
|
| 167 |
res.append(self.toSql_Components()) |
|
| 177 | 168 |
|
| 178 | 169 |
cols = ['UID', 'Components_UID', 'SymbolAttribute_UID', 'Value'] |
| 179 | 170 |
values = ['?', '?', '?', '?'] |
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 449 | 449 |
|
| 450 | 450 |
return super().itemChange(change, value) |
| 451 | 451 |
|
| 452 |
def toSql_return_separately(self): |
|
| 453 |
""" convert valve data to sql query """ |
|
| 454 |
import uuid |
|
| 452 |
def toSql_Components(self): |
|
| 453 |
""" convert Components data to sql query """ |
|
| 455 | 454 |
from AppDocData import AppDocData |
| 456 | 455 |
|
| 457 |
res = [] |
|
| 458 |
resLater = [] |
|
| 459 |
appDocData = AppDocData.instance() |
|
| 460 |
|
|
| 461 |
cols = ['UID', 'ITEM_NO', 'MainSize', 'SubSize', 'PNID_NO'] |
|
| 462 |
values = ['?','?','?', '?', '?'] |
|
| 463 |
size = self.prop('Size')
|
|
| 464 |
param = [(str(self.uid), self.name, size if size else '', size if size else '', appDocData.activeDrawing.name)] |
|
| 465 |
sql = 'insert into VALVE_DATA_LIST({}) values({})'.format(','.join(cols), ','.join(values))
|
|
| 466 |
res.append((sql, tuple(param))) |
|
| 467 |
|
|
| 468 | 456 |
cols = ['UID', 'Drawings_UID', 'Symbol_UID', 'X', 'Y', 'Width', 'Height', 'Rotation', 'Area', 'Owner', 'Connected', '[Supplied By]', \ |
| 469 |
'SpecialItemTypes_UID', 'OriginIndex', '[From]', '[To]', '[Freeze]', '[Connected Item]', 'Flip']
|
|
| 457 |
'SpecialItemTypes_UID', 'OriginIndex', '[From]', '[To]', '[Freeze]', '[Connected Item]', '[Flip]']
|
|
| 470 | 458 |
values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?'] |
| 471 |
param = [(str(self.uid), str(appDocData.activeDrawing.UID), self.dbUid, self.loc[0], self.loc[1], self.size[0], self.size[1], self.angle,
|
|
| 459 |
param = [(str(self.uid), str(AppDocData.instance().activeDrawing.UID), self.dbUid, self.loc[0], self.loc[1], self.size[0], self.size[1], self.angle,
|
|
| 472 | 460 |
self.area, str(self.owner) if self.owner else None, \ |
| 473 | 461 |
str(self.conns[0]) if self.conns else None, \ |
| 474 | 462 |
self.prop('Supplied By'), \
|
| ... | ... | |
| 480 | 468 |
str(self.prop('Connected Item')) if self.prop('Connected Item') else None, \
|
| 481 | 469 |
self.flip)] |
| 482 | 470 |
sql = 'insert into Components({}) values({})'.format(','.join(cols), ','.join(values))
|
| 471 |
|
|
| 472 |
return (sql, tuple(param)) |
|
| 473 |
|
|
| 474 |
def toSql_return_separately(self): |
|
| 475 |
""" convert valve data to sql query """ |
|
| 476 |
import uuid |
|
| 477 |
from AppDocData import AppDocData |
|
| 478 |
|
|
| 479 |
res = [] |
|
| 480 |
resLater = [] |
|
| 481 |
appDocData = AppDocData.instance() |
|
| 482 |
|
|
| 483 |
cols = ['UID', 'ITEM_NO', 'MainSize', 'SubSize', 'PNID_NO'] |
|
| 484 |
values = ['?','?','?', '?', '?'] |
|
| 485 |
size = self.prop('Size')
|
|
| 486 |
param = [(str(self.uid), self.name, size if size else '', size if size else '', appDocData.activeDrawing.name)] |
|
| 487 |
sql = 'insert into VALVE_DATA_LIST({}) values({})'.format(','.join(cols), ','.join(values))
|
|
| 483 | 488 |
res.append((sql, tuple(param))) |
| 484 | 489 |
|
| 490 |
res.append(self.toSql_Components()) |
|
| 491 |
|
|
| 485 | 492 |
_attrs = self.getAttributes() |
| 486 | 493 |
if _attrs: |
| 487 | 494 |
cols = ['UID', 'Components_UID', 'SymbolAttribute_UID', 'Value', 'Association_UID', 'Freeze'] |
내보내기 Unified diff
