프로젝트

일반

사용자정보

개정판 fbea6028

IDfbea6028200dd71018530833d1feb1f006f4b71c
상위 534af32d
하위 fb2d9638

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

dev issue #1006 : VendorPackageSymbolPath 추가 및 UI 추가

Change-Id: I3b7f474c87534281a0f5f59d23c59c7823fa9373

차이점 보기:

DTI_PID/SPPIDConverter/Form/MappingForm.Designer.cs
118 118
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
119 119
            this.btnImportData = new DevExpress.XtraEditors.SimpleButton();
120 120
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
121
            this.textBoxVendorSymbolPath = new DevExpress.XtraEditors.ButtonEdit();
122
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
123
            this.layoutControlGroup13 = new DevExpress.XtraLayout.LayoutControlGroup();
121 124
            ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit();
122 125
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
123 126
            this.layoutControl1.SuspendLayout();
......
202 205
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
203 206
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
204 207
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
208
            ((System.ComponentModel.ISupportInitialize)(this.textBoxVendorSymbolPath.Properties)).BeginInit();
209
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
210
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).BeginInit();
205 211
            this.SuspendLayout();
206 212
            // 
207 213
            // ribbonControl
......
221 227
            // 
222 228
            // layoutControl1
223 229
            // 
230
            this.layoutControl1.Controls.Add(this.textBoxVendorSymbolPath);
224 231
            this.layoutControl1.Controls.Add(this.btnImportData);
225 232
            this.layoutControl1.Controls.Add(this.btnExportData);
226 233
            this.layoutControl1.Controls.Add(this.btnExportExcel);
......
693 700
            // 
694 701
            this.tabbedControlGroup.Location = new System.Drawing.Point(0, 0);
695 702
            this.tabbedControlGroup.Name = "tabbedControlGroup";
696
            this.tabbedControlGroup.SelectedTabPage = this.GroupSymbol;
703
            this.tabbedControlGroup.SelectedTabPage = this.GroupETCSetting;
697 704
            this.tabbedControlGroup.Size = new System.Drawing.Size(796, 732);
698 705
            this.tabbedControlGroup.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
699 706
            this.GroupSymbol,
......
895 902
            this.emptySpaceItem3,
896 903
            this.layoutControlGroup9,
897 904
            this.layoutControlGroup10,
898
            this.layoutControlGroup12});
905
            this.layoutControlGroup12,
906
            this.layoutControlGroup13});
899 907
            this.GroupETCSetting.Location = new System.Drawing.Point(0, 0);
900 908
            this.GroupETCSetting.Name = "GroupETCSetting";
901 909
            this.GroupETCSetting.Size = new System.Drawing.Size(772, 685);
......
904 912
            // emptySpaceItem3
905 913
            // 
906 914
            this.emptySpaceItem3.AllowHotTrack = false;
907
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 225);
915
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 292);
908 916
            this.emptySpaceItem3.Name = "emptySpaceItem3";
909
            this.emptySpaceItem3.Size = new System.Drawing.Size(772, 460);
917
            this.emptySpaceItem3.Size = new System.Drawing.Size(772, 393);
910 918
            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
911 919
            // 
912 920
            // layoutControlGroup9
......
1157 1165
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
1158 1166
            this.layoutControlItem27.TextVisible = false;
1159 1167
            // 
1168
            // textBoxVendorSymbolPath
1169
            // 
1170
            this.textBoxVendorSymbolPath.Location = new System.Drawing.Point(184, 303);
1171
            this.textBoxVendorSymbolPath.MenuManager = this.ribbonControl;
1172
            this.textBoxVendorSymbolPath.Name = "textBoxVendorSymbolPath";
1173
            this.textBoxVendorSymbolPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
1174
            new DevExpress.XtraEditors.Controls.EditorButton()});
1175
            this.textBoxVendorSymbolPath.Size = new System.Drawing.Size(596, 20);
1176
            this.textBoxVendorSymbolPath.StyleController = this.layoutControl1;
1177
            this.textBoxVendorSymbolPath.TabIndex = 40;
1178
            this.textBoxVendorSymbolPath.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.textBoxETC_ButtonClick);
1179
            // 
1180
            // layoutControlItem28
1181
            // 
1182
            this.layoutControlItem28.Control = this.textBoxVendorSymbolPath;
1183
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 0);
1184
            this.layoutControlItem28.Name = "layoutControlItem28";
1185
            this.layoutControlItem28.Size = new System.Drawing.Size(748, 24);
1186
            this.layoutControlItem28.Text = "Symbol Path";
1187
            this.layoutControlItem28.TextSize = new System.Drawing.Size(145, 14);
1188
            // 
1189
            // layoutControlGroup13
1190
            // 
1191
            this.layoutControlGroup13.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
1192
            this.layoutControlItem28});
