/ - Diff - HYTOS - 일정관리

개정판 e88aae98

ID	e88aae982bfae2eb97922def2322b9922314cab9
상위	7c7bcd10
하위	aea96e14, ad0194f0

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

dev issue #1134 : SPPID Attribute 목록들을 사용자에게 보여주고 선택가능하게 수정.

Change-Id: Ic7d15ede6c81932abb6575f85668ab134225e610

             private DataTable _ConverterDT = new DataTable();
             private DataTable _SPPIDSymbolPathDT = new DataTable();
             private DataTable _SPPIDUnitDT = new DataTable();
             private DataTable _SPPIDAttributeDT = new DataTable();
             private RepositoryItemComboBox templateComboBox;
-...
                     if (!string.IsNullOrEmpty(TemplatePath))
                         templateComboBox.Items.AddRange(Directory.GetFiles(TemplatePath, "*.pid").ToList().Select(filePath => Path.GetFileName(filePath)).ToList());
                     if (_SPPIDUnitDT != null)
+                    {
                         _SPPIDUnitDT.Dispose();
                         _SPPIDUnitDT = null;
+                    }
                     if (_SPPIDAttributeDT != null)
+                    {
                         _SPPIDAttributeDT.Dispose();
                         _SPPIDAttributeDT = null;
+                    }
                     _SPPIDUnitDT = SPPID_DB.GetUnitTree();
                     _SPPIDAttributeDT = SPPID_DB.GetSPPIDAttribute();
                     if (_SPPIDAttributeDT != null)
+                    {
                         _SPPIDAttributeDT.Columns["DISPLAYNAME"].ColumnName = "DISPLAY NAME";
+                    }
                     layoutControlGroupAutoConverter.Enabled = true;
+                }
-...
                     return;
+                }
                 MappingForm form = new MappingForm(_ID2SymbolDT,_SPPIDSymbolPathDT, _ID2LineDT, _ID2LinePropertyDT, _ID2AttributeDT);
                 MappingForm form = new MappingForm(_ID2SymbolDT,_SPPIDSymbolPathDT, _ID2LineDT, _ID2LinePropertyDT, _ID2AttributeDT, _SPPIDAttributeDT);
                 form.ShowDialog();
                 InitMapping();
+            }

DTI_PID/SPPIDConverter/DB/Project_DB.cs
500	500	return dt;
501	501	}
502	502
503
504
505	503	public static bool InsertSymbolMapping(List<Tuple<string, string, string, bool>> datas)
506	504	{
507	505	Project_Info projectInfo = Project_Info.GetInstance();

                 return TemplatePath;
+            }
             public static List<string> GetSPPIDAttribute()
             public static DataTable GetSPPIDAttribute()
+            {
                 List<string> attributes = new List<string>();
                 SPPID_DBInfo dbInfo = SPPID_DBInfo.GetInstance();
                 DataTable dt = null;
                 try
+                {
                     if (dbInfo.DBType == "ORACLE")
-...
                             conn.Open();
                             if (conn.State == System.Data.ConnectionState.Open)
+                            {
                                 using (OracleCommand cmd = new OracleCommand())
                                 string sQuery = string.Format(CultureInfo.CurrentCulture,
                                     @"SELECT DISTINCT(ATTR.displayname), ATTR.name FROM {0}.itemattributions ATTR
                                     ORDER BY ATTR.displayname ASC", dbInfo.PlantPIDDic);
                                 using (OracleCommand cmd = new OracleCommand(sQuery, conn))
                                 using (OracleDataAdapter adapter = new OracleDataAdapter())
+                                {
                                     cmd.Connection = conn;
                                     // 정리 필요
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_EQUIPMENT");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_NOZZLE");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_PIPINGCOMP");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_PIPERUN");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_INSTRUMENT");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_INLINECOMP");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_VESSEL");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_EXCHANGER");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_MECHANICAL");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     cmd.CommandText = string.Format(CultureInfo.CurrentCulture, "SELECT * FROM {0}.{1}", dbInfo.PlantPID, "T_EQUIPCOMPONENT");
                                     using (OracleDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
+                                    {
                                         DataTable dt = reader.GetSchemaTable();
                                         foreach (DataRow row in dt.Rows)
                                             attributes.Add(row["ColumnName"].ToString());
+                                    }
                                     adapter.SelectCommand = cmd;
                                     dt = new DataTable();
                                     adapter.Fill(dt);
+                                }
+                            }
+                        }
-...
                     System.Windows.Forms.MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+                }
                 return attributes.Distinct().ToList();
                 return dt;
