프로젝트

일반

사용자정보

개정판 f36876aa

IDf36876aa82b8c8d2e65be5ace6308ede600c5d59
상위 786e333c
하위 5a4be5ff, 6703bbc5

김연진이(가) 약 5년 전에 추가함

issue #1048 : Labeling 수정

Change-Id: I7833767f82db4cb0bc75354db3a246ad358f2e37

차이점 보기:

HYTOS/HYTOS/Shapes/SymbolSvgItem.py
396 396

  
397 397
        if self.category == 'Equipment - [ Pressure Drop ]':
398 398
            if self.type == 'Air Fin Cooler':
399
                conns = [conn for conn in self.connectors if conn.data and conn.data.elevation is not None]
400
                if conns:
401
                    self.desc_labels[conns[0]].setHtml(
402
                        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>"
403
                        f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
404

  
405
                    label_rect = self.desc_labels[conns[0]].boundingRect()
406
                    self.desc_labels[conns[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
407
                '''    
399 408
                for conn in self.connectors:
400 409
                    if self.tag_no:
401 410
                        if conn.data:
......
405 414

  
406 415
                            pos = self.get_label_pos_of_connector(conn, self.desc_labels[conn])
407 416
                            self.desc_labels[conn].setPos(pos)
417
                '''
408 418
            elif self.type == 'Filter':
409 419
                if self.tag_no:
420
                    conns = [conn for conn in self.connectors if conn.data and conn.data.elevation is not None]
421
                    if conns:
422
                        self.desc_labels[conns[0]].setHtml(
423
                            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>"
424
                            f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
425

  
426
                        label_rect = self.desc_labels[conns[0]].boundingRect()
427
                        self.desc_labels[conns[0]].setPos(
428
                            QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
429
                    '''    
410 430
                    for conn in self.connectors:
411 431
                        if conn.data:
412 432
                            conn_rect = conn.boundingRect()
......
416 436

  
417 437
                            pos = self.get_label_pos_of_connector(conn, self.desc_labels[conn])
418 438
                            self.desc_labels[conn].setPos(QPointF(conn_rect.width(), 0))
439
                    '''
419 440
            elif self.type == 'Heat Exchanger':
420 441
                if self.tag_no:
421
                    conns = [conn for conn in self.connectors
422
                             if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
423
                    if conns:
424
                        self.desc_labels[conns[0]].setHtml(
425
                            f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} {units['Pressure']}<br>"
426
                            f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
427

  
428
                        pos = self.get_label_pos_of_connector(conns[0], self.desc_labels[conns[0]])
429
                        self.desc_labels[conns[0]].setPos(pos)
442
                    nozzles = []
443
                    for conn in self.connectors:
444
                        if conn.data and (conn.data.pressure_drop is not None or conn.data.elevation is not None):
445
                            nozzle = str(conn).rsplit('_', 1)[1]
446
                            nozzles.append(nozzle)
447

  
448
                    if len(nozzles) > 0:
449
                        if self.name == 'HEX_DP':
450
                            if 'N1' in nozzles and 'N2' in nozzles:
451
                                self.desc_labels[self.connectors[0]].setHtml(
452
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} [T] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
453
                                    f"[S] : {convert_to_fixed_point(self.connectors[1].data.elevation)} [T] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
454

  
455
                                label_rect = self.desc_labels[self.connectors[0]].boundingRect()
456
                                self.desc_labels[self.connectors[0]].setPos(
457
                                    QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
458

  
459
                                pos = self.get_label_pos_of_connector(self.connectors[3],
460
                                                                       self.desc_labels[self.connectors[3]])
461
                                self.desc_labels[self.connectors[0]].setPos(pos)
462
                            elif 'N1' in nozzles:
463
                                self.desc_labels[self.connectors[0]].setHtml(
464
                                    f"{self.tag_no}<br>[T] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
465
                                    f"[T] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
466

  
467
                                pos = self.get_label_pos_of_connector(self.connectors[3],
468
                                                                      self.desc_labels[self.connectors[3]])
469
                                self.desc_labels[self.connectors[0]].setPos(pos)
470
                            elif 'N2' in nozzles:
471
                                self.desc_labels[self.connectors[1]].setHtml(
472
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
473
                                    f"[S] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
474

  
475
                                pos = self.get_label_pos_of_connector(self.connectors[3],
476
                                                                      self.desc_labels[self.connectors[3]])
477
                                self.desc_labels[self.connectors[1]].setPos(pos)
478
                        elif self.name == 'HEX_H':
479
                            if 'N1' in nozzles and 'N2' in nozzles:
480
                                self.desc_labels[self.connectors[0]].setHtml(
481
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} [T] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
482
                                    f"[S] : {convert_to_fixed_point(self.connectors[0].data.elevation)} [T] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
483

  
484
                                pos = self.get_label_pos_of_connector(self.connectors[2],
485
                                                                      self.desc_labels[self.connectors[2]])
486
                                self.desc_labels[self.connectors[0]].setPos(pos)
487
                            elif 'N1' in nozzles:
488
                                self.desc_labels[self.connectors[0]].setHtml(
489
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
490
                                    f"[S] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
491

  
492
                                pos = self.get_label_pos_of_connector(self.connectors[2],
493
                                                                      self.desc_labels[self.connectors[2]])
494
                                self.desc_labels[self.connectors[0]].setPos(pos)
495
                            elif 'N2' in nozzles:
496
                                self.desc_labels[self.connectors[1]].setHtml(
497
                                    f"{self.tag_no}<br>[T] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
498
                                    f"[T] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
499

  
500
                                pos = self.get_label_pos_of_connector(self.connectors[2],
501
                                                                      self.desc_labels[self.connectors[2]])
502
                                self.desc_labels[self.connectors[1]].setPos(pos)
503
                        elif self.name == 'HEX_K':
504
                            if 'N1' in nozzles and 'N2' in nozzles:
505
                                self.desc_labels[self.connectors[0]].setHtml(
506
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} [T] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
507
                                    f"[S] : {convert_to_fixed_point(self.connectors[1].data.elevation)} [T] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
508

  
509
                                pos = self.get_label_pos_of_connector(self.connectors[2],
510
                                                                      self.desc_labels[self.connectors[2]])
511
                                self.desc_labels[self.connectors[0]].setPos(pos)
512
                            elif 'N1' in nozzles:
513
                                self.desc_labels[self.connectors[0]].setHtml(
514
                                    f"{self.tag_no}<br>[T] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
515
                                    f"[T] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
516

  
517
                                pos = self.get_label_pos_of_connector(self.connectors[2],
518
                                                                      self.desc_labels[self.connectors[2]])
519
                                self.desc_labels[self.connectors[0]].setPos(pos)
520
                            elif 'N2' in nozzles:
521
                                self.desc_labels[self.connectors[1]].setHtml(
522
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
523
                                    f"[S] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
524

  
525
                                pos = self.get_label_pos_of_connector(self.connectors[2],
526
                                                                      self.desc_labels[self.connectors[2]])
527
                                self.desc_labels[self.connectors[1]].setPos(pos)
528
                        elif self.name == 'HEX_P':
529
                            if 'N1' in nozzles and 'N2' in nozzles:
530
                                self.desc_labels[self.connectors[0]].setHtml(
531
                                    f"{self.tag_no}<br>[A] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} [B] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
532
                                    f"[A] : {convert_to_fixed_point(self.connectors[0].data.elevation)} [B] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
533

  
534
                                pos = self.get_label_pos_of_connector(self.connectors[1],
535
                                                                      self.desc_labels[self.connectors[1]])
536
                                self.desc_labels[self.connectors[0]].setPos(pos)
537
                            elif 'N1' in nozzles:
538
                                self.desc_labels[self.connectors[0]].setHtml(
539
                                    f"{self.tag_no}<br>[A] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
540
                                    f"[A] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
541

  
542
                                pos = self.get_label_pos_of_connector(self.connectors[1],
543
                                                                      self.desc_labels[self.connectors[1]])
544
                                self.desc_labels[self.connectors[0]].setPos(pos)
545
                            elif 'N2' in nozzles:
546
                                self.desc_labels[self.connectors[1]].setHtml(
547
                                    f"{self.tag_no}<br>[B] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
548
                                    f"[B] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
549

  
550
                                pos = self.get_label_pos_of_connector(self.connectors[1],
551
                                                                      self.desc_labels[self.connectors[1]])
552
                                self.desc_labels[self.connectors[1]].setPos(pos)
553
                        elif self.name == 'HEX_V':
554
                            if 'N1' in nozzles and 'N2' in nozzles:
555
                                self.desc_labels[self.connectors[0]].setHtml(
556
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} [T] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
557
                                    f"[S] : {convert_to_fixed_point(self.connectors[1].data.elevation)} [T] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
558

  
559
                                pos = self.get_label_pos_of_connector(self.connectors[2],
560
                                                                      self.desc_labels[self.connectors[2]])
561
                                self.desc_labels[self.connectors[0]].setPos(pos)
562
                            elif 'N1' in nozzles:
563
                                self.desc_labels[self.connectors[0]].setHtml(
564
                                    f"{self.tag_no}<br>[T] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
565
                                    f"[T] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
566

  
567
                                pos = self.get_label_pos_of_connector(self.connectors[2],
568
                                                                      self.desc_labels[self.connectors[2]])
569
                                self.desc_labels[self.connectors[0]].setPos(pos)
570
                            elif 'N2' in nozzles:
571
                                self.desc_labels[self.connectors[1]].setHtml(
572
                                    f"{self.tag_no}<br>[S] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
573
                                    f"[S] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
574

  
575
                                pos = self.get_label_pos_of_connector(self.connectors[2],
576
                                                                      self.desc_labels[self.connectors[2]])
577
                                self.desc_labels[self.connectors[1]].setPos(pos)
578

  
579
                        # label_rect = self.desc_labels[self.connectors[0]].boundingRect()
580
                        # self.desc_labels[self.connectors[0]].setPos(QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
430 581
            elif self.type == 'Miscellaneous':
431 582
                if self.name == 'M_Coil':
432 583
                    if self.tag_no:
584
                        conns = [conn for conn in self.connectors if conn.data and conn.data.elevation is not None]
585
                        if conns:
586
                            self.desc_labels[conns[0]].setHtml(
587
                                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>"
588
                                f"{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
589

  
590
                            label_rect = self.desc_labels[conns[0]].boundingRect()
591
                            self.desc_labels[conns[0]].setPos(
592
                                QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
593
                        '''
433 594
                        for conn in self.connectors:
434 595
                            if conn.data:
435 596
                                conn_rect = conn.boundingRect()
......
439 600

  
440 601
                                pos = self.get_label_pos_of_connector(conn, self.desc_labels[conn])
441 602
                                self.desc_labels[conn].setPos(pos)
442
                elif self.name in ('M_DP_E', 'M_React'):
603
                        '''
604
                elif self.name == 'M_DP_E':
443 605
                    if self.tag_no:
606
                        nozzles = []
607
                        for conn in self.connectors:
608
                            if conn.data and (conn.data.pressure_drop is not None or conn.data.elevation is not None):
609
                                nozzle = str(conn).rsplit('_', 1)[1]
610
                                nozzles.append(nozzle)
611

  
612
                        if len(nozzles) > 0:
613
                            if 'N1' in nozzles and 'N2' in nozzles:
614
                                self.desc_labels[self.connectors[0]].setHtml(
615
                                    f"{self.tag_no}<br>[H] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} [V] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
616
                                    f"[H] : {convert_to_fixed_point(self.connectors[1].data.elevation)} [V] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
617

  
618
                                label_rect = self.desc_labels[self.connectors[0]].boundingRect()
619
                                self.desc_labels[self.connectors[0]].setPos(
620
                                    QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
621

  
622
                                pos = self.get_label_pos_of_connector(self.connectors[2],
623
                                                                      self.desc_labels[self.connectors[2]])
624
                                self.desc_labels[self.connectors[0]].setPos(pos)
625
                            elif 'N1' in nozzles:
626
                                self.desc_labels[self.connectors[0]].setHtml(
627
                                    f"{self.tag_no}<br>[V] : {convert_to_fixed_point(self.connectors[0].data.pressure_drop)} {units['Pressure']}<br>"
628
                                    f"[V] : {convert_to_fixed_point(self.connectors[0].data.elevation)} {units['Length']}")
629

  
630
                                pos = self.get_label_pos_of_connector(self.connectors[2],
631
                                                                      self.desc_labels[self.connectors[2]])
632
                                self.desc_labels[self.connectors[0]].setPos(pos)
633
                            elif 'N2' in nozzles:
634
                                self.desc_labels[self.connectors[1]].setHtml(
635
                                    f"{self.tag_no}<br>[H] : {convert_to_fixed_point(self.connectors[1].data.pressure_drop)} {units['Pressure']}<br>"
636
                                    f"[H] : {convert_to_fixed_point(self.connectors[1].data.elevation)} {units['Length']}")
637

  
638
                                pos = self.get_label_pos_of_connector(self.connectors[2],
639
                                                                      self.desc_labels[self.connectors[2]])
640
                                self.desc_labels[self.connectors[1]].setPos(pos)
641
                        '''
444 642
                        conns = [conn for conn in self.connectors
445 643
                                if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
446 644
                        if conns:
......
451 649
                            label_rect = self.desc_labels[conns[0]].boundingRect()
452 650
                            self.desc_labels[conns[0]].setPos(
453 651
                                QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
652
                        '''
653
                elif self.name == 'M_React':
654
                    if self.tag_no:
655
                        nozzles = []
656
                        for conn in self.connectors:
657
                            if conn.data and (conn.data.pressure_drop is not None or conn.data.elevation is not None):
658
                                nozzle = str(conn).rsplit('_', 1)[1]
659
                                nozzles.append(nozzle)
660

  
661
                        if len(nozzles) > 0:
662
                            if ('N1' in nozzles or 'N2' in nozzles or 'N6' in nozzles) and ('N3' in nozzles or 'N4' in nozzles or 'N5' in nozzles):
663
                                if 'N1' in nozzles:
664
                                    top_index = 0
665
                                elif 'N2' in nozzles:
666
                                    top_index = 1
667
                                elif 'N6' in nozzles:
668
                                    top_index = 5
669

  
670
                                if 'N3' in nozzles:
671
                                    btm_index = 2
672
                                elif 'N4' in nozzles:
673
                                    btm_index = 3
674
                                elif 'N5' in nozzles:
675
                                    btm_index = 4
676

  
677
                                self.desc_labels[self.connectors[top_index]].setHtml(
678
                                    f"[DP] : {convert_to_fixed_point(self.connectors[top_index].data.pressure_drop)} {units['Pressure']}<br>"
679
                                    f"[Top] : {convert_to_fixed_point(self.connectors[top_index].data.elevation)} {units['Length']}<br>"
680
                                    f"[Btm] : {convert_to_fixed_point(self.connectors[btm_index].data.elevation)} {units['Length']}")
681

  
682
                                pos = self.get_label_pos_of_connector(self.connectors[3],
683
                                                                      self.desc_labels[self.connectors[3]])
684
                                self.desc_labels[self.connectors[top_index]].setPos(pos)
685

  
686
                            elif 'N1' in nozzles or 'N2' in nozzles or 'N6' in nozzles:
687
                                if 'N1' in nozzles:
688
                                    index = 0
689
                                elif 'N2' in nozzles:
690
                                    index = 1
691
                                elif 'N6' in nozzles:
692
                                    index = 5
693

  
694
                                self.desc_labels[self.connectors[index]].setHtml(
695
                                    f"[DP] : {convert_to_fixed_point(self.connectors[index].data.pressure_drop)} {units['Pressure']}<br>"
696
                                    f"[Top] : {convert_to_fixed_point(self.connectors[index].data.elevation)} {units['Length']}")
697

  
698
                                pos = self.get_label_pos_of_connector(self.connectors[3],
699
                                                                      self.desc_labels[self.connectors[3]])
700
                                self.desc_labels[self.connectors[index]].setPos(pos)
701

  
702
                            elif 'N3' in nozzles or 'N4' in nozzles or 'N5' in nozzles:
703
                                if 'N3' in nozzles:
704
                                    index = 2
705
                                elif 'N4' in nozzles:
706
                                    index = 3
707
                                elif 'N5' in nozzles:
708
                                    index = 4
709

  
710
                                self.desc_labels[self.connectors[index]].setHtml(
711
                                    f"[DP] : {convert_to_fixed_point(self.connectors[index].data.pressure_drop)} {units['Pressure']}<br>"
712
                                    f"[Btm] : {convert_to_fixed_point(self.connectors[index].data.elevation)} {units['Length']}")
713

  
714
                                pos = self.get_label_pos_of_connector(self.connectors[3],
715
                                                                      self.desc_labels[self.connectors[3]])
716
                                self.desc_labels[self.connectors[index]].setPos(pos)
717

  
718
                        '''
719
                        conns = [conn for conn in self.connectors
720
                                if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
721
                        if conns:
722
                            self.desc_labels[conns[0]].setHtml(
723
                                f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure_drop)} {units['Pressure']}"
724
                                f"<br>{convert_to_fixed_point(conns[0].data.elevation)} {units['Length']}")
725

  
726
                            label_rect = self.desc_labels[conns[0]].boundingRect()
727
                            self.desc_labels[conns[0]].setPos(
728
                                QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
729
                        '''
454 730
            elif self.type == 'Strainer':
455 731
                if self.tag_no:
456 732
                    conns = [conn for conn in self.connectors
......
465 741
                            QPointF((rect.width() - label_rect.width()) * 0.5, rect.height()))
466 742
        elif self.category == 'Equipment - [ Pressurized ]':
467 743
            if self.type == 'Battery Limit':
468
                if self.tag_no and self.connectors[0].data:
744
                if self.tag_no:
469 745
                    conns = [conn for conn in self.connectors
470
                             if conn.data and conn.data.pressure_drop is not None and conn.data.elevation is not None]
746
                             if conn.data and conn.data.pressure is not None and conn.data.elevation is not None]
471 747
                    if conns:
472 748
                        self.desc_labels[conns[0]].setHtml(
473 749
                            f"{self.tag_no}<br>{convert_to_fixed_point(conns[0].data.pressure)} {units['Pressure']}(g)<br>"

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)