Selaa lähdekoodia

온도 5도씩 증가하도록 수정 / TableSetting 에서 온도 제어시 Text도 같이 변경하도록 수정

YJ 5 vuotta sitten
vanhempi
commit
9b49dac237

BIN
.vs/Jdas_Mbic/v15/.suo


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-shm


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-wal


+ 230 - 226
Jdas_Mbic/Main.Designer.cs

@@ -33,6 +33,11 @@
33 33
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
34 34
             this.tabControl1 = new System.Windows.Forms.TabControl();
35 35
             this.tabPage_Main = new System.Windows.Forms.TabPage();
36
+            this.groupBox_Temp = new System.Windows.Forms.GroupBox();
37
+            this.label_Temp = new System.Windows.Forms.Label();
38
+            this.label33 = new System.Windows.Forms.Label();
39
+            this.pictureBox26 = new System.Windows.Forms.PictureBox();
40
+            this.pictureBox27 = new System.Windows.Forms.PictureBox();
36 41
             this.groupBox5 = new System.Windows.Forms.GroupBox();
37 42
             this.label19 = new System.Windows.Forms.Label();
38 43
             this.numericUpDown6 = new System.Windows.Forms.NumericUpDown();
@@ -112,6 +117,17 @@
112 117
             this.cmBaudRate = new System.Windows.Forms.Label();
113 118
             this.comboBox_baudrate = new System.Windows.Forms.ComboBox();
114 119
             this.tabPage_Table = new System.Windows.Forms.TabPage();
120
+            this.groupBox7 = new System.Windows.Forms.GroupBox();
121
+            this.radioButton_ATT4 = new System.Windows.Forms.RadioButton();
122
+            this.radioButton_ATT3 = new System.Windows.Forms.RadioButton();
123
+            this.radioButton_ATT2 = new System.Windows.Forms.RadioButton();
124
+            this.radioButton_ATT1 = new System.Windows.Forms.RadioButton();
125
+            this.button_TableUL = new System.Windows.Forms.Button();
126
+            this.button_TableDL = new System.Windows.Forms.Button();
127
+            this.label_Table_ATTUL = new System.Windows.Forms.Label();
128
+            this.numericUpDown9 = new System.Windows.Forms.NumericUpDown();
129
+            this.label_Table_ATTDL = new System.Windows.Forms.Label();
130
+            this.numericUpDown10 = new System.Windows.Forms.NumericUpDown();
115 131
             this.groupBox6 = new System.Windows.Forms.GroupBox();
116 132
             this.label31 = new System.Windows.Forms.Label();
117 133
             this.label30 = new System.Windows.Forms.Label();
@@ -135,25 +151,12 @@
135 151
             this.Column_Offset = new System.Windows.Forms.DataGridViewTextBoxColumn();
136 152
             this.serialPort_JdasMbic = new System.IO.Ports.SerialPort(this.components);
137 153
             this.timer_JdasMbic = new System.Windows.Forms.Timer(this.components);
138
-            this.groupBox7 = new System.Windows.Forms.GroupBox();
139
-            this.label32 = new System.Windows.Forms.Label();
140
-            this.numericUpDown9 = new System.Windows.Forms.NumericUpDown();
141
-            this.label34 = new System.Windows.Forms.Label();
142
-            this.numericUpDown10 = new System.Windows.Forms.NumericUpDown();
143
-            this.button1 = new System.Windows.Forms.Button();
144
-            this.button2 = new System.Windows.Forms.Button();
145
-            this.radioButton_ATT1 = new System.Windows.Forms.RadioButton();
146
-            this.radioButton_ATT2 = new System.Windows.Forms.RadioButton();
147
-            this.radioButton_ATT3 = new System.Windows.Forms.RadioButton();
148
-            this.radioButton_ATT4 = new System.Windows.Forms.RadioButton();
149
-            this.groupBox_Temp = new System.Windows.Forms.GroupBox();
150
-            this.pictureBox26 = new System.Windows.Forms.PictureBox();
151
-            this.pictureBox27 = new System.Windows.Forms.PictureBox();
152
-            this.label_Temp = new System.Windows.Forms.Label();
153
-            this.label33 = new System.Windows.Forms.Label();
154 154
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
155 155
             this.tabControl1.SuspendLayout();
