프로젝트

일반

사용자정보

개정판 0b4e00b7

ID0b4e00b76155d428075b6885f2d74bf37273ea35
상위 a08d74b4
하위 bf54ad79, 6ae4bbbf

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

issue #1047 : 생성한 장치의 데이터 입력 & 불필요한 UI, 이미지 정리

Change-Id: I7060b8ab8018886099f99b63531ba160b6e17b7a

차이점 보기:

HYTOS/HYTOS/MainWindow.py
47 47
import SymbolEditorDialog
48 48
from UserInputAttribute import UserInputAttribute
49 49
from TextItemFactory import TextItemFactory
50
from TextDataListDialog import QTextDataListDialog
51 50
from DisplayColors import DisplayColors
52 51
from DisplayColors import DisplayOptions
53 52
import uuid
......
70 69

  
71 70
    '''
72 71
    def __init__(self):
73
        from LineTypeConditions import LineTypeConditions
74

  
75 72
        super(self.__class__, self).__init__()
76 73
        self.setupUi(self)
77 74
        self._label_mouse = QLabel(self.statusbar)
......
211 208
    def deleteDrawingActionClickEvent(self, item):
212 209
        try:
213 210
            msg = QMessageBox()
214
            msg.setIcon(QMessageBox.Critical)
211
            msg.setIcon(QMessageBox.Question)
215 212
            msg.setText(self.tr('Do you want to delete drawing?\nThis work cannot be recovered.'))
216 213
            msg.setWindowTitle(self.tr("Delete Drawing"))
217 214
            msg.setStandardButtons(QMessageBox.Ok|QMessageBox.Cancel)
......
240 237
        self.clear_HMB()
241 238
        
242 239
    def eventFilter(self, source, event):
240
        
243 241
        """
244 242
        display mouse position of graphics view
245 243
        """
......
514 512
        """ stop movie and hide label after finishing save """
515 513
        self._movie.stop()
516 514
        self.label_spinner.hide()
517
        QMessageBox.about(self.graphicsView, self.tr('Notice'), self._save_work_cmd.resultStr)
515
        #QMessageBox.about(self.graphicsView, self.tr('Notice'), self._save_work_cmd.resultStr)
516

  
517
        msg = QMessageBox()
518
        msg.setIcon(QMessageBox.Information)
519
        msg.setText(self.tr(self._save_work_cmd.resultStr))
520
        msg.setWindowTitle(self.tr("Notice"))
521
        msg.setStandardButtons(QMessageBox.Ok)
522
        msg.exec_()
523

  
518 524
        self.load_drawing_list()
519 525

  
520 526

  
......
594 600
    def onInitializeScene(self, action):
595 601

  
596 602
        if not self.graphicsView.hasImage():
597
            self.actionEquipment.setChecked(False)
598 603
            self.showImageSelectionMessageBox()
599

  
600 604
            return
601 605

  
602 606
        try:
603 607
            msg = QMessageBox()
604
            msg.setIcon(QMessageBox.Critical)
608
            msg.setIcon(QMessageBox.Question)
605 609
            msg.setText(self.tr('Do you want to remove all items?\nThis work cannot be recovered.'))
606
            msg.setWindowTitle(self.tr("Initialize"))
610
            msg.setWindowTitle(self.tr("Clear Screen"))
607 611
            msg.setStandardButtons(QMessageBox.Ok|QMessageBox.Cancel)
608 612
            if QMessageBox.Ok == msg.exec_():
609 613

  
......
685 689
    def configuration(self):
686 690
        from ConfigurationDialog import QConfigurationDialog
687 691

  
688
        self.dlgConfiguration = QConfigurationDialog(self)
689
        #self.dlgConfiguration.show()
690
        if QDialog.Accepted == self.dlgConfiguration.exec_():
691
            QEngineeringLineItem.LINE_TYPE_COLORS.clear()
692
            QEngineeringInstrumentItem.INST_COLOR = None
692
        self.dlgConfiguration = QConfigurationDialog(self)        
693
        self.dlgConfiguration.exec_()
694
        
693 695

  
694 696
    '''
695 697
        @brief  Show Image Selection Guide MessageBox
......
1333 1335
            appDocData = AppDocData.instance()
1334 1336
            project = appDocData.getCurrentProject()
1335 1337

  
1338
            maxValue = len(componentsUID)
1339
            self.progress.setMaximum(maxValue)
1340

  
1341

  
1336 1342
            for componentUID in componentsUID:
1337 1343
                componentInfos = appDocData.getComponentByComponentUID(componentUID)
1338 1344
                if (len(componentInfos)) > 0:                    
......
1351 1357
                            appDocData.symbols.append(item)
1352 1358
                            self.addSvgItemToScene(item)
1353 1359

  
1360
                    self.progress.setValue(self.progress.value() + 1)
1361

  
1362
                QApplication.processEvents()
1363

  
1354 1364
            # """ update scene """
1355 1365
            self.graphicsView.scene.update(self.graphicsView.sceneRect())
1356 1366
            for item in self.graphicsView.scene.items():

내보내기 Unified diff

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