개정판 9163f2dc
add key in size fix funct
Change-Id: I40464a64809a351edd763f5ad6d208b66cdb18a2
DTI_PID/DTI_PID/Shapes/EngineeringAbstractItem.py | ||
---|---|---|
529 | 529 |
if item.Size: |
530 | 530 |
self.sizeDepth = 0 |
531 | 531 |
return item.Size |
532 |
else: # User Keyin |
|
533 |
for prop, value in item.attrs.items(): |
|
534 |
if prop.Attribute.upper() == 'Size'.upper() or prop.Attribute.upper() == 'NominalDiameter'.upper(): |
|
535 |
if value and value != 'None' and prop.Freeze: |
|
536 |
self.sizeDepth = 0 |
|
537 |
return value |
|
532 | 538 |
prev = item |
533 | 539 |
|
534 | 540 |
downstream = matches[0].items[at + 1:] |
... | ... | |
551 | 557 |
if item.Size: |
552 | 558 |
self.sizeDepth = 0 |
553 | 559 |
return item.Size |
560 |
else: # User Keyin |
|
561 |
for prop, value in item.attrs.items(): |
|
562 |
if prop.Attribute.upper() == 'Size'.upper() or prop.Attribute.upper() == 'NominalDiameter'.upper(): |
|
563 |
if value and value != 'None' and prop.Freeze: |
|
564 |
self.sizeDepth = 0 |
|
565 |
return value |
|
554 | 566 |
prev = item |
555 | 567 |
|
556 | 568 |
#if 'Drain' == matches[0].Type: |
... | ... | |
583 | 595 |
if item.mainSubSize and item.mainSubSize[0]: |
584 | 596 |
self.sizeDepth = 0 |
585 | 597 |
return item.mainSubSize[0] |
586 |
elif item.Size: |
|
587 |
self.sizeDepth = 0 |
|
588 |
return item.Size |
|
598 |
else: |
|
599 |
if item.Size: |
|
600 |
self.sizeDepth = 0 |
|
601 |
return item.Size |
|
602 |
else: # User Keyin |
|
603 |
for prop, value in item.attrs.items(): |
|
604 |
if prop.Attribute.upper() == 'Size'.upper() or prop.Attribute.upper() == 'NominalDiameter'.upper(): |
|
605 |
if value and value != 'None' and prop.Freeze: |
|
606 |
self.sizeDepth = 0 |
|
607 |
return value |
|
589 | 608 |
prev = item |
590 | 609 |
|
591 | 610 |
downstream = connected_items[at + 1:] |
... | ... | |
604 | 623 |
if item.mainSubSize and item.mainSubSize[1]: |
605 | 624 |
self.sizeDepth = 0 |
606 | 625 |
return item.mainSubSize[1] |
607 |
elif item.Size: |
|
608 |
self.sizeDepth = 0 |
|
609 |
return item.Size |
|
626 |
else: |
|
627 |
if item.Size: |
|
628 |
self.sizeDepth = 0 |
|
629 |
return item.Size |
|
630 |
else: # User Keyin |
|
631 |
for prop, value in item.attrs.items(): |
|
632 |
if prop.Attribute.upper() == 'Size'.upper() or prop.Attribute.upper() == 'NominalDiameter'.upper(): |
|
633 |
if value and value != 'None' and prop.Freeze: |
|
634 |
self.sizeDepth = 0 |
|
635 |
return value |
|
610 | 636 |
prev = item |
611 | 637 |
|
612 | 638 |
if self.owner.runs and self in self.owner.runs[0].items: |
내보내기 Unified diff