프로젝트

일반

사용자정보

개정판 442bd51e

ID442bd51e516477d275b005fcef7160e7c2eb2ad9
상위 a85990fb
하위 b427ebf9, 4941f5fe

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

dev issue #000 : 유저 편의성 추가

Change-Id: I7c29a8b6b077dc05d686dc77f71608c54a41ecdf

차이점 보기:

DTI_PID/SPPIDConverter/AutoModeling.cs
31 31
        LMDrawing currentDrawing;
32 32
        dynamic newDrawing;
33 33
        dynamic application;
34
        bool closeDocument;
34 35
        Ingr.RAD2D.Application radApp;
35 36
        SPPID_Document document;
36 37
        ETCSetting _ETCSetting;
......
43 44
        List<string> ZeroLengthModelItemIDReverse = new List<string>();
44 45
        List<Symbol> prioritySymbols;
45 46

  
46
        public AutoModeling(SPPID_Document document, dynamic application, Ingr.RAD2D.Application radApp)
47
        public AutoModeling(SPPID_Document document, dynamic application, Ingr.RAD2D.Application radApp, bool closeDocument)
47 48
        {
49
            this.closeDocument = closeDocument;
48 50
            this.document = document;
49 51
            this.application = application;
50 52
            this.radApp = radApp;
......
142 144

  
143 145
                if (radApp.ActiveDocument != null)
144 146
                {
145
                    radApp.ActiveDocument.Save();
147
                    newDrawing.Save();
148
                    if (closeDocument)
149
                        newDrawing.CloseDrawing(true);
146 150
                    ReleaseCOMObjects(newDrawing);
147 151
                }
148 152

  
DTI_PID/SPPIDConverter/ConverterDocking.cs
71 71
                            WrapperApplication wApp = new WrapperApplication(application.Application);
72 72
                            Ingr.RAD2D.Application radApp = wApp.RADApplication;
73 73

  
74
                            AutoModeling modeling = new AutoModeling(document, application, radApp);
74
                            AutoModeling modeling = new AutoModeling(document, application, radApp, converterForm.checkEditCloseDocument.Checked);
75 75
                            modeling.DocumentLabelText = string.Format("Drawing Name : {0} ({1}/{2})", document.DrawingName, i + 1, converterForm.Documents.Count);
76 76
                            modeling.Run();
77 77

  
DTI_PID/SPPIDConverter/ConverterForm.Designer.cs
73 73
            this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
74 74
            this.xtraFolderBrowserDialog = new DevExpress.XtraEditors.XtraFolderBrowserDialog(this.components);
75 75
            this.xtraOpenFileDialog = new DevExpress.XtraEditors.XtraOpenFileDialog(this.components);
76
            this.checkEditCloseDocument = new DevExpress.XtraEditors.CheckEdit();
77
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
78
            this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
76 79
            ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit();
77 80
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
78 81
            this.layoutControl1.SuspendLayout();
......
110 113
            ((System.ComponentModel.ISupportInitialize)(this.simpleLabelItem3)).BeginInit();
111 114
            ((System.ComponentModel.ISupportInitialize)(this.simpleLabelItem4)).BeginInit();
112 115
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
116
            ((System.ComponentModel.ISupportInitialize)(this.checkEditCloseDocument.Properties)).BeginInit();
117
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
118
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
113 119
            this.SuspendLayout();
114 120
            // 
115 121
            // ribbonControl
......
129 135
            // 
130 136
            // layoutControl1
131 137
            // 
138
            this.layoutControl1.Controls.Add(this.checkEditCloseDocument);
132 139
            this.layoutControl1.Controls.Add(this.btnRefresh);
133 140
            this.layoutControl1.Controls.Add(this.comboBoxEditDefaultTemplate);
134 141
            this.layoutControl1.Controls.Add(this.buttonEditDefaultUnit);
......
160 167
            // 
161 168
            // comboBoxEditDefaultTemplate
162 169
            // 
163
            this.comboBoxEditDefaultTemplate.Location = new System.Drawing.Point(758, 82);
170
            this.comboBoxEditDefaultTemplate.Location = new System.Drawing.Point(642, 82);
164 171
            this.comboBoxEditDefaultTemplate.MenuManager = this.ribbonControl;
165 172
            this.comboBoxEditDefaultTemplate.Name = "comboBoxEditDefaultTemplate";
166 173
            this.comboBoxEditDefaultTemplate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
167 174
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
168 175
            this.comboBoxEditDefaultTemplate.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
169
            this.comboBoxEditDefaultTemplate.Size = new System.Drawing.Size(97, 20);
176
            this.comboBoxEditDefaultTemplate.Size = new System.Drawing.Size(88, 20);
170 177
            this.comboBoxEditDefaultTemplate.StyleController = this.layoutControl1;
171 178
            this.comboBoxEditDefaultTemplate.TabIndex = 12;
172 179
            this.comboBoxEditDefaultTemplate.SelectedIndexChanged += new System.EventHandler(this.comboBoxEditDefaultTemplate_SelectedIndexChanged);
173 180
            // 
174 181
            // buttonEditDefaultUnit
175 182
            // 
176
            this.buttonEditDefaultUnit.Location = new System.Drawing.Point(563, 82);
183
            this.buttonEditDefaultUnit.Location = new System.Drawing.Point(393, 82);
177 184
            this.buttonEditDefaultUnit.MenuManager = this.ribbonControl;
178 185
            this.buttonEditDefaultUnit.Name = "buttonEditDefaultUnit";
179 186
            this.buttonEditDefaultUnit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
180 187
            new DevExpress.XtraEditors.Controls.EditorButton()});
