test: UI 코드, weight 폼 변경 test

2025-06-12 13:28:28 +09:00 · 2025-06-12 13:28:28 +09:00 · a4d577080f
commit a4d577080f
parent dfd6bc4252
3 changed files with 20 additions and 22 deletions
--- a/SalesPacking_MES_API_Project/weightForm.Designer.vb
+++ b/SalesPacking_MES_API_Project/weightForm.Designer.vb
@ -119,7 +119,7 @@ Partial Class weightForm
        'pnNow
        '
        Me.pnNow.Controls.Add(Me.lbNow)
-        Me.pnNow.Location = New System.Drawing.Point(8, 68)
+        Me.pnNow.Location = New System.Drawing.Point(6, 43)
        Me.pnNow.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.pnNow.Name = "pnNow"
        Me.pnNow.Size = New System.Drawing.Size(302, 90)
@ -138,7 +138,7 @@ Partial Class weightForm
        'pnExpect
        '
        Me.pnExpect.Controls.Add(Me.lbExpect)
-        Me.pnExpect.Location = New System.Drawing.Point(24, 186)
+        Me.pnExpect.Location = New System.Drawing.Point(6, 147)
        Me.pnExpect.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.pnExpect.Name = "pnExpect"
        Me.pnExpect.Size = New System.Drawing.Size(243, 95)
@ -157,10 +157,10 @@ Partial Class weightForm
        'pnError
        '
        Me.pnError.Controls.Add(Me.lbError)
-        Me.pnError.Location = New System.Drawing.Point(334, 268)
+        Me.pnError.Location = New System.Drawing.Point(6, 258)
        Me.pnError.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.pnError.Name = "pnError"
-        Me.pnError.Size = New System.Drawing.Size(376, 78)
+        Me.pnError.Size = New System.Drawing.Size(1062, 78)
        Me.pnError.TabIndex = 20
        '
        'lbError
@ -176,7 +176,7 @@ Partial Class weightForm
        '
        Me.pnWeightEX.Controls.Add(Me.lbWeightEX)
        Me.pnWeightEX.Controls.Add(Me.lbWeightEXg)
-        Me.pnWeightEX.Location = New System.Drawing.Point(274, 186)
+        Me.pnWeightEX.Location = New System.Drawing.Point(256, 147)
        Me.pnWeightEX.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.pnWeightEX.Name = "pnWeightEX"
        Me.pnWeightEX.Size = New System.Drawing.Size(225, 95)