1193
            this.layoutControlGroup13.Location = new System.Drawing.Point(0, 225);
1194
            this.layoutControlGroup13.Name = "layoutControlGroup13";
1195
            this.layoutControlGroup13.Size = new System.Drawing.Size(772, 67);
1196
            this.layoutControlGroup13.Text = "Vendor Package Symbol";
1197
            // 
1160 1198
            // MappingForm
1161 1199
            // 
1162 1200
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
......
1254 1292
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
1255 1293
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
1256 1294
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
1295
            ((System.ComponentModel.ISupportInitialize)(this.textBoxVendorSymbolPath.Properties)).EndInit();
1296
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
1297
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).EndInit();
1257 1298
            this.ResumeLayout(false);
1258 1299
            this.PerformLayout();
1259 1300

  
......
1350 1391
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
1351 1392
        private DevExpress.XtraEditors.SimpleButton btnImportData;
1352 1393
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
1394
        private DevExpress.XtraEditors.ButtonEdit textBoxVendorSymbolPath;
1395
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup13;
1396
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
1353 1397
    }
1354 1398
}
DTI_PID/SPPIDConverter/Form/MappingForm.cs
290 290
            textBoxFlowMarkSymbolPath.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
291 291
            textBoxFlowMarkSymbolPath.Properties.Buttons[0].Kind = ButtonPredefines.Glyph;
292 292
            textBoxFlowMarkSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16;
293
            textBoxVendorSymbolPath.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
294
            textBoxVendorSymbolPath.Properties.Buttons[0].Kind = ButtonPredefines.Glyph;
295
            textBoxVendorSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16;
293 296

  
294 297
            ETCSetting _ETCSetting = ETCSetting.GetInstance();
295 298
            textBoxTextSymbolPath.Text = _ETCSetting.TextSymbolPath;
296 299
            textBoxNoteSymbolPath.Text = _ETCSetting.NoteSymbolPath;
297 300
            textBoxDrainValveSize.Text = _ETCSetting.DrainValveSize;
301
            textBoxVendorSymbolPath.Text = _ETCSetting.VendorPackageSymbolPath;
298 302
            textBoxFlowMarkSymbolPath.Text = _ETCSetting.FlowMarkSymbolPath;
299 303

  
300 304
            checkComboBoxTextLocation.EditValue = _ETCSetting.TextLocation;
......
317 321
            textBoxTextSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16;
318 322
            textBoxNoteSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16;
319 323
            textBoxFlowMarkSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16;
324
            textBoxVendorSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16;
320 325

  
321 326
            ButtonEdit buttonEdit = sender as ButtonEdit;
322 327
            if (currentButtonEdit != buttonEdit)
......
415 420
            _ETCSetting.TextSymbolPath = textBoxTextSymbolPath.Text;
416 421
            _ETCSetting.NoteSymbolPath = textBoxNoteSymbolPath.Text;
417 422
            _ETCSetting.FlowMarkSymbolPath = textBoxFlowMarkSymbolPath.Text;
423
            _ETCSetting.VendorPackageSymbolPath = textBoxVendorSymbolPath.Text;
418 424
            _ETCSetting.DrainValveSize = textBoxDrainValveSize.Text;
419 425
            _ETCSetting.TextLocation = (Model.Location)checkComboBoxTextLocation.EditValue;
420 426
            _ETCSetting.NoteLocation = (Model.Location)checkComboBoxNoteLocation.EditValue;
DTI_PID/SPPIDConverter/SPPIDModel/ETCSetting.cs
16 16
        public string TextSymbolPath { get => _TextSymbolPath; set => _TextSymbolPath = value; }
17 17
        public string NoteSymbolPath { get => _NoteSymbolPath; set => _NoteSymbolPath = value; }
18 18
        public string DrainValveSize { get => _DrainValveSize; set => _DrainValveSize = value; }
19
        public string VendorPackageSymbolPath { get; set; }
19 20
        public string FlowMarkSymbolPath { get; set; }
20 21

  
21 22
        public Model.Location TextLocation { get; set; }
DTI_PID/SPPIDConverter/Util/SPPIDUtil.cs
64 64
                _ETCSetting.NoteSymbolPath = jsonETCSetting.NoteSymbolPath;
65 65
                _ETCSetting.TextSymbolPath = jsonETCSetting.TextSymbolPath;
66 66
                _ETCSetting.DrainValveSize = jsonETCSetting.DrainValveSize;
67
                _ETCSetting.VendorPackageSymbolPath = jsonETCSetting.VendorPackageSymbolPath;
67 68
                _ETCSetting.TextLocation = jsonETCSetting.TextLocation;
68 69
                _ETCSetting.NoteLocation = jsonETCSetting.NoteLocation;
69 70
                _ETCSetting.LineNumberLocation = jsonETCSetting.LineNumberLocation;

내보내기 Unified diff

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