diff --git a/INT63DC_6CH.suo b/INT63DC_6CH.suo index e4b92e2..b09e5a7 100644 Binary files a/INT63DC_6CH.suo and b/INT63DC_6CH.suo differ diff --git a/INT63DC_6CH/Controls/ControlMainDisplayEachBarGraph6.Designer.cs b/INT63DC_6CH/Controls/ControlMainDisplayEachBarGraph6.Designer.cs index 16c320c..1c1e9d6 100644 --- a/INT63DC_6CH/Controls/ControlMainDisplayEachBarGraph6.Designer.cs +++ b/INT63DC_6CH/Controls/ControlMainDisplayEachBarGraph6.Designer.cs @@ -227,7 +227,7 @@ this.labelWeightValue6.BackPictureBox2 = null; this.labelWeightValue6.BorderColor = System.Drawing.Color.Black; this.labelWeightValue6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWeightValue6.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelWeightValue6.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelWeightValue6.InitVisible = true; this.labelWeightValue6.LineSpacing = 0F; this.labelWeightValue6.Location = new System.Drawing.Point(776, 360); @@ -247,7 +247,7 @@ this.labelWeightValue5.BackPictureBox2 = null; this.labelWeightValue5.BorderColor = System.Drawing.Color.Black; this.labelWeightValue5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWeightValue5.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelWeightValue5.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelWeightValue5.InitVisible = true; this.labelWeightValue5.LineSpacing = 0F; this.labelWeightValue5.Location = new System.Drawing.Point(678, 360); @@ -267,7 +267,7 @@ this.labelWeightValue4.BackPictureBox2 = null; this.labelWeightValue4.BorderColor = System.Drawing.Color.Black; this.labelWeightValue4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWeightValue4.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelWeightValue4.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelWeightValue4.InitVisible = true; this.labelWeightValue4.LineSpacing = 0F; this.labelWeightValue4.Location = new System.Drawing.Point(580, 360); @@ -287,7 +287,7 @@ this.labelWeightValue3.BackPictureBox2 = null; this.labelWeightValue3.BorderColor = System.Drawing.Color.Black; this.labelWeightValue3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWeightValue3.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelWeightValue3.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelWeightValue3.InitVisible = true; this.labelWeightValue3.LineSpacing = 0F; this.labelWeightValue3.Location = new System.Drawing.Point(482, 360); @@ -307,7 +307,7 @@ this.labelWeightValue2.BackPictureBox2 = null; this.labelWeightValue2.BorderColor = System.Drawing.Color.Black; this.labelWeightValue2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWeightValue2.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelWeightValue2.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelWeightValue2.InitVisible = true; this.labelWeightValue2.LineSpacing = 0F; this.labelWeightValue2.Location = new System.Drawing.Point(384, 360); @@ -327,7 +327,7 @@ this.labelWeightValue1.BackPictureBox2 = null; this.labelWeightValue1.BorderColor = System.Drawing.Color.Black; this.labelWeightValue1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWeightValue1.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelWeightValue1.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelWeightValue1.InitVisible = true; this.labelWeightValue1.LineSpacing = 0F; this.labelWeightValue1.Location = new System.Drawing.Point(286, 360); diff --git a/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs b/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs index 9fee721..fd34ed8 100644 --- a/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs +++ b/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs @@ -721,6 +721,7 @@ this.groupBoxJudgmentSetting.TabIndex = 249; this.groupBoxJudgmentSetting.Text = "판정설정"; this.groupBoxJudgmentSetting.TextColor = System.Drawing.Color.White; + this.groupBoxJudgmentSetting.Visible = false; // // labelTurnDelayTime // @@ -733,7 +734,7 @@ this.labelTurnDelayTime.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold); this.labelTurnDelayTime.InitVisible = true; this.labelTurnDelayTime.LineSpacing = 0F; - this.labelTurnDelayTime.Location = new System.Drawing.Point(215, 93); + this.labelTurnDelayTime.Location = new System.Drawing.Point(215, 57); this.labelTurnDelayTime.Name = "labelTurnDelayTime"; this.labelTurnDelayTime.Size = new System.Drawing.Size(60, 30); this.labelTurnDelayTime.TabIndex = 251; @@ -755,7 +756,7 @@ this.labelStaticTurnDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticTurnDelayTime.InitVisible = true; this.labelStaticTurnDelayTime.LineSpacing = 0F; - this.labelStaticTurnDelayTime.Location = new System.Drawing.Point(19, 93); + this.labelStaticTurnDelayTime.Location = new System.Drawing.Point(19, 57); this.labelStaticTurnDelayTime.Name = "labelStaticTurnDelayTime"; this.labelStaticTurnDelayTime.Size = new System.Drawing.Size(190, 30); this.labelStaticTurnDelayTime.TabIndex = 250; @@ -776,7 +777,7 @@ this.labelStaticJudgmentCount.ForeColor = System.Drawing.Color.White; this.labelStaticJudgmentCount.InitVisible = true; this.labelStaticJudgmentCount.LineSpacing = 0F; - this.labelStaticJudgmentCount.Location = new System.Drawing.Point(19, 57); + this.labelStaticJudgmentCount.Location = new System.Drawing.Point(19, 93); this.labelStaticJudgmentCount.Name = "labelStaticJudgmentCount"; this.labelStaticJudgmentCount.Size = new System.Drawing.Size(190, 30); this.labelStaticJudgmentCount.TabIndex = 242; @@ -838,7 +839,7 @@ this.labelJudgmentCount.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold); this.labelJudgmentCount.InitVisible = true; this.labelJudgmentCount.LineSpacing = 0F; - this.labelJudgmentCount.Location = new System.Drawing.Point(215, 57); + this.labelJudgmentCount.Location = new System.Drawing.Point(215, 93); this.labelJudgmentCount.Name = "labelJudgmentCount"; this.labelJudgmentCount.Size = new System.Drawing.Size(60, 30); this.labelJudgmentCount.TabIndex = 245; diff --git a/INT63DC_6CH/Forms/FormMainDisplay.cs b/INT63DC_6CH/Forms/FormMainDisplay.cs index d97d831..76ef17e 100644 --- a/INT63DC_6CH/Forms/FormMainDisplay.cs +++ b/INT63DC_6CH/Forms/FormMainDisplay.cs @@ -2439,18 +2439,10 @@ namespace INT63DC_6CH.Forms if (this.ParentForm.SystemConfig.IsLogin == true && this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) { this.groupBoxJudgmentSetting.Visible = true; - this.labelJudgmentDelayTime.Visible = true; - this.labelJudgmentCount.Visible = true; - this.labelStaticJudgmentDelayTime.Visible = true; - this.labelStaticJudgmentCount.Visible = true; } else { this.groupBoxJudgmentSetting.Visible = false; - this.labelJudgmentDelayTime.Visible = false; - this.labelJudgmentCount.Visible = false; - this.labelStaticJudgmentDelayTime.Visible = false; - this.labelStaticJudgmentCount.Visible = false; } this.panelSetting.BringToFront(); diff --git a/INT63DC_6CH/bin/Release/INT63DC_ImageDll.dll b/INT63DC_6CH/bin/Release/INT63DC_ImageDll.dll index f0ad310..2dc17cf 100644 Binary files a/INT63DC_6CH/bin/Release/INT63DC_ImageDll.dll and b/INT63DC_6CH/bin/Release/INT63DC_ImageDll.dll differ diff --git a/INT63DC_6CH/bin/Release/INT63DC_ImageDll.pdb b/INT63DC_6CH/bin/Release/INT63DC_ImageDll.pdb index 55d00da..5d15028 100644 Binary files a/INT63DC_6CH/bin/Release/INT63DC_ImageDll.pdb and b/INT63DC_6CH/bin/Release/INT63DC_ImageDll.pdb differ diff --git a/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.dll b/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.dll index f0ad310..2dc17cf 100644 Binary files a/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.dll and b/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.dll differ diff --git a/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.pdb b/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.pdb index 55d00da..5d15028 100644 Binary files a/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.pdb and b/INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.pdb differ diff --git a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache index b1935cc..be0ceaf 100644 Binary files a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache and b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache differ diff --git a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.dll b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.dll index f0ad310..2dc17cf 100644 Binary files a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.dll and b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.dll differ diff --git a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.pdb b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.pdb index 55d00da..5d15028 100644 Binary files a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.pdb and b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.pdb differ diff --git a/INT63DC_ImageDll/obj/Release/ResolveAssemblyReference.cache b/INT63DC_ImageDll/obj/Release/ResolveAssemblyReference.cache deleted file mode 100644 index 0059aa2..0000000 Binary files a/INT63DC_ImageDll/obj/Release/ResolveAssemblyReference.cache and /dev/null differ