개정판 94950e7b
issue #563: fix size
Change-Id: I1c8e0026c5e41fc25371776f57b743d467b8b551
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 820 | 820 |
project.make_sub_directories() |
| 821 | 821 |
try: |
| 822 | 822 |
# save size unit |
| 823 |
self.saveConfigs([Config('Project', 'Unit', project.prj_unit)])
|
|
| 823 |
#self.saveConfigs([Config('Project', 'Unit', project.prj_unit)])
|
|
| 824 | 824 |
|
| 825 | 825 |
if self.project.database.db_type == 'SQLite': |
| 826 | 826 |
# Creates or opens a file called mydb with a SQLite3 DB |
| DTI_PID/DTI_PID/ProjectDialog.py | ||
|---|---|---|
| 33 | 33 |
self.ui.toolButtonDelete.clicked.connect(self.deleteProjectClick) |
| 34 | 34 |
self.setWindowTitle(_translate('Project Dialog', 'Project'))
|
| 35 | 35 |
|
| 36 |
# unit setting move into configuration |
|
| 37 |
self.ui.comboBoxProjectUnit.setHidden(True) |
|
| 38 |
self.ui.label_3.setHidden(True) |
|
| 39 |
|
|
| 36 | 40 |
def initComboBox(self): |
| 37 | 41 |
from AppDocData import AppDocData |
| 38 | 42 |
|
| DTI_PID/DTI_PID/Scripts/MSSQL/ID2.sql | ||
|---|---|---|
| 2343 | 2343 |
INSERT INTO SymbolAttribute (UID,SymbolType_UID,"Attribute",DisplayAttribute,AttributeType,Expression,"index",AttrAt,"Length",Target,Property) VALUES ( |
| 2344 | 2344 |
'0b37b3a1-ae56-4f4a-b7e5-587f36469802','0','UnitNumber','UnitNumber','Text Item','item.text()',5,5,NULL,'ALL',3); |
| 2345 | 2345 |
INSERT INTO SymbolAttribute (UID,SymbolType_UID,"Attribute",DisplayAttribute,AttributeType,Expression,"index",AttrAt,"Length",Target,Property) VALUES ( |
| 2346 |
'aa8f1cab-de52-41da-8905-553bcf6513c5','0','NominalDiameter','NominalDiameter','Text Item','item.text()',0,0,NULL,'ALL',3); |
|
| 2346 |
'aa8f1cab-de52-41da-8905-553bcf6513c5','0','NominalDiameter','NominalDiameter','Size Text Item','item.text()',0,0,NULL,'ALL',3);
|
|
| 2347 | 2347 |
INSERT INTO SymbolAttribute (UID,SymbolType_UID,"Attribute",DisplayAttribute,AttributeType,Expression,"index",AttrAt,"Length",Target,Property) VALUES ( |
| 2348 | 2348 |
'6d63a700-8918-443d-975b-f16eaa28c21d','17','Opening Action','Opening Action','Text Item','item.text()',1,0,NULL,'ALL',0); |
| 2349 | 2349 |
INSERT INTO SymbolAttribute (UID,SymbolType_UID,"Attribute",DisplayAttribute,AttributeType,Expression,"index",AttrAt,"Length",Target,Property) VALUES ( |
| DTI_PID/DTI_PID/Shapes/EngineeringLineItem.py | ||
|---|---|---|
| 147 | 147 |
for item in upstream: |
| 148 | 148 |
if type(item) is QEngineeringReducerItem: |
| 149 | 149 |
if item.connectors[0].connectedItem is prev: ### Main Size |
| 150 |
if item.MainSubSize: return item.mainSize[0]
|
|
| 150 |
if item.mainSubSize: return item.mainSubSize[0]
|
|
| 151 | 151 |
elif item.connectors[1].connectedItem is prev: ### Sub Size |
| 152 |
if item.MainSubSize: return item.subSize[1]
|
|
| 152 |
if item.mainSubSize: return item.mainSubSize[1]
|
|
| 153 | 153 |
else: |
| 154 | 154 |
if item.Size: return item.Size |
| 155 | 155 |
prev = item |
| ... | ... | |
| 159 | 159 |
for item in downstream: |
| 160 | 160 |
if type(item) is QEngineeringReducerItem: |
| 161 | 161 |
if item.connectors[0].connectedItem is prev: ### Main Size |
| 162 |
if item.MainSubSize: return item.mainSize[0]
|
|
| 162 |
if item.mainSubSize: return item.mainSubSize[0]
|
|
| 163 | 163 |
elif item.connectors[1].connectedItem is prev: ### Sub Size |
| 164 |
if item.MainSubSize: return item.subSize[1]
|
|
| 164 |
if item.mainSubSize: return item.mainSubSize[1]
|
|
| 165 | 165 |
else: |
| 166 | 166 |
if item.Size: return item.Size |
| 167 | 167 |
prev = item |
| DTI_PID/DTI_PID/Shapes/EngineeringReducerItem.py | ||
|---|---|---|
| 28 | 28 |
self.setZValue(QEngineeringReducerItem.ZVALUE) |
| 29 | 29 |
|
| 30 | 30 |
@property |
| 31 |
def MainSubSize(self):
|
|
| 31 |
def mainSubSize(self):
|
|
| 32 | 32 |
""" return reducer's main sub size """ |
| 33 | 33 |
""" remain for old project no more used """ |
| 34 | 34 |
from QEngineeringSizeTextItem import QEngineeringSizeTextItem |
| ... | ... | |
| 77 | 77 |
@property |
| 78 | 78 |
def EvaluatedMainSize(self): |
| 79 | 79 |
""" remain for old project no more used """ |
| 80 |
return self.MainSubSize[0]
|
|
| 80 |
return self.mainSubSize[0]
|
|
| 81 | 81 |
|
| 82 | 82 |
@property |
| 83 | 83 |
def EvaluatedSubSize(self): |
| 84 | 84 |
""" remain for old project no more used """ |
| 85 |
return self.MainSubSize[1]
|
|
| 85 |
return self.mainSubSize[1]
|
|
| 86 | 86 |
|
| 87 | 87 |
def connectAttribute(self, attributes, clear=True): |
| 88 | 88 |
""" connect attribute of reducer """ |
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 222 | 222 |
for item in upstream: |
| 223 | 223 |
if type(item) is QEngineeringReducerItem: |
| 224 | 224 |
if item.connectors[0].connectedItem is prev: ### Main Size |
| 225 |
if item.MainSubSize: return item.mainSize[0]
|
|
| 225 |
if item.mainSubSize: return item.mainSubSize[0]
|
|
| 226 | 226 |
elif item.connectors[1].connectedItem is prev: ### Sub Size |
| 227 |
if item.MainSubSize: return item.subSize[1]
|
|
| 227 |
if item.mainSubSize: return item.mainSubSize[1]
|
|
| 228 | 228 |
else: |
| 229 | 229 |
if item.Size: return item.Size |
| 230 | 230 |
prev = item |
| ... | ... | |
| 234 | 234 |
for item in downstream: |
| 235 | 235 |
if type(item) is QEngineeringReducerItem: |
| 236 | 236 |
if item.connectors[0].connectedItem is prev: ### Main Size |
| 237 |
if item.MainSubSize: return item.mainSize[0]
|
|
| 237 |
if item.mainSubSize: return item.mainSubSize[0]
|
|
| 238 | 238 |
elif item.connectors[1].connectedItem is prev: ### Sub Size |
| 239 |
if item.MainSubSize: return item.subSize[1]
|
|
| 239 |
if item.mainSubSize: return item.mainSubSize[1]
|
|
| 240 | 240 |
else: |
| 241 | 241 |
if item.Size: return item.Size |
| 242 | 242 |
prev = item |
내보내기 Unified diff