+            }
+        }
+    }

             DataTable lineDT;
             DataTable linePropertyDT;
             DataTable attributeDT;
             DataTable SPPIDAttributeDT;
             ButtonEdit currentButtonEdit;
             public MappingForm(DataTable symbolDT, DataTable SPPIDSymbolPathDT, DataTable lineDT, DataTable linePropertyDT, DataTable attributeDT)
             public MappingForm(DataTable symbolDT, DataTable SPPIDSymbolPathDT, DataTable lineDT, DataTable linePropertyDT, DataTable attributeDT, DataTable SPPIDAttributeDT)
+            {
                 InitializeComponent();
                 this.symbolDT = symbolDT;
-...
                 this.lineDT = lineDT;
                 this.linePropertyDT = linePropertyDT;
                 this.attributeDT = attributeDT;
                 this.SPPIDAttributeDT = SPPIDAttributeDT;
                 checkComboBoxTextLocation.EditValueChanging += TextEdit1_EditValueChanging;
                 checkComboBoxTextLocation.Properties.SeparatorChar = ',';
-...
                     if (DBNull.Value.Equals(item["LEADERLINE"]))
                         item["LEADERLINE"] = false;
+                }
                 RepositoryItemLookUpEdit lookUpEdit = new RepositoryItemLookUpEdit();
                 lookUpEdit.BeginInit();
                 lookUpEdit.DataSource = SPPIDAttributeDT;
                 lookUpEdit.DisplayMember = "DISPLAY NAME";
                 lookUpEdit.ValueMember = "NAME";
                 lookUpEdit.NullText = "";
                 lookUpEdit.BestFitMode = BestFitMode.BestFitResizePopup;
                 lookUpEdit.BestFit();
                 lookUpEdit.KeyUp += lookUpEdit_KeyUp;
                 lookUpEdit.EndInit();
                 checkedComboEdit.EditValueChanging += TextEdit1_EditValueChanging;
                 checkedComboEdit.SeparatorChar = ',';
                 checkedComboEdit.SetFlags(typeof(Model.Location));
                 checkedComboEdit.SelectAllItemVisible = false;
                 removeCombinedFlags(checkedComboEdit);
                 gridControlAttribute.RepositoryItems.Add(lookUpEdit);
                 gridControlAttribute.RepositoryItems.Add(checkedComboEdit);
                 gridViewAttribute.Columns["SPPID_ATTRIBUTE"].ColumnEdit = lookUpEdit;
                 gridViewAttribute.Columns["LOCATION"].ColumnEdit = checkedComboEdit;
                 gridControlAttribute.RepositoryItems.Add(clearButton);
                 gridViewAttribute.ExpandAllGroups();
-...
                 gridViewLineNumber.Columns["Type"].GroupIndex = 0;
                 gridViewLineNumber.ExpandAllGroups();
                 gridControlLineNumber.RepositoryItems.Add(lookUpEdit);
                 gridViewLineNumber.Columns["SPPID_ATTRIBUTE"].ColumnEdit = lookUpEdit;
                 // Common
                 gridViewSymbol.Columns["Clear"].ColumnEdit = clearButton;
-...
                 gridViewAttribute.Columns["Clear"].MaxWidth = 16;
+            }
             private void lookUpEdit_KeyUp(object sender, KeyEventArgs e)
+            {
                 LookUpEdit edit = sender as LookUpEdit;
                 if (e.KeyCode == Keys.Delete)
+                {
                     edit.ClosePopup();
                     edit.EditValue = null;
+                }
                 e.Handled = true;
+            }
             private void TextEdit1_EditValueChanging(object sender, DevExpress.XtraEditors.Controls.ChangingEventArgs e)
+            {
                 Model.Location location = (Model.Location)e.NewValue;
-...
                     symbolDatas.Add(new Tuple<string, string, string, bool>(_uid, _name, _SPPIDSymbolPath, false));
+                }
                 foreach (DataRow row in linePropertyDT.Rows)
+                {
                     string _uid = row["UID"].ToString();

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 e88aae98