156 156
             this.tabPage_Main.SuspendLayout();
157
+            this.groupBox_Temp.SuspendLayout();
158
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).BeginInit();
159
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).BeginInit();
157 160
             this.groupBox5.SuspendLayout();
158 161
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit();
159 162
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).BeginInit();
@@ -197,18 +200,15 @@
197 200
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_RX)).BeginInit();
198 201
             this.groupBox9.SuspendLayout();
199 202
             this.tabPage_Table.SuspendLayout();
203
+            this.groupBox7.SuspendLayout();
204
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit();
205
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).BeginInit();
200 206
             this.groupBox6.SuspendLayout();
201 207
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).BeginInit();
202 208
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_MultiOffset)).BeginInit();
203 209
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_MultiSet)).BeginInit();
204 210
             this.groupBox3.SuspendLayout();
205 211
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_TableSetting)).BeginInit();
206
-            this.groupBox7.SuspendLayout();
207
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit();
208
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).BeginInit();
209
-            this.groupBox_Temp.SuspendLayout();
210
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).BeginInit();
211
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).BeginInit();
212 212
             this.SuspendLayout();
213 213
             // 
214 214
             // pictureBox1
@@ -247,6 +247,60 @@
247 247
             this.tabPage_Main.Text = "Main";
248 248
             this.tabPage_Main.UseVisualStyleBackColor = true;
249 249
             // 
250
+            // groupBox_Temp
251
+            // 
252
+            this.groupBox_Temp.Controls.Add(this.label_Temp);
253
+            this.groupBox_Temp.Controls.Add(this.label33);
254
+            this.groupBox_Temp.Controls.Add(this.pictureBox26);
255
+            this.groupBox_Temp.Controls.Add(this.pictureBox27);
256
+            this.groupBox_Temp.Location = new System.Drawing.Point(3, 300);
257
+            this.groupBox_Temp.Name = "groupBox_Temp";
258
+            this.groupBox_Temp.Size = new System.Drawing.Size(206, 72);
259
+            this.groupBox_Temp.TabIndex = 141;
260
+            this.groupBox_Temp.TabStop = false;
261
+            // 
262
+            // label_Temp
263
+            // 
264
+            this.label_Temp.AutoSize = true;
265
+            this.label_Temp.Location = new System.Drawing.Point(13, 19);
266
+            this.label_Temp.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
267
+            this.label_Temp.Name = "label_Temp";
268
+            this.label_Temp.Size = new System.Drawing.Size(77, 12);
269
+            this.label_Temp.TabIndex = 145;
270
+            this.label_Temp.Text = "Temperature";
271
+            // 
272
+            // label33
273
+            // 
274
+            this.label33.AutoSize = true;
275
+            this.label33.Location = new System.Drawing.Point(42, 44);
276
+            this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
277
+            this.label33.Name = "label33";
278
+            this.label33.Size = new System.Drawing.Size(29, 12);
279
+            this.label33.TabIndex = 146;
280
+            this.label33.Text = "0.0V";
281
+            // 
282
+            // pictureBox26
283
+            // 
284
+            this.pictureBox26.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox26.Image")));
285
+            this.pictureBox26.Location = new System.Drawing.Point(155, 20);
286
+            this.pictureBox26.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
287
+            this.pictureBox26.Name = "pictureBox26";
288
+            this.pictureBox26.Size = new System.Drawing.Size(37, 36);
289
+            this.pictureBox26.TabIndex = 142;
290
+            this.pictureBox26.TabStop = false;
291
+            this.pictureBox26.Tag = "2";
292
+            // 
293
+            // pictureBox27
294
+            // 
295
+            this.pictureBox27.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox27.Image")));
296
+            this.pictureBox27.Location = new System.Drawing.Point(155, 20);
297
+            this.pictureBox27.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
298
+            this.pictureBox27.Name = "pictureBox27";
299
+            this.pictureBox27.Size = new System.Drawing.Size(37, 36);
300
+            this.pictureBox27.TabIndex = 144;
301
+            this.pictureBox27.TabStop = false;
302
+            this.pictureBox27.Tag = "1";
303
+            // 
250 304
             // groupBox5