181 188
            this.buttonEditDefaultUnit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
182
            this.buttonEditDefaultUnit.Size = new System.Drawing.Size(91, 20);
189
            this.buttonEditDefaultUnit.Size = new System.Drawing.Size(145, 20);
183 190
            this.buttonEditDefaultUnit.StyleController = this.layoutControl1;
184 191
            this.buttonEditDefaultUnit.TabIndex = 11;
185 192
            this.buttonEditDefaultUnit.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.buttonEditDefaulUnit_ButtonClick);
......
407 414
            this.layoutControlItem8,
408 415
            this.emptySpaceItem3,
409 416
            this.layoutControlItem9,
410
            this.emptySpaceItem4});
417
            this.emptySpaceItem4,
418
            this.layoutControlItem10,
419
            this.emptySpaceItem5});
411 420
            this.layoutControlGroupAutoConverter.Location = new System.Drawing.Point(0, 0);
412 421
            this.layoutControlGroupAutoConverter.Name = "layoutControlGroupAutoConverter";
413 422
            this.layoutControlGroupAutoConverter.Size = new System.Drawing.Size(942, 550);
......
457 466
            // layoutControlItem3
458 467
            // 
459 468
            this.layoutControlItem3.Control = this.buttonEditDefaultUnit;
460
            this.layoutControlItem3.Location = new System.Drawing.Point(469, 18);
469
            this.layoutControlItem3.Location = new System.Drawing.Point(299, 18);
461 470
            this.layoutControlItem3.Name = "layoutControlItem3";
462
            this.layoutControlItem3.Size = new System.Drawing.Size(165, 24);
471
            this.layoutControlItem3.Size = new System.Drawing.Size(219, 24);
463 472
            this.layoutControlItem3.Text = "Default Unit";
464 473
            this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
465 474
            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 14);
......
468 477
            // layoutControlItem8
469 478
            // 
470 479
            this.layoutControlItem8.Control = this.comboBoxEditDefaultTemplate;
471
            this.layoutControlItem8.Location = new System.Drawing.Point(634, 18);
480
            this.layoutControlItem8.Location = new System.Drawing.Point(518, 18);
472 481
            this.layoutControlItem8.Name = "layoutControlItem8";
473
            this.layoutControlItem8.Size = new System.Drawing.Size(201, 24);
482
            this.layoutControlItem8.Size = new System.Drawing.Size(192, 24);
474 483
            this.layoutControlItem8.Text = "Default Template";
475 484
            this.layoutControlItem8.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
476 485
            this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 14);
......
481 490
            this.emptySpaceItem3.AllowHotTrack = false;
482 491
            this.emptySpaceItem3.Location = new System.Drawing.Point(236, 18);
483 492
            this.emptySpaceItem3.Name = "emptySpaceItem3";
484
            this.emptySpaceItem3.Size = new System.Drawing.Size(233, 24);
493
            this.emptySpaceItem3.Size = new System.Drawing.Size(63, 24);
485 494
            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
