프로젝트

일반

사용자정보

개정판 d5ec4d0f

IDd5ec4d0f44bdee89542a83bea3db43acf59f4d06
상위 224f5e6e
하위 391db12b, 128dbac3, cf924377

gaqhf 이(가) 5년 이상 전에 추가함

dev issue #000 : progressBar 수정

Change-Id: I50700defa5b75f72b0b5971e50a70632e66ddff5

차이점 보기:

DTI_PID/SPPIDConverter/AutoModeling.cs
34 34
        SPPID_Document document;
35 35
        ETCSetting _ETCSetting;
36 36

  
37
        public string DocumentLabelText { get; set; }
38

  
37 39
        int EquipCount;
38 40
        int SymbolCount;
39 41
        int LineCount;
......
118 120
                    SplashScreenManager.ShowForm(typeof(SPPIDSplashScreen), true, true);
119 121
                    SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetParent, (IntPtr)radApp.HWnd);
120 122
                    SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetAllStep, AllCount);
123
                    SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetDocumentName, DocumentLabelText);
121 124

  
122 125
                    // Equipment Modeling
123 126
                    SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetStep, "Equipments Modeling");
DTI_PID/SPPIDConverter/ConverterDocking.cs
48 48
                {
49 49
                    CloseOPCForm.Run();
50 50

  
51
                    foreach (var document in converterForm.Documents)
51
                    for (int i = 0; i < converterForm.Documents.Count; i++)
52 52
                    {
53
                        SPPID_Document document = converterForm.Documents[i];
53 54
                        if (document.SetSPPIDMapping() && document.Enable)
54 55
                        {
55 56
                            AutoModeling modeling = new AutoModeling(document, application, radApp);
57
                            modeling.DocumentLabelText = string.Format("Drawing Name : {0} ({1}/{2})", document.DrawingName, i + 1, converterForm.Documents.Count);
56 58
                            modeling.Run();
57 59
                        }
58 60
                    }
DTI_PID/SPPIDConverter/Form/SPPIDSplashScreen.Designer.cs
32 32
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
33 33
            this.labelStep = new DevExpress.XtraEditors.LabelControl();
34 34
            this.pictureEdit2 = new DevExpress.XtraEditors.PictureEdit();
35
            this.pictureEdit1 = new DevExpress.XtraEditors.PictureEdit();
35
            this.pictureEditLogo = new DevExpress.XtraEditors.PictureEdit();
36 36
            this.progressBarControl = new DevExpress.XtraEditors.ProgressBarControl();
37
            this.labelDocument = new DevExpress.XtraEditors.LabelControl();
37 38
            ((System.ComponentModel.ISupportInitialize)(this.pictureEdit2.Properties)).BeginInit();
38
            ((System.ComponentModel.ISupportInitialize)(this.pictureEdit1.Properties)).BeginInit();
39
            ((System.ComponentModel.ISupportInitialize)(this.pictureEditLogo.Properties)).BeginInit();
39 40
            ((System.ComponentModel.ISupportInitialize)(this.progressBarControl.Properties)).BeginInit();
40 41
            this.SuspendLayout();
41 42
            // 
......
43 44
            // 
44 45
            this.labelControl1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
45 46
            this.labelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
46
            this.labelControl1.Location = new System.Drawing.Point(27, 279);
47
            this.labelControl1.Location = new System.Drawing.Point(27, 304);
47 48
            this.labelControl1.Name = "labelControl1";
48 49
            this.labelControl1.Size = new System.Drawing.Size(52, 14);
49 50
            this.labelControl1.TabIndex = 6;
......
51 52
            // 
52 53
            // labelStep
53 54
            // 
55
            this.labelStep.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
54 56
            this.labelStep.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
55 57
            this.labelStep.Appearance.Options.UseFont = true;
56
            this.labelStep.Location = new System.Drawing.Point(27, 199);
58
            this.labelStep.Location = new System.Drawing.Point(27, 224);
57 59
            this.labelStep.Name = "labelStep";
58 60
            this.labelStep.Size = new System.Drawing.Size(57, 16);
59 61
            this.labelStep.TabIndex = 7;
......
72 74
            this.pictureEdit2.Size = new System.Drawing.Size(497, 166);
73 75
            this.pictureEdit2.TabIndex = 9;
74 76
            // 
75
            // pictureEdit1
77
            // pictureEditLogo
76 78
            // 
77
            this.pictureEdit1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
78
            this.pictureEdit1.EditValue = ((object)(resources.GetObject("pictureEdit1.EditValue")));
79
            this.pictureEdit1.Location = new System.Drawing.Point(324, 261);
80
            this.pictureEdit1.Name = "pictureEdit1";
81
            this.pictureEdit1.Properties.AllowFocused = false;
82
            this.pictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
83
            this.pictureEdit1.Properties.Appearance.Options.UseBackColor = true;
84
            this.pictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
85
            this.pictureEdit1.Properties.ShowMenu = false;
86
            this.pictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Squeeze;
87
            this.pictureEdit1.Size = new System.Drawing.Size(187, 44);
88
            this.pictureEdit1.TabIndex = 8;
79
            this.pictureEditLogo.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
80
            this.pictureEditLogo.EditValue = ((object)(resources.GetObject("pictureEditLogo.EditValue")));
81
            this.pictureEditLogo.Location = new System.Drawing.Point(324, 286);
82
            this.pictureEditLogo.Name = "pictureEditLogo";
83
            this.pictureEditLogo.Properties.AllowFocused = false;
84
            this.pictureEditLogo.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
85
            this.pictureEditLogo.Properties.Appearance.Options.UseBackColor = true;
86
            this.pictureEditLogo.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
87
            this.pictureEditLogo.Properties.ShowMenu = false;
88
            this.pictureEditLogo.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Squeeze;
89
            this.pictureEditLogo.Size = new System.Drawing.Size(187, 44);
90
            this.pictureEditLogo.TabIndex = 8;
89 91
            // 
90 92
            // progressBarControl
91 93
            // 
92
            this.progressBarControl.Location = new System.Drawing.Point(27, 221);
94
            this.progressBarControl.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
95
            this.progressBarControl.Location = new System.Drawing.Point(27, 246);
93 96
            this.progressBarControl.Name = "progressBarControl";
94 97
            this.progressBarControl.Properties.ShowTitle = true;
95 98
            this.progressBarControl.Properties.Step = 1;
96 99
            this.progressBarControl.Size = new System.Drawing.Size(471, 29);
97 100
            this.progressBarControl.TabIndex = 10;
98 101
            // 
102
            // labelDocument
103
            // 
104
            this.labelDocument.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
105
            this.labelDocument.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
106
            this.labelDocument.Appearance.Options.UseFont = true;
107
            this.labelDocument.Location = new System.Drawing.Point(27, 202);
108
            this.labelDocument.Name = "labelDocument";
109
            this.labelDocument.Size = new System.Drawing.Size(57, 16);
110
            this.labelDocument.TabIndex = 11;
111
            this.labelDocument.Text = "Starting...";
112
            // 
99 113
            // SPPIDSplashScreen
100 114
            // 
101 115
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
102 116
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
103
            this.ClientSize = new System.Drawing.Size(525, 310);
117
            this.ClientSize = new System.Drawing.Size(525, 335);
118
            this.Controls.Add(this.labelDocument);
104 119
            this.Controls.Add(this.progressBarControl);
105 120
            this.Controls.Add(this.pictureEdit2);
106
            this.Controls.Add(this.pictureEdit1);
121
            this.Controls.Add(this.pictureEditLogo);
107 122
            this.Controls.Add(this.labelStep);
108 123
            this.Controls.Add(this.labelControl1);
109 124
            this.Name = "SPPIDSplashScreen";
110 125
            this.Text = "Form1";
111 126
            ((System.ComponentModel.ISupportInitialize)(this.pictureEdit2.Properties)).EndInit();
112
            ((System.ComponentModel.ISupportInitialize)(this.pictureEdit1.Properties)).EndInit();
127
            ((System.ComponentModel.ISupportInitialize)(this.pictureEditLogo.Properties)).EndInit();
113 128
            ((System.ComponentModel.ISupportInitialize)(this.progressBarControl.Properties)).EndInit();
114 129
            this.ResumeLayout(false);
115 130
            this.PerformLayout();
......
119 134
        #endregion
120 135
        private DevExpress.XtraEditors.LabelControl labelControl1;
121 136
        private DevExpress.XtraEditors.LabelControl labelStep;
122
        private DevExpress.XtraEditors.PictureEdit pictureEdit1;
137
        private DevExpress.XtraEditors.PictureEdit pictureEditLogo;
123 138
        private DevExpress.XtraEditors.PictureEdit pictureEdit2;
124 139
        private DevExpress.XtraEditors.ProgressBarControl progressBarControl;
140
        private DevExpress.XtraEditors.LabelControl labelDocument;
125 141
    }