251 305
             // 
252 306
             this.groupBox5.Controls.Add(this.label19);
@@ -1236,6 +1290,148 @@
1236 1290
             this.tabPage_Table.Text = "Table";
1237 1291
             this.tabPage_Table.UseVisualStyleBackColor = true;
1238 1292
             // 
1293
+            // groupBox7
1294
+            // 
1295
+            this.groupBox7.Controls.Add(this.radioButton_ATT4);
1296
+            this.groupBox7.Controls.Add(this.radioButton_ATT3);
1297
+            this.groupBox7.Controls.Add(this.radioButton_ATT2);
1298
+            this.groupBox7.Controls.Add(this.radioButton_ATT1);
1299
+            this.groupBox7.Controls.Add(this.button_TableUL);
1300
+            this.groupBox7.Controls.Add(this.button_TableDL);
1301
+            this.groupBox7.Controls.Add(this.label_Table_ATTUL);
1302
+            this.groupBox7.Controls.Add(this.numericUpDown9);
1303
+            this.groupBox7.Controls.Add(this.label_Table_ATTDL);
1304
+            this.groupBox7.Controls.Add(this.numericUpDown10);
1305
+            this.groupBox7.Location = new System.Drawing.Point(338, 261);
1306
+            this.groupBox7.Name = "groupBox7";
1307
+            this.groupBox7.Size = new System.Drawing.Size(493, 117);
1308
+            this.groupBox7.TabIndex = 2;
1309
+            this.groupBox7.TabStop = false;
1310
+            // 
1311
+            // radioButton_ATT4
1312
+            // 
1313
+            this.radioButton_ATT4.AutoSize = true;
1314
+            this.radioButton_ATT4.Location = new System.Drawing.Point(338, 20);
1315
+            this.radioButton_ATT4.Name = "radioButton_ATT4";
1316
+            this.radioButton_ATT4.Size = new System.Drawing.Size(53, 16);
1317
+            this.radioButton_ATT4.TabIndex = 110;
1318
+            this.radioButton_ATT4.Text = "ATT4";
1319
+            this.radioButton_ATT4.UseVisualStyleBackColor = true;
1320
+            this.radioButton_ATT4.CheckedChanged += new System.EventHandler(this.radioButton_ATT_CheckedChanged);
1321
+            // 
1322
+            // radioButton_ATT3
1323
+            // 
1324
+            this.radioButton_ATT3.AutoSize = true;
1325
+            this.radioButton_ATT3.Location = new System.Drawing.Point(240, 20);
1326
+            this.radioButton_ATT3.Name = "radioButton_ATT3";
1327
+            this.radioButton_ATT3.Size = new System.Drawing.Size(53, 16);
1328
+            this.radioButton_ATT3.TabIndex = 110;
1329
+            this.radioButton_ATT3.Text = "ATT3";
1330
+            this.radioButton_ATT3.UseVisualStyleBackColor = true;
1331
+            this.radioButton_ATT3.CheckedChanged += new System.EventHandler(this.radioButton_ATT_CheckedChanged);
1332
+            // 
1333
+            // radioButton_ATT2
1334
+            // 
1335
+            this.radioButton_ATT2.AutoSize = true;
1336
+            this.radioButton_ATT2.Location = new System.Drawing.Point(142, 20);
1337
+            this.radioButton_ATT2.Name = "radioButton_ATT2";
1338
+            this.radioButton_ATT2.Size = new System.Drawing.Size(53, 16);
1339
+            this.radioButton_ATT2.TabIndex = 110;
1340
+            this.radioButton_ATT2.Text = "ATT2";
1341
+            this.radioButton_ATT2.UseVisualStyleBackColor = true;
1342
+            this.radioButton_ATT2.CheckedChanged += new System.EventHandler(this.radioButton_ATT_CheckedChanged);
1343
+            // 
1344
+            // radioButton_ATT1
1345
+            // 
1346
+            this.radioButton_ATT1.AutoSize = true;
1347
+            this.radioButton_ATT1.Checked = true;
1348
+            this.radioButton_ATT1.Location = new System.Drawing.Point(44, 20);
1349
+            this.radioButton_ATT1.Name = "radioButton_ATT1";
1350
+            this.radioButton_ATT1.Size = new System.Drawing.Size(53, 16);
1351
+            this.radioButton_ATT1.TabIndex = 110;
1352
+            this.radioButton_ATT1.TabStop = true;
1353
+            this.radioButton_ATT1.Text = "ATT1";
1354
+            this.radioButton_ATT1.UseVisualStyleBackColor = true;
1355
+            this.radioButton_ATT1.CheckedChanged += new System.EventHandler(this.radioButton_ATT_CheckedChanged);
1356
+            // 
1357
+            // button_TableUL
1358
+            // 
1359
+            this.button_TableUL.Location = new System.Drawing.Point(291, 85);
1360
+            this.button_TableUL.Name = "button_TableUL";
1361
+            this.button_TableUL.Size = new System.Drawing.Size(75, 23);
1362
+            this.button_TableUL.TabIndex = 108;
1363
+            this.button_TableUL.Text = "APPLY";
1364
+            this.button_TableUL.UseVisualStyleBackColor = true;
1365
+            this.button_TableUL.Click += new System.EventHandler(this.button_TableUL_Click);
1366
+            // 
1367
+            // button_TableDL
1368
+            // 
1369
+            this.button_TableDL.Location = new System.Drawing.Point(291, 55);
1370
+            this.button_TableDL.Name = "button_TableDL";
1371
+            this.button_TableDL.Size = new System.Drawing.Size(75, 23);
1372
+            this.button_TableDL.TabIndex = 109;
1373
+            this.button_TableDL.Text = "APPLY";
1374
+            this.button_TableDL.UseVisualStyleBackColor = true;
1375
+            this.button_TableDL.Click += new System.EventHandler(this.button_TableDL_Click);
1376
+            // 
1377
+            // label_Table_ATTUL
1378
+            // 
1379
+            this.label_Table_ATTUL.AutoSize = true;
1380
+            this.label_Table_ATTUL.Location = new System.Drawing.Point(59, 92);
1381
+            this.label_Table_ATTUL.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
1382
+            this.label_Table_ATTUL.Name = "label_Table_ATTUL";
1383
+            this.label_Table_ATTUL.Size = new System.Drawing.Size(56, 12);
1384
+            this.label_Table_ATTUL.TabIndex = 104;
1385
+            this.label_Table_ATTUL.Text = "ATT_UL1";
1386
+            // 
1387
+            // numericUpDown9
1388
+            // 
1389
+            this.numericUpDown9.DecimalPlaces = 1;
1390
+            this.numericUpDown9.Increment = new decimal(new int[] {
1391
+            5,
1392
+            0,
1393
+            0,
1394
+            65536});
1395
+            this.numericUpDown9.Location = new System.Drawing.Point(150, 87);
1396
+            this.numericUpDown9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
1397
+            this.numericUpDown9.Maximum = new decimal(new int[] {
1398
+            30,
1399
+            0,
1400
+            0,
1401
+            0});
1402
+            this.numericUpDown9.Name = "numericUpDown9";
1403
+            this.numericUpDown9.Size = new System.Drawing.Size(120, 21);
1404
+            this.numericUpDown9.TabIndex = 106;
1405
+            // 
1406
+            // label_Table_ATTDL
1407
+            // 
1408
+            this.label_Table_ATTDL.AutoSize = true;
1409
+            this.label_Table_ATTDL.Location = new System.Drawing.Point(59, 59);
1410
+            this.label_Table_ATTDL.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
1411
+            this.label_Table_ATTDL.Name = "label_Table_ATTDL";
1412
+            this.label_Table_ATTDL.Size = new System.Drawing.Size(56, 12);
1413
+            this.label_Table_ATTDL.TabIndex = 105;
1414
+            this.label_Table_ATTDL.Text = "ATT_DL1";
1415
+            // 
1416
+            // numericUpDown10
1417
+            // 
1418
+            this.numericUpDown10.DecimalPlaces = 1;
1419
+            this.numericUpDown10.Increment = new decimal(new int[] {
1420
+            5,
1421
+            0,
1422
+            0,
1423
+            65536});
1424
+            this.numericUpDown10.Location = new System.Drawing.Point(150, 55);
1425
+            this.numericUpDown10.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
1426
+            this.numericUpDown10.Maximum = new decimal(new int[] {
1427
+            30,
1428
+            0,
1429
+            0,
1430
+            0});
1431
+            this.numericUpDown10.Name = "numericUpDown10";
1432
+            this.numericUpDown10.Size = new System.Drawing.Size(120, 21);
1433
+            this.numericUpDown10.TabIndex = 107;
1434
+            // 
1239 1435
             // groupBox6
