HFR GUI 변경 사항 아직 미구현

Jdas_Mbic/Main.Designer.cs

@@ -30,9 +30,9 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(JdasMbic));
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.Mbic_Setting = new System.Windows.Forms.TabControl();
             this.tabPage_Main = new System.Windows.Forms.TabPage();
@@ -2277,17 +2277,17 @@
             // 
             // chart_Table
             // 
-            chartArea1.Name = "ChartArea1";
-            this.chart_Table.ChartAreas.Add(chartArea1);
-            legend1.Name = "Legend1";
-            this.chart_Table.Legends.Add(legend1);
+            chartArea2.Name = "ChartArea1";
+            this.chart_Table.ChartAreas.Add(chartArea2);
+            legend2.Name = "Legend1";
+            this.chart_Table.Legends.Add(legend2);
             this.chart_Table.Location = new System.Drawing.Point(336, 548);
             this.chart_Table.Name = "chart_Table";
-            series1.ChartArea = "ChartArea1";
-            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
-            series1.Legend = "Legend1";
-            series1.Name = "Series1";
-            this.chart_Table.Series.Add(series1);
+            series2.ChartArea = "ChartArea1";
+            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+            series2.Legend = "Legend1";
+            series2.Name = "Series1";
+            this.chart_Table.Series.Add(series2);
             this.chart_Table.Size = new System.Drawing.Size(431, 168);
             this.chart_Table.TabIndex = 8;
             this.chart_Table.Text = "chart1";