@ -206,7 +206,7 @@ Partial Class weightForm
        '
        Me.lbNowg.AutoSize = True
        Me.lbNowg.Font = New System.Drawing.Font("함초롬바탕", 36.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
-        Me.lbNowg.Location = New System.Drawing.Point(671, 80)
+        Me.lbNowg.Location = New System.Drawing.Point(669, 55)
        Me.lbNowg.Name = "lbNowg"
        Me.lbNowg.Size = New System.Drawing.Size(67, 78)
        Me.lbNowg.TabIndex = 2
@ -217,7 +217,7 @@ Partial Class weightForm
        Me.lbNowWeight.BackColor = System.Drawing.SystemColors.Control
        Me.lbNowWeight.Font = New System.Drawing.Font("함초롬바탕", 60.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
        Me.lbNowWeight.ForeColor = System.Drawing.Color.DarkBlue
-        Me.lbNowWeight.Location = New System.Drawing.Point(313, 36)
+        Me.lbNowWeight.Location = New System.Drawing.Point(311, 11)
        Me.lbNowWeight.Name = "lbNowWeight"
        Me.lbNowWeight.Size = New System.Drawing.Size(358, 130)
        Me.lbNowWeight.TabIndex = 12
@ -227,10 +227,10 @@ Partial Class weightForm
        'picb_scale
        '
        Me.picb_scale.Image = CType(resources.GetObject("picb_scale.Image"), System.Drawing.Image)
-        Me.picb_scale.Location = New System.Drawing.Point(717, 52)
+        Me.picb_scale.Location = New System.Drawing.Point(743, 26)
        Me.picb_scale.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.picb_scale.Name = "picb_scale"
-        Me.picb_scale.Size = New System.Drawing.Size(325, 289)
+        Me.picb_scale.Size = New System.Drawing.Size(325, 224)
        Me.picb_scale.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
        Me.picb_scale.TabIndex = 11
        Me.picb_scale.TabStop = False
--- a/SalesPacking_MES_API_Project/weightForm.resx
+++ b/SalesPacking_MES_API_Project/weightForm.resx
@ -121,7 +121,7 @@
  <data name="picb_scale.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACe7SURBVHhe7d0J
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACe7SURBVHhe7d0J
        tHx5Wd/rbpp5FEQZBEEUiOIVRUER4YYh2JggieAN0wWH4HgTE5BJBBGDoKKi4MQSBBQVMAy5IsqgDRgg
        CUYcEEEZjMzIPA/NzfddYje5vr/6n33Oqdq7aj/PWp+1WNr/ql/Vqar9VtWuvc8CAAAAAAAAAAAAAAAA
        AAAAAAAAAAAAAAAAAAAAAAAAAAB25krphumm6TbSCrp5ulG6agJYjUulu6anprem/09ace9Nv52+J9Uw
--- a/SalesPacking_MES_API_Project/weightForm.vb
+++ b/SalesPacking_MES_API_Project/weightForm.vb
@ -7,7 +7,9 @@ Public Class weightForm

    'Private weightErrorPlus As Integer
    'Private weightErrorMinus As Integer
-
+    Private weightError As Double
+    Private upperBound As Double
+    Private lowerBound As Double

    Private weightMode As Boolean
    Private weightStart As Boolean
@ -133,6 +135,8 @@ Public Class weightForm
                    ZeroTimer.Enabled = False
                    lbWeightEX.Text = weightSum
                    lbWeight.Text = "저울에 올려주세요"
+                    'lbError.Text = "(오차: ±" & weightError.ToString("F2") & ")"
+                    lbError.Text = "(오차: ±" & weightError.ToString("F2") & ", 허용: " & lowerBound.ToString("F2") & " ~ " & upperBound.ToString("F2") & ")"
                End If
            Else
                scaledata = Mid(MeasureScale(200), 2, weight.Length)
@ -143,7 +147,8 @@ Public Class weightForm
                    ZeroTimer.Enabled = False
                    lbWeightEX.Text = weightSum
                    lbWeight.Text = "저울에 올려주세요"
-
+                    'lbError.Text = "(오차: ±" & weightError.ToString("F2") & ")"
+                    lbError.Text = "(오차: ±" & weightError.ToString("F2") & ", 허용: " & lowerBound.ToString("F2") & " ~ " & upperBound.ToString("F2") & ")"
                Else
                    ZeroTimer.Enabled = False
                    lbWeight.Text = " 저울을 비워주세요"
@ -193,20 +198,13 @@ Public Class weightForm
    'End Function

    Private Function weight_compare() As Boolean
-        Dim tip As New System.Windows.Forms.ToolTip()
        Dim nowWeight As Double = Double.Parse(lbNowWeight.Text)
        Dim autoErrorRate As Double = 0.02 '오차 계수(k)로 오차 범위 산출 2% 오차

-        Dim weightError As Double = weightSum * autoErrorRate
+        weightError = weightSum * autoErrorRate

-        Dim upperBound As Double = weightSum + weightError
-        Dim lowerBound As Double = weightSum - weightError
-
-        ' 라벨 텍스트 간결하게
-        lbError.Text = "(오차: ±" & weightError.ToString("F2") & ")"
-
-        ' 툴팁에 상세 정보 표시
-        tip.SetToolTip(lbError, "허용구간: " & lowerBound.ToString("F2") & " ~ " & upperBound.ToString("F2"))
+        upperBound = weightSum + weightError
+        lowerBound = weightSum - weightError

        Return (nowWeight >= lowerBound) AndAlso (nowWeight <= upperBound)
    End Function