fix: color list

This commit is contained in:
jiwonRepair 2025-08-28 10:34:05 +09:00
parent 2116d7e556
commit 41bbca808c
2 changed files with 48 additions and 33 deletions

View File

@ -1061,7 +1061,7 @@ Partial Class mainForm
'
Me.cboCsvColor.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
Me.cboCsvColor.FormattingEnabled = True
Me.cboCsvColor.Items.AddRange(New Object() {"White", "ShineMint", "Pink", "Black", "Mint", "Purple", "BlackGold", "Yellow", "WhitePink", "WhiteSky", "WhiteBrown", "Peach", "LineFriendsBrown", "LineFriendsSally", "RubyRed", "TopazOrange", "EmeraldGreen", "SapphireBlue", "TopazBrown", "SitrinGold", "Etc"})
Me.cboCsvColor.Items.AddRange(New Object() {"White", "ShineMint", "Pink", "Black", "Mint", "Purple", "BlackGold", "Yellow", "WhitePink", "WhiteSky", "WhiteBrown", "Peach", "LineFriendsBrown", "LineFriendsSally", "RubyRed", "TopazOrange", "EmeraldGreen", "SapphireBlue", "TopazBrown", "SitrinGold", "Gold", "Etc"})
Me.cboCsvColor.Location = New System.Drawing.Point(65, 88)
Me.cboCsvColor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
Me.cboCsvColor.Name = "cboCsvColor"

View File

@ -223,40 +223,41 @@ Public Class mainForm
Private TDUseCompare As Boolean
Private searchType As Int16
Private Enum maxAlphaColorList
Ruby_Red = 0
Topaz_Orange = 2
Emerald_Green = 3
Sapphire_Blue = 4
Topaz_Brown = 5
Sitrin_Gold = 6
RubyRed = 1
TopazOrange = 2
EmeraldGreen = 3
SapphireBlue = 4
TopazBrown = 5
SitrinGold = 6
End Enum
Private colorTypeMaxAlpha As Int16
Private Enum maxColorList
White = 0
Black = 1
ShineMint = 2
Pink = 3
Black = 4
Yellow = 5
Peach = 6
Mint = 7
Purple = 8
Black_Gold = 9
BlackGold = 9
End Enum
Private colorTypeMax As Int16
Private Enum altoColorList
White = 0
Purple = 8
Black_Gold = 9
BlackGold = 9
End Enum
Private colorTypeAlto As Int16
Private Enum eftColorList
White_Pink = 1
White_Sky = 2
White_Brown = 3
LineFriends_Brown = 4
LineFriends_Sally = 5
WhitePink = 1
WhiteSky = 2
WhiteBrown = 3
LineFriendsBrown = 4
LineFriendsSally = 5
End Enum
Private colorTypeEft As Int16
@ -275,6 +276,10 @@ Public Class mainForm
White = 0
Black = 1
End Enum
Private Enum proSColorList
Gold = 0
End Enum
Private colorTypePro As Int16
Private Enum prodModelList
@ -863,7 +868,7 @@ Public Class mainForm
Return "White"
Case altoColorList.Purple
Return "Purple"
Case altoColorList.Black_Gold
Case altoColorList.BlackGold
Return "BlackGold"
Case Else
Return "ETC"
@ -872,17 +877,15 @@ Public Class mainForm
Private Function fileColorComareForEffectModel() As String 'effect model color'
Select Case colorTypeEft
Case eftColorList.White_Pink
Case eftColorList.WhitePink
Return "WhitePink"
Case eftColorList.White_Sky
Case eftColorList.WhiteSky
Return "WhiteSky"
Case eftColorList.White_Brown
Case eftColorList.WhiteBrown
Return "WhiteBrown"
Case eftColorList.White_Brown
Return "WhiteBrown"
Case eftColorList.LineFriends_Brown
Case eftColorList.LineFriendsBrown
Return "LineFriendsBrown"
Case eftColorList.LineFriends_Sally
Case eftColorList.LineFriendsSally
Return "LineFriendsSally"
Case Else
Return "ETC"
@ -890,17 +893,17 @@ Public Class mainForm
End Function
Private Function fileColorComareForMaxAlphaModel() As String 'Maximum alpha model color'
Select Case colorTypeMaxAlpha
Case maxAlphaColorList.Ruby_Red
Case maxAlphaColorList.RubyRed
Return "RubyRed"
Case maxAlphaColorList.Topaz_Orange
Case maxAlphaColorList.TopazOrange
Return "TopazOrange"
Case maxAlphaColorList.Emerald_Green
Case maxAlphaColorList.EmeraldGreen
Return "EmeraldGreen"
Case maxAlphaColorList.Sapphire_Blue
Case maxAlphaColorList.SapphireBlue
Return "SapphireBlue"
Case maxAlphaColorList.Topaz_Brown
Case maxAlphaColorList.TopazBrown
Return "TopazBrown"
Case maxAlphaColorList.Sitrin_Gold
Case maxAlphaColorList.SitrinGold
Return "SitrinGold"
Case Else
Return "ETC"
@ -911,19 +914,21 @@ Public Class mainForm
Select Case colorTypeMax
Case maxColorList.White
Return "White"
Case maxColorList.Black
Return "Black"
Case maxColorList.ShineMint
Return "ShineMint"
Case maxColorList.Pink
Return "Pink"
Case maxColorList.Black
Return "Black"
Case maxColorList.Yellow
Return "Yellow"
Case maxColorList.Peach
Return "Peach"
Case maxColorList.Mint
Return "Mint"
Case maxColorList.Purple
Return "Purple"
Case maxColorList.Black_Gold
Case maxColorList.BlackGold
Return "BlackGold"
Case Else
Return "etc"
@ -936,7 +941,7 @@ Public Class mainForm
Return "White"
Case altoColorList.Purple
Return "Purple"
Case altoColorList.Black_Gold
Case altoColorList.BlackGold
Return "BlackGold"
Case Else
Return "etc"
@ -973,6 +978,14 @@ Public Class mainForm
Return "etc"
End Select
End Function
Private Function fileColorCompareProSModel() As String
Select Case colorTypePro
Case proSColorList.Gold
Return "Gold"
Case Else
Return "etc"
End Select
End Function
Private Function lastQCDBReg(prodSerial As String) As Boolean
@ -1976,6 +1989,8 @@ DataFail:
Return "TopazBrown"
Case 19
Return "SitrinGold"
Case 20
Return "Gold"
Case Else
Return "etc"
End Select