486 495
            // 
487 496
            // layoutControlItem9
......
604 613
            this.xtraOpenFileDialog.Filter = "Xml Files(*.xml)|*.xml";
605 614
            this.xtraOpenFileDialog.Multiselect = true;
606 615
            // 
616
            // checkEditCloseDocument
617
            // 
618
            this.checkEditCloseDocument.Location = new System.Drawing.Point(744, 82);
619
            this.checkEditCloseDocument.MenuManager = this.ribbonControl;
620
            this.checkEditCloseDocument.Name = "checkEditCloseDocument";
621
            this.checkEditCloseDocument.Properties.Caption = "Close Document";
622
            this.checkEditCloseDocument.Size = new System.Drawing.Size(111, 19);
623
            this.checkEditCloseDocument.StyleController = this.layoutControl1;
624
            this.checkEditCloseDocument.TabIndex = 14;
625
            // 
626
            // layoutControlItem10
627
            // 
628
            this.layoutControlItem10.Control = this.checkEditCloseDocument;
629
            this.layoutControlItem10.Location = new System.Drawing.Point(720, 18);
630
            this.layoutControlItem10.MaxSize = new System.Drawing.Size(115, 24);
631
            this.layoutControlItem10.MinSize = new System.Drawing.Size(115, 24);
632
            this.layoutControlItem10.Name = "layoutControlItem10";
633
            this.layoutControlItem10.Size = new System.Drawing.Size(115, 24);
634
            this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
635
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
636
            this.layoutControlItem10.TextVisible = false;
637
            // 
638
            // emptySpaceItem5
639
            // 
640
            this.emptySpaceItem5.AllowHotTrack = false;
641
            this.emptySpaceItem5.Location = new System.Drawing.Point(710, 18);
642
            this.emptySpaceItem5.Name = "emptySpaceItem5";
643
            this.emptySpaceItem5.Size = new System.Drawing.Size(10, 24);
644
            this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
645
            // 
607 646
            // ConverterForm
608 647
            // 
609 648
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
......
653 692
            ((System.ComponentModel.ISupportInitialize)(this.simpleLabelItem3)).EndInit();
654 693
            ((System.ComponentModel.ISupportInitialize)(this.simpleLabelItem4)).EndInit();
655 694
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
695
            ((System.ComponentModel.ISupportInitialize)(this.checkEditCloseDocument.Properties)).EndInit();
696
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
697
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
656 698
            this.ResumeLayout(false);
657 699
            this.PerformLayout();
658 700

  
......
702 744
        private DevExpress.XtraEditors.SimpleButton btnRefresh;
703 745
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
704 746
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
747
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
748
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem5;
749
        public DevExpress.XtraEditors.CheckEdit checkEditCloseDocument;
705 750
    }
706 751
}
DTI_PID/SPPIDConverter/ConverterForm.cs
521 521
                            row["colUnit"] = buttonEditDefaultUnit.Text;
522 522

  
523 523
                        _ConverterDT.Rows.Add(row);
524

  
525
                        if (document.Enable && document.Validation && document.MappingValidation)
526
                            gridViewConverter.SelectRow(gridViewConverter.GetRowHandle(_ConverterDT.Rows.IndexOf(row)));
524 527
                    }
525 528
                    else
526 529
                    {
......
535 538
                                row["colTemplate"] = comboBoxEditDefaultTemplate.SelectedItem;
536 539
                            if (!string.IsNullOrEmpty(buttonEditDefaultUnit.Text))
537 540
                                row["colUnit"] = buttonEditDefaultUnit.Text;
541

  
542
                            if (document.Enable && document.Validation && document.MappingValidation)
543
                                gridViewConverter.SelectRow(gridViewConverter.GetRowHandle(_ConverterDT.Rows.IndexOf(row)));
538 544
                        }
539 545
                    }
540 546
                    if (!_DicDocuments.ContainsKey(fileName))
......
712 718
                    validationFailDocs.Add(document);
713 719

  
714 720
                _DicDocuments[fileName] = document;
721

  
722
                if (document.Enable && document.Validation && document.MappingValidation)
723
                    gridViewConverter.SelectRow(gridViewConverter.GetRowHandle(_ConverterDT.Rows.IndexOf(row)));
715 724
            }
716 725

  
717 726

  

내보내기 Unified diff

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