1240 1436
             // 
1241 1437
             this.groupBox6.Controls.Add(this.label31);
@@ -1471,198 +1667,6 @@
1471 1667
             // 
1472 1668
             this.timer_JdasMbic.Tick += new System.EventHandler(this.timer1_Tick);
1473 1669
             // 
1474
-            // groupBox7
1475
-            // 
1476
-            this.groupBox7.Controls.Add(this.radioButton_ATT4);
1477
-            this.groupBox7.Controls.Add(this.radioButton_ATT3);
1478
-            this.groupBox7.Controls.Add(this.radioButton_ATT2);
1479
-            this.groupBox7.Controls.Add(this.radioButton_ATT1);
1480
-            this.groupBox7.Controls.Add(this.button1);
1481
-            this.groupBox7.Controls.Add(this.button2);
1482
-            this.groupBox7.Controls.Add(this.label32);
1483
-            this.groupBox7.Controls.Add(this.numericUpDown9);
1484
-            this.groupBox7.Controls.Add(this.label34);
1485
-            this.groupBox7.Controls.Add(this.numericUpDown10);
1486
-            this.groupBox7.Location = new System.Drawing.Point(338, 261);
1487
-            this.groupBox7.Name = "groupBox7";
1488
-            this.groupBox7.Size = new System.Drawing.Size(493, 117);
1489
-            this.groupBox7.TabIndex = 2;
1490
-            this.groupBox7.TabStop = false;
1491
-            // 
1492
-            // label32
1493
-            // 
1494
-            this.label32.AutoSize = true;
1495
-            this.label32.Location = new System.Drawing.Point(59, 92);
1496
-            this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
1497
-            this.label32.Name = "label32";
1498
-            this.label32.Size = new System.Drawing.Size(56, 12);
1499
-            this.label32.TabIndex = 104;
1500
-            this.label32.Text = "ATT_UL3";
1501
-            // 
1502
-            // numericUpDown9
1503
-            // 
1504
-            this.numericUpDown9.DecimalPlaces = 1;
1505
-            this.numericUpDown9.Increment = new decimal(new int[] {
1506
-            5,
1507
-            0,
1508
-            0,
1509
-            65536});
1510
-            this.numericUpDown9.Location = new System.Drawing.Point(150, 87);
1511
-            this.numericUpDown9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
1512
-            this.numericUpDown9.Maximum = new decimal(new int[] {
1513
-            30,
1514
-            0,
1515
-            0,
1516
-            0});
1517
-            this.numericUpDown9.Name = "numericUpDown9";
1518
-            this.numericUpDown9.Size = new System.Drawing.Size(120, 21);
1519
-            this.numericUpDown9.TabIndex = 106;
1520
-            // 
1521
-            // label34
1522
-            // 
1523
-            this.label34.AutoSize = true;
1524
-            this.label34.Location = new System.Drawing.Point(59, 59);
1525
-            this.label34.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
1526
-            this.label34.Name = "label34";
1527
-            this.label34.Size = new System.Drawing.Size(56, 12);
1528
-            this.label34.TabIndex = 105;
1529
-            this.label34.Text = "ATT_DL3";
1530
-            // 
1531
-            // numericUpDown10
1532
-            // 
1533
-            this.numericUpDown10.DecimalPlaces = 1;
1534
-            this.numericUpDown10.Increment = new decimal(new int[] {
1535
-            5,
1536
-            0,
1537
-            0,
1538
-            65536});
1539
-            this.numericUpDown10.Location = new System.Drawing.Point(150, 55);
1540
-            this.numericUpDown10.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
1541
-            this.numericUpDown10.Maximum = new decimal(new int[] {
1542
-            30,
1543
-            0,
1544
-            0,
1545
-            0});
1546
-            this.numericUpDown10.Name = "numericUpDown10";
1547
-            this.numericUpDown10.Size = new System.Drawing.Size(120, 21);
1548
-            this.numericUpDown10.TabIndex = 107;
1549
-            // 
1550
-            // button1
1551
-            // 
1552
-            this.button1.Location = new System.Drawing.Point(291, 85);
1553
-            this.button1.Name = "button1";
1554
-            this.button1.Size = new System.Drawing.Size(75, 23);
1555
-            this.button1.TabIndex = 108;
1556
-            this.button1.Text = "APPLY";
1557
-            this.button1.UseVisualStyleBackColor = true;
1558
-            // 
1559
-            // button2
1560
-            // 
1561
-            this.button2.Location = new System.Drawing.Point(291, 55);
1562
-            this.button2.Name = "button2";
1563
-            this.button2.Size = new System.Drawing.Size(75, 23);
1564
-            this.button2.TabIndex = 109;
1565
-            this.button2.Text = "APPLY";
1566
-            this.button2.UseVisualStyleBackColor = true;
1567
-            // 
1568
-            // radioButton_ATT1
1569
-            // 
1570
-            this.radioButton_ATT1.AutoSize = true;
1571
-            this.radioButton_ATT1.Location = new System.Drawing.Point(44, 20);
1572
-            this.radioButton_ATT1.Name = "radioButton_ATT1";
1573
-            this.radioButton_ATT1.Size = new System.Drawing.Size(53, 16);
1574
-            this.radioButton_ATT1.TabIndex = 110;
1575
-            this.radioButton_ATT1.TabStop = true;
1576
-            this.radioButton_ATT1.Text = "ATT1";
1577
-            this.radioButton_ATT1.UseVisualStyleBackColor = true;
1578
-            // 
1579
-            // radioButton_ATT2
1580
-            // 
1581
-            this.radioButton_ATT2.AutoSize = true;
1582
-            this.radioButton_ATT2.Location = new System.Drawing.Point(142, 20);
1583
-            this.radioButton_ATT2.Name = "radioButton_ATT2";
1584
-            this.radioButton_ATT2.Size = new System.Drawing.Size(53, 16);
1585
-            this.radioButton_ATT2.TabIndex = 110;
1586
-            this.radioButton_ATT2.TabStop = true;
1587
-            this.radioButton_ATT2.Text = "ATT2";
1588
-            this.radioButton_ATT2.UseVisualStyleBackColor = true;
1589
-            // 
1590
-            // radioButton_ATT3
1591
-            // 
1592
-            this.radioButton_ATT3.AutoSize = true;
1593
-            this.radioButton_ATT3.Location = new System.Drawing.Point(240, 20);
1594
-            this.radioButton_ATT3.Name = "radioButton_ATT3";
1595
-            this.radioButton_ATT3.Size = new System.Drawing.Size(53, 16);
1596
-            this.radioButton_ATT3.TabIndex = 110;
1597
-            this.radioButton_ATT3.TabStop = true;
1598
-            this.radioButton_ATT3.Text = "ATT3";
1599
-            this.radioButton_ATT3.UseVisualStyleBackColor = true;
1600
-            // 
1601
-            // radioButton_ATT4
1602
-            // 
1603
-            this.radioButton_ATT4.AutoSize = true;
1604
-            this.radioButton_ATT4.Location = new System.Drawing.Point(338, 20);
1605
-            this.radioButton_ATT4.Name = "radioButton_ATT4";
1606
-            this.radioButton_ATT4.Size = new System.Drawing.Size(53, 16);
1607
-            this.radioButton_ATT4.TabIndex = 110;
1608
-            this.radioButton_ATT4.TabStop = true;
1609
-            this.radioButton_ATT4.Text = "ATT4";
1610
-            this.radioButton_ATT4.UseVisualStyleBackColor = true;
1611
-            // 
1612
-            // groupBox_Temp
1613
-            // 
1614
-            this.groupBox_Temp.Controls.Add(this.label_Temp);
1615
-            this.groupBox_Temp.Controls.Add(this.label33);
1616
-            this.groupBox_Temp.Controls.Add(this.pictureBox26);
1617
-            this.groupBox_Temp.Controls.Add(this.pictureBox27);
1618
-            this.groupBox_Temp.Location = new System.Drawing.Point(3, 300);
1619
-            this.groupBox_Temp.Name = "groupBox_Temp";
1620
-            this.groupBox_Temp.Size = new System.Drawing.Size(206, 72);
1621
-            this.groupBox_Temp.TabIndex = 141;
1622
-            this.groupBox_Temp.TabStop = false;
1623
-            // 
1624
-            // pictureBox26
1625
-            // 
1626
-            this.pictureBox26.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox26.Image")));
1627
-            this.pictureBox26.Location = new System.Drawing.Point(155, 20);
1628
-            this.pictureBox26.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
1629
-            this.pictureBox26.Name = "pictureBox26";
1630
-            this.pictureBox26.Size = new System.Drawing.Size(37, 36);
1631
-            this.pictureBox26.TabIndex = 142;
1632
-            this.pictureBox26.TabStop = false;
1633
-            this.pictureBox26.Tag = "2";
1634
-            // 
1635
-            // pictureBox27
1636
-            // 
1637
-            this.pictureBox27.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox27.Image")));
1638
-            this.pictureBox27.Location = new System.Drawing.Point(155, 20);
1639
-            this.pictureBox27.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
1640
-            this.pictureBox27.Name = "pictureBox27";
1641
-            this.pictureBox27.Size = new System.Drawing.Size(37, 36);
1642
-            this.pictureBox27.TabIndex = 144;
1643
-            this.pictureBox27.TabStop = false;
1644
-            this.pictureBox27.Tag = "1";
1645
-            // 
1646
-            // label_Temp
1647
-            // 
1648
-            this.label_Temp.AutoSize = true;
1649
-            this.label_Temp.Location = new System.Drawing.Point(13, 19);
1650
-            this.label_Temp.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
1651
-            this.label_Temp.Name = "label_Temp";
1652
-            this.label_Temp.Size = new System.Drawing.Size(77, 12);
1653
-            this.label_Temp.TabIndex = 145;
1654
-            this.label_Temp.Text = "Temperature";
1655
-            // 
1656
-            // label33
1657
-            // 
1658
-            this.label33.AutoSize = true;
1659
-            this.label33.Location = new System.Drawing.Point(42, 44);
1660
-            this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
1661
-            this.label33.Name = "label33";
1662
-            this.label33.Size = new System.Drawing.Size(29, 12);
1663
-            this.label33.TabIndex = 146;
1664
-            this.label33.Text = "0.0V";
1665
-            // 
1666 1670
             // JdasMbic
