fix: color list
This commit is contained in:
parent
2116d7e556
commit
41bbca808c
2
MAXIMUM_FUNCTION_PROGRAM/mainForm.Designer.vb
generated
2
MAXIMUM_FUNCTION_PROGRAM/mainForm.Designer.vb
generated
@ -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.Font = New System.Drawing.Font("함초롬바탕", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
|
||||||
Me.cboCsvColor.FormattingEnabled = True
|
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.Location = New System.Drawing.Point(65, 88)
|
||||||
Me.cboCsvColor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
|
Me.cboCsvColor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
|
||||||
Me.cboCsvColor.Name = "cboCsvColor"
|
Me.cboCsvColor.Name = "cboCsvColor"
|
||||||
|
|||||||
@ -223,40 +223,41 @@ Public Class mainForm
|
|||||||
Private TDUseCompare As Boolean
|
Private TDUseCompare As Boolean
|
||||||
Private searchType As Int16
|
Private searchType As Int16
|
||||||
Private Enum maxAlphaColorList
|
Private Enum maxAlphaColorList
|
||||||
Ruby_Red = 0
|
RubyRed = 1
|
||||||
Topaz_Orange = 2
|
TopazOrange = 2
|
||||||
Emerald_Green = 3
|
EmeraldGreen = 3
|
||||||
Sapphire_Blue = 4
|
SapphireBlue = 4
|
||||||
Topaz_Brown = 5
|
TopazBrown = 5
|
||||||
Sitrin_Gold = 6
|
SitrinGold = 6
|
||||||
End Enum
|
End Enum
|
||||||
Private colorTypeMaxAlpha As Int16
|
Private colorTypeMaxAlpha As Int16
|
||||||
|
|
||||||
Private Enum maxColorList
|
Private Enum maxColorList
|
||||||
White = 0
|
White = 0
|
||||||
|
Black = 1
|
||||||
ShineMint = 2
|
ShineMint = 2
|
||||||
Pink = 3
|
Pink = 3
|
||||||
Black = 4
|
|
||||||
Yellow = 5
|
Yellow = 5
|
||||||
|
Peach = 6
|
||||||
Mint = 7
|
Mint = 7
|
||||||
Purple = 8
|
Purple = 8
|
||||||
Black_Gold = 9
|
BlackGold = 9
|
||||||
End Enum
|
End Enum
|
||||||
Private colorTypeMax As Int16
|
Private colorTypeMax As Int16
|
||||||
|
|
||||||
Private Enum altoColorList
|
Private Enum altoColorList
|
||||||
White = 0
|
White = 0
|
||||||
Purple = 8
|
Purple = 8
|
||||||
Black_Gold = 9
|
BlackGold = 9
|
||||||
End Enum
|
End Enum
|
||||||
Private colorTypeAlto As Int16
|
Private colorTypeAlto As Int16
|
||||||
|
|
||||||
Private Enum eftColorList
|
Private Enum eftColorList
|
||||||
White_Pink = 1
|
WhitePink = 1
|
||||||
White_Sky = 2
|
WhiteSky = 2
|
||||||
White_Brown = 3
|
WhiteBrown = 3
|
||||||
LineFriends_Brown = 4
|
LineFriendsBrown = 4
|
||||||
LineFriends_Sally = 5
|
LineFriendsSally = 5
|
||||||
End Enum
|
End Enum
|
||||||
Private colorTypeEft As Int16
|
Private colorTypeEft As Int16
|
||||||
|
|
||||||
@ -275,6 +276,10 @@ Public Class mainForm
|
|||||||
White = 0
|
White = 0
|
||||||
Black = 1
|
Black = 1
|
||||||
End Enum
|
End Enum
|
||||||
|
Private Enum proSColorList
|
||||||
|
Gold = 0
|
||||||
|
End Enum
|
||||||
|
|
||||||
Private colorTypePro As Int16
|
Private colorTypePro As Int16
|
||||||
|
|
||||||
Private Enum prodModelList
|
Private Enum prodModelList
|
||||||
@ -863,7 +868,7 @@ Public Class mainForm
|
|||||||
Return "White"
|
Return "White"
|
||||||
Case altoColorList.Purple
|
Case altoColorList.Purple
|
||||||
Return "Purple"
|
Return "Purple"
|
||||||
Case altoColorList.Black_Gold
|
Case altoColorList.BlackGold
|
||||||
Return "BlackGold"
|
Return "BlackGold"
|
||||||
Case Else
|
Case Else
|
||||||
Return "ETC"
|
Return "ETC"
|
||||||
@ -872,17 +877,15 @@ Public Class mainForm
|
|||||||
|
|
||||||
Private Function fileColorComareForEffectModel() As String 'effect model color'
|
Private Function fileColorComareForEffectModel() As String 'effect model color'
|
||||||
Select Case colorTypeEft
|
Select Case colorTypeEft
|
||||||
Case eftColorList.White_Pink
|
Case eftColorList.WhitePink
|
||||||
Return "WhitePink"
|
Return "WhitePink"
|
||||||
Case eftColorList.White_Sky
|
Case eftColorList.WhiteSky
|
||||||
Return "WhiteSky"
|
Return "WhiteSky"
|
||||||
Case eftColorList.White_Brown
|
Case eftColorList.WhiteBrown
|
||||||
Return "WhiteBrown"
|
Return "WhiteBrown"
|
||||||
Case eftColorList.White_Brown
|
Case eftColorList.LineFriendsBrown
|
||||||
Return "WhiteBrown"
|
|
||||||
Case eftColorList.LineFriends_Brown
|
|
||||||
Return "LineFriendsBrown"
|
Return "LineFriendsBrown"
|
||||||
Case eftColorList.LineFriends_Sally
|
Case eftColorList.LineFriendsSally
|
||||||
Return "LineFriendsSally"
|
Return "LineFriendsSally"
|
||||||
Case Else
|
Case Else
|
||||||
Return "ETC"
|
Return "ETC"
|
||||||
@ -890,17 +893,17 @@ Public Class mainForm
|
|||||||
End Function
|
End Function
|
||||||
Private Function fileColorComareForMaxAlphaModel() As String 'Maximum alpha model color'
|
Private Function fileColorComareForMaxAlphaModel() As String 'Maximum alpha model color'
|
||||||
Select Case colorTypeMaxAlpha
|
Select Case colorTypeMaxAlpha
|
||||||
Case maxAlphaColorList.Ruby_Red
|
Case maxAlphaColorList.RubyRed
|
||||||
Return "RubyRed"
|
Return "RubyRed"
|
||||||
Case maxAlphaColorList.Topaz_Orange
|
Case maxAlphaColorList.TopazOrange
|
||||||
Return "TopazOrange"
|
Return "TopazOrange"
|
||||||
Case maxAlphaColorList.Emerald_Green
|
Case maxAlphaColorList.EmeraldGreen
|
||||||
Return "EmeraldGreen"
|
Return "EmeraldGreen"
|
||||||
Case maxAlphaColorList.Sapphire_Blue
|
Case maxAlphaColorList.SapphireBlue
|
||||||
Return "SapphireBlue"
|
Return "SapphireBlue"
|
||||||
Case maxAlphaColorList.Topaz_Brown
|
Case maxAlphaColorList.TopazBrown
|
||||||
Return "TopazBrown"
|
Return "TopazBrown"
|
||||||
Case maxAlphaColorList.Sitrin_Gold
|
Case maxAlphaColorList.SitrinGold
|
||||||
Return "SitrinGold"
|
Return "SitrinGold"
|
||||||
Case Else
|
Case Else
|
||||||
Return "ETC"
|
Return "ETC"
|
||||||
@ -911,19 +914,21 @@ Public Class mainForm
|
|||||||
Select Case colorTypeMax
|
Select Case colorTypeMax
|
||||||
Case maxColorList.White
|
Case maxColorList.White
|
||||||
Return "White"
|
Return "White"
|
||||||
|
Case maxColorList.Black
|
||||||
|
Return "Black"
|
||||||
Case maxColorList.ShineMint
|
Case maxColorList.ShineMint
|
||||||
Return "ShineMint"
|
Return "ShineMint"
|
||||||
Case maxColorList.Pink
|
Case maxColorList.Pink
|
||||||
Return "Pink"
|
Return "Pink"
|
||||||
Case maxColorList.Black
|
|
||||||
Return "Black"
|
|
||||||
Case maxColorList.Yellow
|
Case maxColorList.Yellow
|
||||||
Return "Yellow"
|
Return "Yellow"
|
||||||
|
Case maxColorList.Peach
|
||||||
|
Return "Peach"
|
||||||
Case maxColorList.Mint
|
Case maxColorList.Mint
|
||||||
Return "Mint"
|
Return "Mint"
|
||||||
Case maxColorList.Purple
|
Case maxColorList.Purple
|
||||||
Return "Purple"
|
Return "Purple"
|
||||||
Case maxColorList.Black_Gold
|
Case maxColorList.BlackGold
|
||||||
Return "BlackGold"
|
Return "BlackGold"
|
||||||
Case Else
|
Case Else
|
||||||
Return "etc"
|
Return "etc"
|
||||||
@ -936,7 +941,7 @@ Public Class mainForm
|
|||||||
Return "White"
|
Return "White"
|
||||||
Case altoColorList.Purple
|
Case altoColorList.Purple
|
||||||
Return "Purple"
|
Return "Purple"
|
||||||
Case altoColorList.Black_Gold
|
Case altoColorList.BlackGold
|
||||||
Return "BlackGold"
|
Return "BlackGold"
|
||||||
Case Else
|
Case Else
|
||||||
Return "etc"
|
Return "etc"
|
||||||
@ -973,6 +978,14 @@ Public Class mainForm
|
|||||||
Return "etc"
|
Return "etc"
|
||||||
End Select
|
End Select
|
||||||
End Function
|
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
|
Private Function lastQCDBReg(prodSerial As String) As Boolean
|
||||||
|
|
||||||
@ -1976,6 +1989,8 @@ DataFail:
|
|||||||
Return "TopazBrown"
|
Return "TopazBrown"
|
||||||
Case 19
|
Case 19
|
||||||
Return "SitrinGold"
|
Return "SitrinGold"
|
||||||
|
Case 20
|
||||||
|
Return "Gold"
|
||||||
Case Else
|
Case Else
|
||||||
Return "etc"
|
Return "etc"
|
||||||
End Select
|
End Select
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user