diff --git a/app/DD_PM_WINDREAM/ClassFinalIndex.vb b/app/DD_PM_WINDREAM/ClassFinalIndex.vb index 81900ff..596cd7c 100644 --- a/app/DD_PM_WINDREAM/ClassFinalIndex.vb +++ b/app/DD_PM_WINDREAM/ClassFinalIndex.vb @@ -1,5 +1,15 @@ Public Class ClassFinalIndex - Public Shared PREFIX_VECTOR = "[%VKT" + Public Const INDEX_TYPE_STRING = 1 + Public Const INDEX_TYPE_INTEGER = 2 + Public Const INDEX_TYPE_FLOAT = 3 + Public Const INDEX_TYPE_BOOLEAN = 4 + Public Const INDEX_TYPE_DATE = 5 + Public Const INDEX_TYPE_VECTOR_INTEGER = 4107 + Public Const INDEX_TYPE_VECTOR_STRING = 4097 + Public Const INDEX_TYPE_VECTOR_BOOLEAN = 4100 + Public Const INDEX_TYPE_VECTOR_DATE = 4101 + + Public Const PREFIX_VECTOR = "[%VKT" Public Shared Function GetValue(obj As Object, indexName As String, indcies As List(Of String), types As List(Of Integer), isVector As Boolean) Try @@ -70,4 +80,12 @@ MsgBox($"Error in SetValue: {ex.Message}", MsgBoxStyle.Critical) End Try End Function + + Public Shared Function IsVectorIndex(type As Integer) As Boolean + If type = INDEX_TYPE_VECTOR_BOOLEAN Or type = INDEX_TYPE_VECTOR_DATE Or type = INDEX_TYPE_VECTOR_INTEGER Or type = INDEX_TYPE_VECTOR_STRING Then + Return True + Else + Return False + End If + End Function End Class diff --git a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb index f75b51c..61d1642 100644 --- a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb @@ -4,16 +4,6 @@ Imports System.Globalization Imports FormsUtils Module ModuleFinalIndexProperties - Public Const INDEX_TYPE_STRING = 1 - Public Const INDEX_TYPE_INTEGER = 2 - Public Const INDEX_TYPE_FLOAT = 3 - Public Const INDEX_TYPE_BOOLEAN = 4 - Public Const INDEX_TYPE_DATE = 5 - Public Const INDEX_TYPE_VECTOR_INTEGER = 4107 - Public Const INDEX_TYPE_VECTOR_STRING = 4097 - Public Const INDEX_TYPE_VECTOR_BOOLEAN = 4100 - Public Const INDEX_TYPE_VECTOR_DATE = 4101 - Public Class FinalIndexProperties @@ -101,27 +91,27 @@ Module ModuleFinalIndexProperties End Sub Public Sub IndexTypeBooleanProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {INDEX_TYPE_BOOLEAN, INDEX_TYPE_VECTOR_BOOLEAN}) + MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_BOOLEAN, ClassFinalIndex.INDEX_TYPE_VECTOR_BOOLEAN}) MaybeSetReadOnly(attrs) End Sub Public Sub IndexTypeStringProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {INDEX_TYPE_STRING, INDEX_TYPE_VECTOR_STRING}) + MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_STRING, ClassFinalIndex.INDEX_TYPE_VECTOR_STRING}) MaybeSetReadOnly(attrs) End Sub Public Sub IndexTypeFloatProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {INDEX_TYPE_FLOAT}) + MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_FLOAT}) MaybeSetReadOnly(attrs) End Sub Public Sub IndexTypeIntegerProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {INDEX_TYPE_INTEGER, INDEX_TYPE_VECTOR_INTEGER}) + MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_INTEGER, ClassFinalIndex.INDEX_TYPE_VECTOR_INTEGER}) MaybeSetReadOnly(attrs) End Sub Public Sub IndexTypeDateProvider(attrs As PropertyAttributes) - MaybeSetBrowsable(attrs, {INDEX_TYPE_DATE, INDEX_TYPE_VECTOR_DATE}) + MaybeSetBrowsable(attrs, {ClassFinalIndex.INDEX_TYPE_DATE, ClassFinalIndex.INDEX_TYPE_VECTOR_DATE}) MaybeSetReadOnly(attrs) End Sub End Class