1667 1671
             // 
1668 1672
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1676,6 +1680,10 @@
1676 1680
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
1677 1681
             this.tabControl1.ResumeLayout(false);
1678 1682
             this.tabPage_Main.ResumeLayout(false);
1683
+            this.groupBox_Temp.ResumeLayout(false);
1684
+            this.groupBox_Temp.PerformLayout();
1685
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).EndInit();
1686
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).EndInit();
1679 1687
             this.groupBox5.ResumeLayout(false);
1680 1688
             this.groupBox5.PerformLayout();
1681 1689
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit();
@@ -1724,6 +1732,10 @@
1724 1732
             this.groupBox9.ResumeLayout(false);
1725 1733
             this.groupBox9.PerformLayout();
1726 1734
             this.tabPage_Table.ResumeLayout(false);
1735
+            this.groupBox7.ResumeLayout(false);
1736
+            this.groupBox7.PerformLayout();
1737
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit();
1738
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit();
1727 1739
             this.groupBox6.ResumeLayout(false);
1728 1740
             this.groupBox6.PerformLayout();
1729 1741
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).EndInit();
@@ -1732,14 +1744,6 @@
1732 1744
             this.groupBox3.ResumeLayout(false);
1733 1745
             this.groupBox3.PerformLayout();
1734 1746
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_TableSetting)).EndInit();
1735
-            this.groupBox7.ResumeLayout(false);
1736
-            this.groupBox7.PerformLayout();
1737
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit();
1738
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit();
1739
-            this.groupBox_Temp.ResumeLayout(false);
1740
-            this.groupBox_Temp.PerformLayout();
1741
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).EndInit();
1742
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).EndInit();
1743 1747
             this.ResumeLayout(false);