126 142
}
DTI_PID/SPPIDConverter/Form/SPPIDSplashScreen.cs
34 34
            else if (command == SplashScreenCommand.SetStep)
35 35
            {
36 36
                string stepText = (string)arg;
37
                labelStep.Text = stepText;
37
                labelStep.Text = "Step : " + stepText;
38 38
            }
39 39
            else if (command == SplashScreenCommand.SetAllStep)
40 40
            {
......
42 42
                progressBarControl.Properties.Maximum = pos;
43 43
                progressBarControl.Position = 0;
44 44
            }
45
            else if (command == SplashScreenCommand.SetDocumentName)
46
            {
47
                string text = (string)arg;
48
                labelDocument.Text = text;
49
            }
45 50
            else if (command == SplashScreenCommand.SetParent)
46 51
                SetParent(Handle, (IntPtr)arg);
47 52
            else if (command == SplashScreenCommand.ClearParent)
DTI_PID/SPPIDConverter/Form/SPPIDSplashScreen.resx
636 636
        YII=
637 637
</value>
638 638
  </data>
639
  <data name="pictureEdit1.EditValue" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
639
  <data name="pictureEditLogo.EditValue" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
640 640
    <value>
641 641
        iVBORw0KGgoAAAANSUhEUgAAAOYAAAA5CAYAAAAiAldBAAAABGdBTUEAALGPC/xhBQAACTBJREFUeF7t
642 642
        nf9S01gUxzs2aZP2Hx6BR/AR+HNnF1xWRRktbFRAVhEiC6z/2f92RtSysCvll61WQEGGvoF9A3wD+wbp

내보내기 Unified diff

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