@@ -3353,10 +3353,10 @@
             this.numericUpDown_DLI_Shutdown_Threshold.Location = new System.Drawing.Point(176, 16);
             this.numericUpDown_DLI_Shutdown_Threshold.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.numericUpDown_DLI_Shutdown_Threshold.Maximum = new decimal(new int[] {
-            1,
+            7,
             0,
             0,
-            -2147483648});
+            0});
             this.numericUpDown_DLI_Shutdown_Threshold.Minimum = new decimal(new int[] {
             22,
             0,
@@ -3723,7 +3723,7 @@
             // 
             // timer_JdasMbic
             // 
-            this.timer_JdasMbic.Interval = 83;
+            this.timer_JdasMbic.Interval = 166;
             this.timer_JdasMbic.Tick += new System.EventHandler(this.timer1_Tick);
             // 
             // label_CompileDate

Jdas_Mbic/Main.cs

@@ -28,7 +28,7 @@ namespace Jdas_Mbic
     public partial class JdasMbic : Form
     {
         const double Table_Dbm_DefaultValue = 0;//31.5;
-        const int Table_DL_DefaultValue = 5;
+        const int Table_DL_DefaultValue = 7;
         const int Table_UL_DefaultValue = -15;
         const int Table_Temp_DefaultValue = -10;
         Serial serial = new Serial(); // Uart Open
@@ -113,7 +113,7 @@ namespace Jdas_Mbic
             switch (tempenum) {
                 case DLUL_Category.DL_DET:
                     double Temp_DL_Data = Table_DL_DefaultValue;
-                    for (int i = 0; i < 31; i++)
+                    for (int i = 0; i < 33; i++)
                     {
                         dataGridView_TableSetting.Rows.Add();
                         tempstr = string.Format("{0:0}", Temp_DL_Data);
@@ -2416,26 +2416,43 @@ namespace Jdas_Mbic
         private void TableChart_Create()
         {
             DataTable dt = new DataTable();
-//            dt.Columns.Add("Column1");
+            /*string targetStr = dataGridView_TableSetting.Rows[0].Cells[0].Value.ToString();
+            string text = targetStr;
+            var match = Regex.Match(text, "-?\\d+");
+            */
+            ///정수형 변환
+            // int rstInt = int.Parse(tempStr);
+
+            //_body = Regex.Replace(dataGridView_TableSetting.Rows[0].Cells[0].Value.ToString(), @"[^0-9]", "");
+
+            //numericUpDown_TableRef.Value = Convert.ToDecimal(match.Value);
+            //            dt.Columns.Add("Column1");
             //dt.Columns.Add("Column2");
+            chart_Table.Series[0].Points.Clear();
             for (int i = 0; i < dataGridView_TableSetting.RowCount; i++)
             {
                 try
                 {
-                    dt.Rows.Add(Convert.ToDouble(dataGridView_TableSetting[1, i].Value));
+                   /* targetStr = dataGridView_TableSetting.Rows[0].Cells[i].Value.ToString();
+                    match = Regex.Match(text, "-?\\d+");*/
+                    chart_Table.Series[0].Points.AddXY(i,dataGridView_TableSetting[1, i].Value/*match.Value*/);
+                    Thread.Sleep(1);
+                    //dt.Rows.Add(Convert.ToDouble(dataGridView_TableSetting[1, i].Value));
+                    //chart_Table.Series[0].Val
                     // Tmplist.Add(Convert.ToDouble(dataGridView_TableSetting[1, i].Value));
-                 //   chart_Table.Series[0].Points.Add();
+                    //   chart_Table.Series[0].Points.Add();
                     //chart_Table.Invalidate();
                     //chart_Table.Rows[i][1]
                     //table.Rows[i][1] = Convert.ToDouble(dataGridView_TableSetting[1, i].Value);
                 }
                 catch { }
             }
-            chart_Table.DataSource = dt;
+           // chart_Table.DataSource = dt;
+            chart_Table.Update();
             //chart_Table.Series[0].XValueMembers = "Column1";
             //chart_Table.Series[0].YValueMembers = "Column2";
 
-            chart_Table.DataBind();
+            //chart_Table.DataBind();
             //chart_Table.Dispose(false);
 
 
@@ -2511,7 +2528,7 @@ namespace Jdas_Mbic
             }
             
 
-            //TableChart_Create();
+            TableChart_Create();
             /*dataGridView_TableSetting[1, i].Value
             this.Invoke(new StringSend(Table_Text_Set), dataGridView_TableSetting, adcdata.ToString("N2"));*/
 
@@ -2947,9 +2964,9 @@ namespace Jdas_Mbic
         {
             label_CompileDate.Text = "";
             byte[] temp_buf = new byte[TableGetMaxLength];
-            byte[] Temp_MBICResetCmd = { 0x16, 0x16, 0x16, 0x16, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x48, 0x00, 0x14, 0x06, 0x09, 0x00, 0x14, 0x33, 0x00, 0x01, 0x00, 0x04, 0xa7, 0xe0, 0x0e, 0x01, 0x00, 0xac, 0xda, 0x03 };
-            serial.Serial_DataSend(Temp_MBICResetCmd, Temp_MBICResetCmd.Length);
-            return;
+         //   byte[] Temp_MBICResetCmd = { 0x16, 0x16, 0x16, 0x16, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x48, 0x00, 0x14, 0x06, 0x09, 0x00, 0x14, 0x33, 0x00, 0x01, 0x00, 0x04, 0xa7, 0xe0, 0x0e, 0x01, 0x00, 0xac, 0xda, 0x03 };
+           // serial.Serial_DataSend(Temp_MBICResetCmd, Temp_MBICResetCmd.Length);
+            //return;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header] = BLUECELL_HEADER;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type] = (byte)Bluecell_BootProtocol.DATATYPE.BLUECELL_SOFTWARERESET;
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_H] = Convert.ToByte((TableGetMaxLength - 2 & 0xFF00 )>> 8);

Jdas_Mbic/Main.resx

@@ -1264,6 +1264,12 @@
   <metadata name="Column_Offset.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column_DB.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column_Offset.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="pictureBox_UL_Shutdown_ON.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAkCAYAAAAOwvOmAAAABGdBTUEAALGPC/xhBQAACk5JREFUWEft