1744 1748
 
1745 1749
         }
@@ -1852,16 +1856,16 @@
1852 1856
         private System.IO.Ports.SerialPort serialPort_JdasMbic;
1853 1857
         private System.Windows.Forms.Timer timer_JdasMbic;
1854 1858
         private System.Windows.Forms.GroupBox groupBox7;
1855
-        private System.Windows.Forms.Button button1;
1856
-        private System.Windows.Forms.Label label32;
1859
+        private System.Windows.Forms.Button button_TableUL;
1860
+        private System.Windows.Forms.Label label_Table_ATTUL;
1857 1861
         public System.Windows.Forms.NumericUpDown numericUpDown9;
1858
-        private System.Windows.Forms.Label label34;
1862
+        private System.Windows.Forms.Label label_Table_ATTDL;
1859 1863
         public System.Windows.Forms.NumericUpDown numericUpDown10;
1860 1864
         private System.Windows.Forms.RadioButton radioButton_ATT4;
1861 1865
         private System.Windows.Forms.RadioButton radioButton_ATT3;
1862 1866
         private System.Windows.Forms.RadioButton radioButton_ATT2;
1863 1867
         private System.Windows.Forms.RadioButton radioButton_ATT1;
1864
-        private System.Windows.Forms.Button button2;
1868
+        private System.Windows.Forms.Button button_TableDL;
1865 1869
         private System.Windows.Forms.GroupBox groupBox_Temp;
1866 1870
         private System.Windows.Forms.Label label_Temp;
1867 1871
         public System.Windows.Forms.Label label33;

+ 40 - 2
Jdas_Mbic/Main.cs

@@ -107,12 +107,12 @@ namespace Jdas_Mbic
107 107
             string tempstr = "";
108 108
             
109 109
             double Temp_Data = Table_Temp_DefaultValue;
110
-            for (int i = 0; i < 46; i++)
110
+            for (int i = 0; i < 10; i++)
111 111
             {
112 112
                 dataGridView_TableSetting.Rows.Add();
113 113
                 tempstr = string.Format("{0:0}", Temp_Data);
114 114
                 dataGridView_TableSetting[0, i].Value = Convert.ToString(tempstr) + " ℃";
115
-                Temp_Data = Temp_Data - 1;
115
+                Temp_Data = Temp_Data - 5;
116 116
 
117 117
             }
118 118
             foreach (DataGridViewRow row in this.dataGridView_TableSetting.Rows)
@@ -508,5 +508,43 @@ namespace Jdas_Mbic
508 508
         {
509 509
 
510 510
         }
511
+
512
+        private void radioButton_ATT_CheckedChanged(object sender, EventArgs e)
513
+        {
514
+            RadioButton radioButton = (RadioButton)sender;
515
+
516
+            switch (radioButton.Text)
517
+            {
518
+                case "ATT1":
519
+                    label_Table_ATTDL.Text = "ATT_DL1";
520
+                    label_Table_ATTUL.Text = "ATT_UL1";
521
+                    break;
522
+                case "ATT2":
523
+                    label_Table_ATTDL.Text = "ATT_DL2";
524
+                    label_Table_ATTUL.Text = "ATT_UL2";
525
+                    break;
526
+                case "ATT3":
527
+                    label_Table_ATTDL.Text = "ATT_DL3";
528
+                    label_Table_ATTUL.Text = "ATT_UL3";
529
+                    break;
530
+                case "ATT4":
531
+                    label_Table_ATTDL.Text = "ATT_DL4";
532
+                    label_Table_ATTUL.Text = "ATT_UL4";
533
+                    break;
534
+               
535
+                    
536
+                
537
+            }
538
+        }
539
+
540
+        private void button_TableDL_Click(object sender, EventArgs e)
541
+        {
542
+
543
+        }
544
+
545
+        private void button_TableUL_Click(object sender, EventArgs e)
546
+        {
547
+
548
+        }
511 549
     }
512 550
 }

BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.pdb


+ 1 - 1
Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
1
-dc6033e67fe295d45a9ff8b4bc602f92f9046681
1
+e6ab130e68daffa7e26893f0ba4481efd3304b65

BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.GenerateResource.cache


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.pdb