diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure/info/ExportDlg.cs b/RbFreqStandMeasure/info/ExportDlg.cs index 53a903a..6b1b03a 100644 --- a/RbFreqStandMeasure/info/ExportDlg.cs +++ b/RbFreqStandMeasure/info/ExportDlg.cs @@ -100,6 +100,7 @@ tableTimes.Columns.Add("stability10", Type.GetType("System.String")); tableTimes.Columns.Add("stability20", Type.GetType("System.String")); tableTimes.Columns.Add("stability100", Type.GetType("System.String")); + tableTimes.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 List queryList = detectionItemService.search(deviceId, false); @@ -109,7 +110,7 @@ int index = 1; foreach (DetectionItem detection in queryList) { - tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100); + tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100,detection.Id); index++; } @@ -234,7 +235,7 @@ else if (type == 4) typeStr = "1-100"; // 获取数据 - List List = detectionService.search(deviceId, typeStr, startTime, endTime); + List List = detectionService.search(deviceId, typeStr, startTime, endTime,Convert.ToInt64(row.Cells[12].Value)); if (null != List && List.Count > 0) { string detecItemName = ""; diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure/info/ExportDlg.cs b/RbFreqStandMeasure/info/ExportDlg.cs index 53a903a..6b1b03a 100644 --- a/RbFreqStandMeasure/info/ExportDlg.cs +++ b/RbFreqStandMeasure/info/ExportDlg.cs @@ -100,6 +100,7 @@ tableTimes.Columns.Add("stability10", Type.GetType("System.String")); tableTimes.Columns.Add("stability20", Type.GetType("System.String")); tableTimes.Columns.Add("stability100", Type.GetType("System.String")); + tableTimes.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 List queryList = detectionItemService.search(deviceId, false); @@ -109,7 +110,7 @@ int index = 1; foreach (DetectionItem detection in queryList) { - tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100); + tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100,detection.Id); index++; } @@ -234,7 +235,7 @@ else if (type == 4) typeStr = "1-100"; // 获取数据 - List List = detectionService.search(deviceId, typeStr, startTime, endTime); + List List = detectionService.search(deviceId, typeStr, startTime, endTime,Convert.ToInt64(row.Cells[12].Value)); if (null != List && List.Count > 0) { string detecItemName = ""; diff --git a/RbFreqStandMeasure/info/ReDetecDlg.cs b/RbFreqStandMeasure/info/ReDetecDlg.cs index 0af7776..19e2f83 100644 --- a/RbFreqStandMeasure/info/ReDetecDlg.cs +++ b/RbFreqStandMeasure/info/ReDetecDlg.cs @@ -94,6 +94,8 @@ private void btn_reDetec_Click(object sender, EventArgs e) { + btn_reDetec.Enabled = false; + roundButton1.Enabled = false; string portName = ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[0]; int band = Convert.ToInt32(ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[1]); @@ -117,12 +119,16 @@ if (!port.IsOpen) { MessageBox.Show("无法打开通道"+ channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } } catch (Exception exc) { MessageBox.Show("无法打开通道" + channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } DetectionHelper detectionHelper = new DetectionHelper(); @@ -130,6 +136,8 @@ if (DetectionHelper.detectionHelper.getFrequencyData(port).Equals("")) { MessageBox.Show("请连接仪器到通道[" + channelNoReDetec + "]！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } @@ -150,6 +158,8 @@ } DetailDlg.label_redetecting.Visible = true; + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; this.HideMaskAction(); } } diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure/info/ExportDlg.cs b/RbFreqStandMeasure/info/ExportDlg.cs index 53a903a..6b1b03a 100644 --- a/RbFreqStandMeasure/info/ExportDlg.cs +++ b/RbFreqStandMeasure/info/ExportDlg.cs @@ -100,6 +100,7 @@ tableTimes.Columns.Add("stability10", Type.GetType("System.String")); tableTimes.Columns.Add("stability20", Type.GetType("System.String")); tableTimes.Columns.Add("stability100", Type.GetType("System.String")); + tableTimes.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 List queryList = detectionItemService.search(deviceId, false); @@ -109,7 +110,7 @@ int index = 1; foreach (DetectionItem detection in queryList) { - tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100); + tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100,detection.Id); index++; } @@ -234,7 +235,7 @@ else if (type == 4) typeStr = "1-100"; // 获取数据 - List List = detectionService.search(deviceId, typeStr, startTime, endTime); + List List = detectionService.search(deviceId, typeStr, startTime, endTime,Convert.ToInt64(row.Cells[12].Value)); if (null != List && List.Count > 0) { string detecItemName = ""; diff --git a/RbFreqStandMeasure/info/ReDetecDlg.cs b/RbFreqStandMeasure/info/ReDetecDlg.cs index 0af7776..19e2f83 100644 --- a/RbFreqStandMeasure/info/ReDetecDlg.cs +++ b/RbFreqStandMeasure/info/ReDetecDlg.cs @@ -94,6 +94,8 @@ private void btn_reDetec_Click(object sender, EventArgs e) { + btn_reDetec.Enabled = false; + roundButton1.Enabled = false; string portName = ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[0]; int band = Convert.ToInt32(ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[1]); @@ -117,12 +119,16 @@ if (!port.IsOpen) { MessageBox.Show("无法打开通道"+ channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } } catch (Exception exc) { MessageBox.Show("无法打开通道" + channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } DetectionHelper detectionHelper = new DetectionHelper(); @@ -130,6 +136,8 @@ if (DetectionHelper.detectionHelper.getFrequencyData(port).Equals("")) { MessageBox.Show("请连接仪器到通道[" + channelNoReDetec + "]！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } @@ -150,6 +158,8 @@ } DetailDlg.label_redetecting.Visible = true; + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; this.HideMaskAction(); } } diff --git a/RbFreqStandMeasure/tools/DetectionHelper.cs b/RbFreqStandMeasure/tools/DetectionHelper.cs index 3f14f44..242f3fa 100644 --- a/RbFreqStandMeasure/tools/DetectionHelper.cs +++ b/RbFreqStandMeasure/tools/DetectionHelper.cs @@ -120,7 +120,7 @@ if (resultStability1.Count == 101) timerStability1.Dispose(); if (!isUpdate && count1s < 101) { - detectionService.add(devIdStability, fre, "1-1"); + detectionService.add(devIdStability, fre, "1-1",detectionItemId); count1s++; } } @@ -200,7 +200,7 @@ if (resultStability10.Count == 101) timerStability10.Dispose(); if (!isUpdate && count10s < 101) { - detectionService.add(devIdStability, fre, "1-10"); + detectionService.add(devIdStability, fre, "1-10", detectionItemId); count10s++; } } @@ -269,7 +269,7 @@ resultStability20.Add(fre); if (!isUpdate && count20s < 101) { - detectionService.add(devIdStability, fre, "1-20"); + detectionService.add(devIdStability, fre, "1-20", detectionItemId); count20s++; } } @@ -343,7 +343,7 @@ if (!fre.Equals("") && resultStability100.Count < 101) { resultStability100.Add(fre); - if (!isUpdate) detectionService.add(devIdStability, fre, "1-100"); + if (!isUpdate) detectionService.add(devIdStability, fre, "1-100", detectionItemId); } LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "稳定度100s fre=" + fre + ", devId =" + devIdStability); @@ -440,7 +440,7 @@ resultList.Add(fre); if (!isUpdate) { - detectionService.add(devIdAccuracy, fre, "2"); + detectionService.add(devIdAccuracy, fre, "2", detectionItemId); } if (resultList.Count == 3) { @@ -529,7 +529,7 @@ if (count == 3) break; } } - detectionService.add(devIdBootFeature, sum / 3 + "", "3"); + detectionService.add(devIdBootFeature, sum / 3 + "", "3", detectionItemId); resultBootFeature.Add(sum / 3 + ""); if (resultBootFeature.Count == 8) @@ -600,7 +600,7 @@ if (count == 3) break; } } - detectionService.add(devIdAgeRate, sum / 3+"", "4"); + detectionService.add(devIdAgeRate, sum / 3+"", "4", detectionItemId); resultAgeRate.Add(sum / 3 + ""); if (resultAgeRate.Count == 15) diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure/info/ExportDlg.cs b/RbFreqStandMeasure/info/ExportDlg.cs index 53a903a..6b1b03a 100644 --- a/RbFreqStandMeasure/info/ExportDlg.cs +++ b/RbFreqStandMeasure/info/ExportDlg.cs @@ -100,6 +100,7 @@ tableTimes.Columns.Add("stability10", Type.GetType("System.String")); tableTimes.Columns.Add("stability20", Type.GetType("System.String")); tableTimes.Columns.Add("stability100", Type.GetType("System.String")); + tableTimes.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 List queryList = detectionItemService.search(deviceId, false); @@ -109,7 +110,7 @@ int index = 1; foreach (DetectionItem detection in queryList) { - tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100); + tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100,detection.Id); index++; } @@ -234,7 +235,7 @@ else if (type == 4) typeStr = "1-100"; // 获取数据 - List List = detectionService.search(deviceId, typeStr, startTime, endTime); + List List = detectionService.search(deviceId, typeStr, startTime, endTime,Convert.ToInt64(row.Cells[12].Value)); if (null != List && List.Count > 0) { string detecItemName = ""; diff --git a/RbFreqStandMeasure/info/ReDetecDlg.cs b/RbFreqStandMeasure/info/ReDetecDlg.cs index 0af7776..19e2f83 100644 --- a/RbFreqStandMeasure/info/ReDetecDlg.cs +++ b/RbFreqStandMeasure/info/ReDetecDlg.cs @@ -94,6 +94,8 @@ private void btn_reDetec_Click(object sender, EventArgs e) { + btn_reDetec.Enabled = false; + roundButton1.Enabled = false; string portName = ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[0]; int band = Convert.ToInt32(ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[1]); @@ -117,12 +119,16 @@ if (!port.IsOpen) { MessageBox.Show("无法打开通道"+ channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } } catch (Exception exc) { MessageBox.Show("无法打开通道" + channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } DetectionHelper detectionHelper = new DetectionHelper(); @@ -130,6 +136,8 @@ if (DetectionHelper.detectionHelper.getFrequencyData(port).Equals("")) { MessageBox.Show("请连接仪器到通道[" + channelNoReDetec + "]！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } @@ -150,6 +158,8 @@ } DetailDlg.label_redetecting.Visible = true; + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; this.HideMaskAction(); } } diff --git a/RbFreqStandMeasure/tools/DetectionHelper.cs b/RbFreqStandMeasure/tools/DetectionHelper.cs index 3f14f44..242f3fa 100644 --- a/RbFreqStandMeasure/tools/DetectionHelper.cs +++ b/RbFreqStandMeasure/tools/DetectionHelper.cs @@ -120,7 +120,7 @@ if (resultStability1.Count == 101) timerStability1.Dispose(); if (!isUpdate && count1s < 101) { - detectionService.add(devIdStability, fre, "1-1"); + detectionService.add(devIdStability, fre, "1-1",detectionItemId); count1s++; } } @@ -200,7 +200,7 @@ if (resultStability10.Count == 101) timerStability10.Dispose(); if (!isUpdate && count10s < 101) { - detectionService.add(devIdStability, fre, "1-10"); + detectionService.add(devIdStability, fre, "1-10", detectionItemId); count10s++; } } @@ -269,7 +269,7 @@ resultStability20.Add(fre); if (!isUpdate && count20s < 101) { - detectionService.add(devIdStability, fre, "1-20"); + detectionService.add(devIdStability, fre, "1-20", detectionItemId); count20s++; } } @@ -343,7 +343,7 @@ if (!fre.Equals("") && resultStability100.Count < 101) { resultStability100.Add(fre); - if (!isUpdate) detectionService.add(devIdStability, fre, "1-100"); + if (!isUpdate) detectionService.add(devIdStability, fre, "1-100", detectionItemId); } LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "稳定度100s fre=" + fre + ", devId =" + devIdStability); @@ -440,7 +440,7 @@ resultList.Add(fre); if (!isUpdate) { - detectionService.add(devIdAccuracy, fre, "2"); + detectionService.add(devIdAccuracy, fre, "2", detectionItemId); } if (resultList.Count == 3) { @@ -529,7 +529,7 @@ if (count == 3) break; } } - detectionService.add(devIdBootFeature, sum / 3 + "", "3"); + detectionService.add(devIdBootFeature, sum / 3 + "", "3", detectionItemId); resultBootFeature.Add(sum / 3 + ""); if (resultBootFeature.Count == 8) @@ -600,7 +600,7 @@ if (count == 3) break; } } - detectionService.add(devIdAgeRate, sum / 3+"", "4"); + detectionService.add(devIdAgeRate, sum / 3+"", "4", detectionItemId); resultAgeRate.Add(sum / 3 + ""); if (resultAgeRate.Count == 15) diff --git a/Setup/Debug/Setup.msi b/Setup/Debug/Setup.msi new file mode 100644 index 0000000..bfb0f3e --- /dev/null +++ b/Setup/Debug/Setup.msi Binary files differ diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure/info/ExportDlg.cs b/RbFreqStandMeasure/info/ExportDlg.cs index 53a903a..6b1b03a 100644 --- a/RbFreqStandMeasure/info/ExportDlg.cs +++ b/RbFreqStandMeasure/info/ExportDlg.cs @@ -100,6 +100,7 @@ tableTimes.Columns.Add("stability10", Type.GetType("System.String")); tableTimes.Columns.Add("stability20", Type.GetType("System.String")); tableTimes.Columns.Add("stability100", Type.GetType("System.String")); + tableTimes.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 List queryList = detectionItemService.search(deviceId, false); @@ -109,7 +110,7 @@ int index = 1; foreach (DetectionItem detection in queryList) { - tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100); + tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100,detection.Id); index++; } @@ -234,7 +235,7 @@ else if (type == 4) typeStr = "1-100"; // 获取数据 - List List = detectionService.search(deviceId, typeStr, startTime, endTime); + List List = detectionService.search(deviceId, typeStr, startTime, endTime,Convert.ToInt64(row.Cells[12].Value)); if (null != List && List.Count > 0) { string detecItemName = ""; diff --git a/RbFreqStandMeasure/info/ReDetecDlg.cs b/RbFreqStandMeasure/info/ReDetecDlg.cs index 0af7776..19e2f83 100644 --- a/RbFreqStandMeasure/info/ReDetecDlg.cs +++ b/RbFreqStandMeasure/info/ReDetecDlg.cs @@ -94,6 +94,8 @@ private void btn_reDetec_Click(object sender, EventArgs e) { + btn_reDetec.Enabled = false; + roundButton1.Enabled = false; string portName = ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[0]; int band = Convert.ToInt32(ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[1]); @@ -117,12 +119,16 @@ if (!port.IsOpen) { MessageBox.Show("无法打开通道"+ channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } } catch (Exception exc) { MessageBox.Show("无法打开通道" + channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } DetectionHelper detectionHelper = new DetectionHelper(); @@ -130,6 +136,8 @@ if (DetectionHelper.detectionHelper.getFrequencyData(port).Equals("")) { MessageBox.Show("请连接仪器到通道[" + channelNoReDetec + "]！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } @@ -150,6 +158,8 @@ } DetailDlg.label_redetecting.Visible = true; + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; this.HideMaskAction(); } } diff --git a/RbFreqStandMeasure/tools/DetectionHelper.cs b/RbFreqStandMeasure/tools/DetectionHelper.cs index 3f14f44..242f3fa 100644 --- a/RbFreqStandMeasure/tools/DetectionHelper.cs +++ b/RbFreqStandMeasure/tools/DetectionHelper.cs @@ -120,7 +120,7 @@ if (resultStability1.Count == 101) timerStability1.Dispose(); if (!isUpdate && count1s < 101) { - detectionService.add(devIdStability, fre, "1-1"); + detectionService.add(devIdStability, fre, "1-1",detectionItemId); count1s++; } } @@ -200,7 +200,7 @@ if (resultStability10.Count == 101) timerStability10.Dispose(); if (!isUpdate && count10s < 101) { - detectionService.add(devIdStability, fre, "1-10"); + detectionService.add(devIdStability, fre, "1-10", detectionItemId); count10s++; } } @@ -269,7 +269,7 @@ resultStability20.Add(fre); if (!isUpdate && count20s < 101) { - detectionService.add(devIdStability, fre, "1-20"); + detectionService.add(devIdStability, fre, "1-20", detectionItemId); count20s++; } } @@ -343,7 +343,7 @@ if (!fre.Equals("") && resultStability100.Count < 101) { resultStability100.Add(fre); - if (!isUpdate) detectionService.add(devIdStability, fre, "1-100"); + if (!isUpdate) detectionService.add(devIdStability, fre, "1-100", detectionItemId); } LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "稳定度100s fre=" + fre + ", devId =" + devIdStability); @@ -440,7 +440,7 @@ resultList.Add(fre); if (!isUpdate) { - detectionService.add(devIdAccuracy, fre, "2"); + detectionService.add(devIdAccuracy, fre, "2", detectionItemId); } if (resultList.Count == 3) { @@ -529,7 +529,7 @@ if (count == 3) break; } } - detectionService.add(devIdBootFeature, sum / 3 + "", "3"); + detectionService.add(devIdBootFeature, sum / 3 + "", "3", detectionItemId); resultBootFeature.Add(sum / 3 + ""); if (resultBootFeature.Count == 8) @@ -600,7 +600,7 @@ if (count == 3) break; } } - detectionService.add(devIdAgeRate, sum / 3+"", "4"); + detectionService.add(devIdAgeRate, sum / 3+"", "4", detectionItemId); resultAgeRate.Add(sum / 3 + ""); if (resultAgeRate.Count == 15) diff --git a/Setup/Debug/Setup.msi b/Setup/Debug/Setup.msi new file mode 100644 index 0000000..bfb0f3e --- /dev/null +++ b/Setup/Debug/Setup.msi Binary files differ diff --git a/Setup/Debug/setup.exe b/Setup/Debug/setup.exe new file mode 100644 index 0000000..90b8c09 --- /dev/null +++ b/Setup/Debug/setup.exe Binary files differ diff --git a/RbFreqStandMeasure.sln b/RbFreqStandMeasure.sln index 5996c87..4338402 100644 --- a/RbFreqStandMeasure.sln +++ b/RbFreqStandMeasure.sln @@ -5,6 +5,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RbFreqStandMeasure", "RbFreqStandMeasure\RbFreqStandMeasure.csproj", "{F9A73B92-70CF-4F91-B58B-E461A180A75C}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{66765ED5-1F98-49A5-B21E-E55A9E38D353}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|Any CPU.Build.0 = Release|Any CPU {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.ActiveCfg = Release|x86 {F9A73B92-70CF-4F91-B58B-E461A180A75C}.Release|x86.Build.0 = Release|x86 + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|Any CPU.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Debug|x86.ActiveCfg = Debug + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|Any CPU.ActiveCfg = Release + {66765ED5-1F98-49A5-B21E-E55A9E38D353}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs index 00440fc..a1528f2 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/Detection.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/Detection.cs @@ -21,7 +21,7 @@ string frequency; string detectionItem; - + long detectionItemId; public long Id { get @@ -75,6 +75,6 @@ } public string DetectionItem { get => detectionItem; set => detectionItem = value; } - + public long DetectionItemId { get => detectionItemId; set => detectionItemId = value; } } } diff --git a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs index 5325fa6..399098b 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/DetectionService.cs @@ -9,9 +9,9 @@ { interface DetectionService { - int add(long deviceId, string frequency, string detecItemType); + int add(long deviceId, string frequency, string detecItemType, long detectionItemId); - List search(long deviceId, string detectionType, string startTime, string endTime); + List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId); int updateFrequency(long detectionId, string fre); } diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs index c536399..e2a5893 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionServiceImpl.cs @@ -14,7 +14,7 @@ { class DetectionServiceImpl : DetectionService { - public int add(long deviceId, string frequency, string detecItemType) + public int add(long deviceId, string frequency, string detecItemType, long detectionItemId) { int iRetval = -1; try @@ -30,14 +30,15 @@ } } - string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM)" + - "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM)"; + string sQry = "INSERT INTO r_detection (DEVICE_ID,LOG_TIME,FREQUENCY,DETECTION_ITEM,DETECTION_ITEM_ID) " + + "values(@DEVICE_ID,@LOG_TIME,@FREQUENCY,@DETECTION_ITEM,@DETECTION_ITEM_ID)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; cmd.Parameters.Add("@FREQUENCY", MySqlDbType.String, 255).Value = frequency; cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = DateTime.Now; cmd.Parameters.Add("@DETECTION_ITEM", MySqlDbType.String, 0).Value = detecItemType; + cmd.Parameters.Add("@DETECTION_ITEM_ID", MySqlDbType.Int64, 0).Value = detectionItemId; cmd.ExecuteNonQuery(); @@ -89,9 +90,9 @@ return iRetval; } - public List search(long deviceId, string detectionType, string startTime, string endTime) + public List search(long deviceId, string detectionType, string startTime, string endTime, long detectionItemId) { - List detectionDtoList = new List(); + List detectionDtoList = new List(); try { if (DbConnectService.mySqlConnect.State == ConnectionState.Closed) @@ -105,7 +106,7 @@ } } - string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') order by LOG_TIME"; + string sQry = "SELECT * FROM r_detection where DEVICE_ID = " + deviceId +" and DETECTION_ITEM='" + detectionType + "' and (LOG_TIME BETWEEN '" + startTime + "' and '"+ endTime + "') and DETECTION_ITEM_ID="+detectionItemId+" order by LOG_TIME"; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); using (MySqlDataReader aReader = aCommand.ExecuteReader()) diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index b6f5dc4..8773cb6 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -342,7 +342,7 @@ else sQry += " and STATUSID = " + statusId; } - sQry += " order by REG_TIME desc limit " + limit + " offset " + (page - 1) * limit + ""; + sQry += " order by ID desc limit " + (page - 1) * limit+ " , "+ limit; MySqlCommand aCommand = new MySqlCommand(sQry, DbConnectService.mySqlConnect); diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..5bc66ec 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/info/DetailDlg.cs b/RbFreqStandMeasure/info/DetailDlg.cs index a670fe8..e0c40b6 100644 --- a/RbFreqStandMeasure/info/DetailDlg.cs +++ b/RbFreqStandMeasure/info/DetailDlg.cs @@ -49,6 +49,7 @@ public static Label label_redetecting; public static DetailDlg detailDlg; long deviceId = -1; + long detectionItemId = -1; string startTime = ""; string endTime = ""; public string resultAccStr = ""; @@ -74,6 +75,7 @@ if (tableTimes.Rows.Count > 0) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[0].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[0].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[0].Cells[3].Value.ToString(); @@ -126,7 +128,7 @@ tableOriginData.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 - List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime); + List queryList = detectionService.search(deviceId, detectionItem, startTime, endTime, detectionItemId); if (null != queryList && queryList.Count > 0) { int index = 1; @@ -292,6 +294,7 @@ int rowIndex = e.RowIndex; if (rowIndex > -1) { + detectionItemId = Convert.ToInt64(dataGridView_times.Rows[rowIndex].Cells[12].Value); startTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[1].Value).ToString("yyyy-MM-dd HH:mm:ss"); endTime = Convert.ToDateTime(dataGridView_times.Rows[rowIndex].Cells[2].Value).ToString("yyyy-MM-dd HH:mm:ss"); resultAccStr = dataGridView_times.Rows[rowIndex].Cells[3].Value.ToString(); diff --git a/RbFreqStandMeasure/info/ExportDlg.cs b/RbFreqStandMeasure/info/ExportDlg.cs index 53a903a..6b1b03a 100644 --- a/RbFreqStandMeasure/info/ExportDlg.cs +++ b/RbFreqStandMeasure/info/ExportDlg.cs @@ -100,6 +100,7 @@ tableTimes.Columns.Add("stability10", Type.GetType("System.String")); tableTimes.Columns.Add("stability20", Type.GetType("System.String")); tableTimes.Columns.Add("stability100", Type.GetType("System.String")); + tableTimes.Columns.Add("id", Type.GetType("System.Int64")); // 获取当前页的数据 List queryList = detectionItemService.search(deviceId, false); @@ -109,7 +110,7 @@ int index = 1; foreach (DetectionItem detection in queryList) { - tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100); + tableTimes.Rows.Add(index, detection.StartTime, detection.EndTime, detection.Accuracy, detection.Stability, detection.BootFeature, detection.AgeRate, detection.Channel, detection.Stability1, detection.Stability10, detection.Stability20, detection.Stability100,detection.Id); index++; } @@ -234,7 +235,7 @@ else if (type == 4) typeStr = "1-100"; // 获取数据 - List List = detectionService.search(deviceId, typeStr, startTime, endTime); + List List = detectionService.search(deviceId, typeStr, startTime, endTime,Convert.ToInt64(row.Cells[12].Value)); if (null != List && List.Count > 0) { string detecItemName = ""; diff --git a/RbFreqStandMeasure/info/ReDetecDlg.cs b/RbFreqStandMeasure/info/ReDetecDlg.cs index 0af7776..19e2f83 100644 --- a/RbFreqStandMeasure/info/ReDetecDlg.cs +++ b/RbFreqStandMeasure/info/ReDetecDlg.cs @@ -94,6 +94,8 @@ private void btn_reDetec_Click(object sender, EventArgs e) { + btn_reDetec.Enabled = false; + roundButton1.Enabled = false; string portName = ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[0]; int band = Convert.ToInt32(ConfigHelper.GetAppConfig("channel" + text_channelNo.Text).Split(' ')[1]); @@ -117,12 +119,16 @@ if (!port.IsOpen) { MessageBox.Show("无法打开通道"+ channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } } catch (Exception exc) { MessageBox.Show("无法打开通道" + channelNoReDetec + "，检测失败！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } DetectionHelper detectionHelper = new DetectionHelper(); @@ -130,6 +136,8 @@ if (DetectionHelper.detectionHelper.getFrequencyData(port).Equals("")) { MessageBox.Show("请连接仪器到通道[" + channelNoReDetec + "]！"); + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; return; } @@ -150,6 +158,8 @@ } DetailDlg.label_redetecting.Visible = true; + btn_reDetec.Enabled = true; + roundButton1.Enabled = true; this.HideMaskAction(); } } diff --git a/RbFreqStandMeasure/tools/DetectionHelper.cs b/RbFreqStandMeasure/tools/DetectionHelper.cs index 3f14f44..242f3fa 100644 --- a/RbFreqStandMeasure/tools/DetectionHelper.cs +++ b/RbFreqStandMeasure/tools/DetectionHelper.cs @@ -120,7 +120,7 @@ if (resultStability1.Count == 101) timerStability1.Dispose(); if (!isUpdate && count1s < 101) { - detectionService.add(devIdStability, fre, "1-1"); + detectionService.add(devIdStability, fre, "1-1",detectionItemId); count1s++; } } @@ -200,7 +200,7 @@ if (resultStability10.Count == 101) timerStability10.Dispose(); if (!isUpdate && count10s < 101) { - detectionService.add(devIdStability, fre, "1-10"); + detectionService.add(devIdStability, fre, "1-10", detectionItemId); count10s++; } } @@ -269,7 +269,7 @@ resultStability20.Add(fre); if (!isUpdate && count20s < 101) { - detectionService.add(devIdStability, fre, "1-20"); + detectionService.add(devIdStability, fre, "1-20", detectionItemId); count20s++; } } @@ -343,7 +343,7 @@ if (!fre.Equals("") && resultStability100.Count < 101) { resultStability100.Add(fre); - if (!isUpdate) detectionService.add(devIdStability, fre, "1-100"); + if (!isUpdate) detectionService.add(devIdStability, fre, "1-100", detectionItemId); } LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "稳定度100s fre=" + fre + ", devId =" + devIdStability); @@ -440,7 +440,7 @@ resultList.Add(fre); if (!isUpdate) { - detectionService.add(devIdAccuracy, fre, "2"); + detectionService.add(devIdAccuracy, fre, "2", detectionItemId); } if (resultList.Count == 3) { @@ -529,7 +529,7 @@ if (count == 3) break; } } - detectionService.add(devIdBootFeature, sum / 3 + "", "3"); + detectionService.add(devIdBootFeature, sum / 3 + "", "3", detectionItemId); resultBootFeature.Add(sum / 3 + ""); if (resultBootFeature.Count == 8) @@ -600,7 +600,7 @@ if (count == 3) break; } } - detectionService.add(devIdAgeRate, sum / 3+"", "4"); + detectionService.add(devIdAgeRate, sum / 3+"", "4", detectionItemId); resultAgeRate.Add(sum / 3 + ""); if (resultAgeRate.Count == 15) diff --git a/Setup/Debug/Setup.msi b/Setup/Debug/Setup.msi new file mode 100644 index 0000000..bfb0f3e --- /dev/null +++ b/Setup/Debug/Setup.msi Binary files differ diff --git a/Setup/Debug/setup.exe b/Setup/Debug/setup.exe new file mode 100644 index 0000000..90b8c09 --- /dev/null +++ b/Setup/Debug/setup.exe Binary files differ diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj new file mode 100644 index 0000000..0c6d38d --- /dev/null +++ b/Setup/Setup.vdproj @@ -0,0 +1,3979 @@ +"DeployProject" +{ +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:Setup" +"LanguageId" = "3:2052" +"CodePage" = "3:936" +"UILanguageId" = "3:2052" +"SccProjectName" = "8:" +"SccLocalPath" = "8:" +"SccAuxPath" = "8:" +"SccProvider" = "8:" + "Hierarchy" + { + "Entry" + { + "MsmKey" = "8:_003B6AF41E0F38458DDF0DF6386B76AA" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_030387E440E5432785FE861A9B297785" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0536C1A5D0B24523B30201F955C3A2F4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0BA63B211158458999CC53DDB89F6C2F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0D2458056179D790D585498EE9A5F4EF" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0D6C8738269846E59FA6C39D44E520DA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0E19C753DCDA47B59B5793C78C5281BC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0F54A64D7C494E9D9B725BDFECAAF059" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_17F1C57F1AA96573458586007856AF08" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1FB899DB65A640BBB870FD39158A5222" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_22AD39A9561542BC92E65F84DEF1ED7E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_25A1499FB33CF2C34FA9DFA0C5B639B8" + "OwnerKey" = "8:_6AE40413D5794AF7A74D5DD4973D7610" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_25A1499FB33CF2C34FA9DFA0C5B639B8" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_25A1499FB33CF2C34FA9DFA0C5B639B8" + "OwnerKey" = "8:_17F1C57F1AA96573458586007856AF08" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3142BCDF8B29A02AC13E5CC74CB705C8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_37CAF19AB97E4EE2A94420077E08D1F4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_381F4FEDDE4B4020AE7CA9BFF60A53AB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_C789A31E9AC7C02C5B007B8815A3C745" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_AD650E83EB25F79334777D65DE308F0E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_418D07DD769487851324C7DDEE363C10" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_78374C15E4A340C15A881DD9C41AEBC8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_FA43CE8B7432BA8AF52C37331A1AF899" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_5F905727AC608E464F76098B457BB5EC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_C0B6DDD5F29C4227ACC561B444622C92" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_50B1EEB947A061662A02D16C4EC5317A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_0536C1A5D0B24523B30201F955C3A2F4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_A1B9EA35CD0145AEB3B35274A5B01CE9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_1FB899DB65A640BBB870FD39158A5222" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_4398D0E50F01405A9479886D3CF96A90" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_AA8C20FF7D34F451DF7DB0A551BC83F4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_F1A2F68FF877442EB7641777229E9643" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_68D2F425FE0244EFB7D2CB762B28F8A9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "OwnerKey" = "8:_3EE5266720F244889E0412E22A480458" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_39E84948F1644A52AD74C8C7FFC338BF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3EE5266720F244889E0412E22A480458" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_418D07DD769487851324C7DDEE363C10" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4398D0E50F01405A9479886D3CF96A90" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4B4F3E42732A399983D5945F3F1C69EF" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4F7942495ECF4C26BDC92B61662FDD51" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4FDA0E4FFC0E541781539AEE55135BF5" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4FDA0E4FFC0E541781539AEE55135BF5" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_506FF34E4A024894A65D8923B0AF7EBA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_50B1EEB947A061662A02D16C4EC5317A" + "OwnerKey" = "8:_C0B6DDD5F29C4227ACC561B444622C92" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_50B1EEB947A061662A02D16C4EC5317A" + "OwnerKey" = "8:_AD650E83EB25F79334777D65DE308F0E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_50B1EEB947A061662A02D16C4EC5317A" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_551153E49FDB4219A902C285A030828D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_560B85A5ABC44EE5ABAA34D392BDC039" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5C029314FD4F48B4B5A0C4F209C16A8E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5F905727AC608E464F76098B457BB5EC" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_625F1CDE92CB47AC8C0D278288D317F5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_68D2F425FE0244EFB7D2CB762B28F8A9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6AE40413D5794AF7A74D5DD4973D7610" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6FCE206EC6A74BF4A19EA92467C7DC81" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_78374C15E4A340C15A881DD9C41AEBC8" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7E5627E19E977062B63AF9176C9E8601" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_80FF696CF96205C4BFB0F43C4C4D9DC4" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_80FF696CF96205C4BFB0F43C4C4D9DC4" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_89596EC23DC64E96A69AB4DC0048D355" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8AB4750FEC2D4D2BB68B584A9A35C072" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E0CCEA1D7658B4EAEFC8B91EB19133D" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E0CCEA1D7658B4EAEFC8B91EB19133D" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91012EC7884047C68264E7FACF9B4E55" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_919D3EA0147144FD87D3CF802DC2887E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_17F1C57F1AA96573458586007856AF08" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_560B85A5ABC44EE5ABAA34D392BDC039" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_A214135493E84854B38CD7EEC629BDFA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_6AE40413D5794AF7A74D5DD4973D7610" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91B25D09566D76ACE29286681A81594C" + "OwnerKey" = "8:_B38B4BDCE1DDC150231BAF6224559A8C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91DC1CCCB1584927AFFAB8E64071A2FE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_965D1C9E6EF547D38DA4B002830073FA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A1B9EA35CD0145AEB3B35274A5B01CE9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A214135493E84854B38CD7EEC629BDFA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A24CCFB76EF8C9DDEE0A0C2C6217D459" + "OwnerKey" = "8:_8AB4750FEC2D4D2BB68B584A9A35C072" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9C476DF70324E04B842AEE70C28078F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9DAEBA8C081EC6F7F1E37F7C46BD704" + "OwnerKey" = "8:_0536C1A5D0B24523B30201F955C3A2F4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9DAEBA8C081EC6F7F1E37F7C46BD704" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9DAEBA8C081EC6F7F1E37F7C46BD704" + "OwnerKey" = "8:_BF74B7CFF033E4D9A64554C29CA09B66" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9DAEBA8C081EC6F7F1E37F7C46BD704" + "OwnerKey" = "8:_50B1EEB947A061662A02D16C4EC5317A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AA8C20FF7D34F451DF7DB0A551BC83F4" + "OwnerKey" = "8:_4398D0E50F01405A9479886D3CF96A90" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AA8C20FF7D34F451DF7DB0A551BC83F4" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AA8C20FF7D34F451DF7DB0A551BC83F4" + "OwnerKey" = "8:_78374C15E4A340C15A881DD9C41AEBC8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AD650E83EB25F79334777D65DE308F0E" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B38B4BDCE1DDC150231BAF6224559A8C" + "OwnerKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B38B4BDCE1DDC150231BAF6224559A8C" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B38B4BDCE1DDC150231BAF6224559A8C" + "OwnerKey" = "8:_560B85A5ABC44EE5ABAA34D392BDC039" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BD7699D45452B6ACCFA0734D07317659" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BD7699D45452B6ACCFA0734D07317659" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BF74B7CFF033E4D9A64554C29CA09B66" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C0B6DDD5F29C4227ACC561B444622C92" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C3B9AD72A61A48E787FF9EAF0CDCE196" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C4F4A346BE4B4CC98D94C8EA0849F7CC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C789A31E9AC7C02C5B007B8815A3C745" + "OwnerKey" = "8:_3EE5266720F244889E0412E22A480458" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C789A31E9AC7C02C5B007B8815A3C745" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C789A31E9AC7C02C5B007B8815A3C745" + "OwnerKey" = "8:_5F905727AC608E464F76098B457BB5EC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C8ED63133FFA4D208B3C364DD187698C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C9F50CDCB4A6B4C0B5EB55C81FEE270F" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C9F50CDCB4A6B4C0B5EB55C81FEE270F" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CDACFA15F5894435B7FD75C07912710D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D61082109D33432AAAEF657C90995627" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DA418D658FC7487BB8111FE903CBE233" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DE8092F760064AA19427561144CFD79E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF3A65A96B2840819DD4B6C6AF9AA0FB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E35D8F0DA75F4F35B52B9BB3AE00EC75" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_919D3EA0147144FD87D3CF802DC2887E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_4B4F3E42732A399983D5945F3F1C69EF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_17F1C57F1AA96573458586007856AF08" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_91DC1CCCB1584927AFFAB8E64071A2FE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_25A1499FB33CF2C34FA9DFA0C5B639B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "OwnerKey" = "8:_6AE40413D5794AF7A74D5DD4973D7610" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_EE2AADD07663406192906612388316D3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F1A2F68FF877442EB7641777229E9643" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F2922485FBA44268BF5F67DDF367719B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F56447543171436AA553FBD1194485AD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F6C2E2E98F314379A2556D90385E9500" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FA43CE8B7432BA8AF52C37331A1AF899" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_17F1C57F1AA96573458586007856AF08" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_91DC1CCCB1584927AFFAB8E64071A2FE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_560B85A5ABC44EE5ABAA34D392BDC039" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_25A1499FB33CF2C34FA9DFA0C5B639B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "OwnerKey" = "8:_6AE40413D5794AF7A74D5DD4973D7610" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_38640B351CF0F7E420AD6F2D4876799E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_003B6AF41E0F38458DDF0DF6386B76AA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7E5627E19E977062B63AF9176C9E8601" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_AD650E83EB25F79334777D65DE308F0E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BF74B7CFF033E4D9A64554C29CA09B66" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_418D07DD769487851324C7DDEE363C10" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_78374C15E4A340C15A881DD9C41AEBC8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0D2458056179D790D585498EE9A5F4EF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_FA43CE8B7432BA8AF52C37331A1AF899" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5F905727AC608E464F76098B457BB5EC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4B4F3E42732A399983D5945F3F1C69EF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_17F1C57F1AA96573458586007856AF08" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_91DC1CCCB1584927AFFAB8E64071A2FE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_560B85A5ABC44EE5ABAA34D392BDC039" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A214135493E84854B38CD7EEC629BDFA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5C029314FD4F48B4B5A0C4F209C16A8E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6AE40413D5794AF7A74D5DD4973D7610" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_25A1499FB33CF2C34FA9DFA0C5B639B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_919D3EA0147144FD87D3CF802DC2887E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E58ACE1251417E198DB7FB12C93699D1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B38B4BDCE1DDC150231BAF6224559A8C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_FC9FDFCC986590F9A5A45B8F29C80E48" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_91B25D09566D76ACE29286681A81594C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_EE2AADD07663406192906612388316D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_80FF696CF96205C4BFB0F43C4C4D9DC4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8E0CCEA1D7658B4EAEFC8B91EB19133D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C9F50CDCB4A6B4C0B5EB55C81FEE270F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BD7699D45452B6ACCFA0734D07317659" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4FDA0E4FFC0E541781539AEE55135BF5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DA418D658FC7487BB8111FE903CBE233" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CDACFA15F5894435B7FD75C07912710D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DE8092F760064AA19427561144CFD79E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0D6C8738269846E59FA6C39D44E520DA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0BA63B211158458999CC53DDB89F6C2F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C8ED63133FFA4D208B3C364DD187698C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8AB4750FEC2D4D2BB68B584A9A35C072" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A24CCFB76EF8C9DDEE0A0C2C6217D459" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_381F4FEDDE4B4020AE7CA9BFF60A53AB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_39E84948F1644A52AD74C8C7FFC338BF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0E19C753DCDA47B59B5793C78C5281BC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_625F1CDE92CB47AC8C0D278288D317F5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_D61082109D33432AAAEF657C90995627" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0F54A64D7C494E9D9B725BDFECAAF059" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C0B6DDD5F29C4227ACC561B444622C92" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_50B1EEB947A061662A02D16C4EC5317A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_89596EC23DC64E96A69AB4DC0048D355" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F6C2E2E98F314379A2556D90385E9500" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_3142BCDF8B29A02AC13E5CC74CB705C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F6C2E2E98F314379A2556D90385E9500" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F2922485FBA44268BF5F67DDF367719B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0536C1A5D0B24523B30201F955C3A2F4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A9DAEBA8C081EC6F7F1E37F7C46BD704" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A1B9EA35CD0145AEB3B35274A5B01CE9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1FB899DB65A640BBB870FD39158A5222" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4398D0E50F01405A9479886D3CF96A90" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_AA8C20FF7D34F451DF7DB0A551BC83F4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E35D8F0DA75F4F35B52B9BB3AE00EC75" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F1A2F68FF877442EB7641777229E9643" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_68D2F425FE0244EFB7D2CB762B28F8A9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_3EE5266720F244889E0412E22A480458" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C789A31E9AC7C02C5B007B8815A3C745" + "MsmSig" = "8:_UNDEFINED" + } + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug\\Setup.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:Release\\Setup.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + } + "Deployable" + { + "CustomAction" + { + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" + { + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_F2F30F091AE14A53ADD822997AF05360" + { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "FrameworkVersion" = "8:.NETFramework,Version=v4.6.1" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" + } + } + } + "File" + { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_003B6AF41E0F38458DDF0DF6386B76AA" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:NationalInstruments.Common, Version=9.1.40.159, Culture=neutral, PublicKeyToken=dc6ad606294fc298, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_003B6AF41E0F38458DDF0DF6386B76AA" + { + "Name" = "8:NationalInstruments.Common.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:NationalInstruments.Common.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_030387E440E5432785FE861A9B297785" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\RbFreqStandMeasure.exe.config" + "TargetName" = "8:RbFreqStandMeasure.exe.config" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0536C1A5D0B24523B30201F955C3A2F4" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.SuperGrid, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0536C1A5D0B24523B30201F955C3A2F4" + { + "Name" = "8:DevComponents.DotNetBar.SuperGrid.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.SuperGrid.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0BA63B211158458999CC53DDB89F6C2F" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Web, Version=8.0.18.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0BA63B211158458999CC53DDB89F6C2F" + { + "Name" = "8:MySql.Web.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\MySql.Web.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0D2458056179D790D585498EE9A5F4EF" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Keyboard, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0D2458056179D790D585498EE9A5F4EF" + { + "Name" = "8:DevComponents.DotNetBar.Keyboard.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.Keyboard.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0D6C8738269846E59FA6C39D44E520DA" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:NationalInstruments.Common, Version=9.1.40.159, Culture=neutral, PublicKeyToken=dc6ad606294fc298, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0D6C8738269846E59FA6C39D44E520DA" + { + "Name" = "8:NationalInstruments.Common.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\NationalInstruments.Common.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0E19C753DCDA47B59B5793C78C5281BC" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0E19C753DCDA47B59B5793C78C5281BC" + { + "Name" = "8:Microsoft.Web.Infrastructure.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\Microsoft.Web.Infrastructure.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0F54A64D7C494E9D9B725BDFECAAF059" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.TreeGX, Version=14.1.0.37, Culture=neutral, PublicKeyToken=055db68f670cfeab, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0F54A64D7C494E9D9B725BDFECAAF059" + { + "Name" = "8:DevComponents.TreeGX.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.TreeGX.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_17F1C57F1AA96573458586007856AF08" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_17F1C57F1AA96573458586007856AF08" + { + "Name" = "8:System.Web.Mvc.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Web.Mvc.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1FB899DB65A640BBB870FD39158A5222" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1FB899DB65A640BBB870FD39158A5222" + { + "Name" = "8:DevComponents.DotNetBar.Layout.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.Layout.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_22AD39A9561542BC92E65F84DEF1ED7E" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\mysql.exe" + "TargetName" = "8:mysql.exe" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_25A1499FB33CF2C34FA9DFA0C5B639B8" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_25A1499FB33CF2C34FA9DFA0C5B639B8" + { + "Name" = "8:System.Web.WebPages.Razor.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Web.WebPages.Razor.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3142BCDF8B29A02AC13E5CC74CB705C8" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.Instrumentation, Version=14.1.0.37, Culture=neutral, PublicKeyToken=f90dc37c26666a67, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_3142BCDF8B29A02AC13E5CC74CB705C8" + { + "Name" = "8:DevComponents.Instrumentation.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.Instrumentation.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_37CAF19AB97E4EE2A94420077E08D1F4" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\RbFreqStandMeasure.pdb" + "TargetName" = "8:RbFreqStandMeasure.pdb" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_381F4FEDDE4B4020AE7CA9BFF60A53AB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Data.EntityFramework, Version=8.0.18.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_381F4FEDDE4B4020AE7CA9BFF60A53AB" + { + "Name" = "8:MySql.Data.EntityFramework.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\MySql.Data.EntityFramework.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_38640B351CF0F7E420AD6F2D4876799E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_38640B351CF0F7E420AD6F2D4876799E" + { + "Name" = "8:DevComponents.DotNetBar2.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_39E84948F1644A52AD74C8C7FFC338BF" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Data, Version=5.2.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_39E84948F1644A52AD74C8C7FFC338BF" + { + "Name" = "8:MySql.Data.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\MySql.Data.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3EE5266720F244889E0412E22A480458" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_3EE5266720F244889E0412E22A480458" + { + "Name" = "8:DevComponents.Charts.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.Charts.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_418D07DD769487851324C7DDEE363C10" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Schedule, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_418D07DD769487851324C7DDEE363C10" + { + "Name" = "8:DevComponents.DotNetBar.Schedule.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.Schedule.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4398D0E50F01405A9479886D3CF96A90" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_4398D0E50F01405A9479886D3CF96A90" + { + "Name" = "8:DevComponents.DotNetBar.Layout.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.Layout.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4B4F3E42732A399983D5945F3F1C69EF" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_4B4F3E42732A399983D5945F3F1C69EF" + { + "Name" = "8:System.Web.Helpers.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Web.Helpers.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F7942495ECF4C26BDC92B61662FDD51" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\mysqldump.exe" + "TargetName" = "8:mysqldump.exe" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FDA0E4FFC0E541781539AEE55135BF5" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:Ivi.Visa, Version=5.11.0.0, Culture=neutral, PublicKeyToken=a128c98f1d7717c1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_4FDA0E4FFC0E541781539AEE55135BF5" + { + "Name" = "8:Ivi.Visa.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Ivi.Visa.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_506FF34E4A024894A65D8923B0AF7EBA" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\Ivi.Visa.xml" + "TargetName" = "8:Ivi.Visa.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_50B1EEB947A061662A02D16C4EC5317A" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.SuperGrid, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_50B1EEB947A061662A02D16C4EC5317A" + { + "Name" = "8:DevComponents.DotNetBar.SuperGrid.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.SuperGrid.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_551153E49FDB4219A902C285A030828D" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.WebPages.Razor.xml" + "TargetName" = "8:System.Web.WebPages.Razor.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_560B85A5ABC44EE5ABAA34D392BDC039" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_560B85A5ABC44EE5ABAA34D392BDC039" + { + "Name" = "8:System.Web.WebPages.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.WebPages.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C029314FD4F48B4B5A0C4F209C16A8E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_5C029314FD4F48B4B5A0C4F209C16A8E" + { + "Name" = "8:System.Web.Razor.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.Razor.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F905727AC608E464F76098B457BB5EC" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_5F905727AC608E464F76098B457BB5EC" + { + "Name" = "8:DevComponents.Charts.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.Charts.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_625F1CDE92CB47AC8C0D278288D317F5" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_625F1CDE92CB47AC8C0D278288D317F5" + { + "Name" = "8:log4net.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\log4net.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_68D2F425FE0244EFB7D2CB762B28F8A9" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Charts, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_68D2F425FE0244EFB7D2CB762B28F8A9" + { + "Name" = "8:DevComponents.DotNetBar.Charts.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.Charts.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6AE40413D5794AF7A74D5DD4973D7610" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_6AE40413D5794AF7A74D5DD4973D7610" + { + "Name" = "8:System.Web.Mvc.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.Mvc.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6FCE206EC6A74BF4A19EA92467C7DC81" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.WebPages.xml" + "TargetName" = "8:System.Web.WebPages.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_78374C15E4A340C15A881DD9C41AEBC8" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_78374C15E4A340C15A881DD9C41AEBC8" + { + "Name" = "8:DevComponents.DotNetBar.Layout.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.Layout.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E5627E19E977062B63AF9176C9E8601" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.TreeGX, Version=14.1.0.37, Culture=neutral, PublicKeyToken=055db68f670cfeab, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_7E5627E19E977062B63AF9176C9E8601" + { + "Name" = "8:DevComponents.TreeGX.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.TreeGX.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_80FF696CF96205C4BFB0F43C4C4D9DC4" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_80FF696CF96205C4BFB0F43C4C4D9DC4" + { + "Name" = "8:Newtonsoft.Json.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Newtonsoft.Json.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89596EC23DC64E96A69AB4DC0048D355" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.Instrumentation, Version=14.1.0.37, Culture=neutral, PublicKeyToken=f90dc37c26666a67, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_89596EC23DC64E96A69AB4DC0048D355" + { + "Name" = "8:DevComponents.Instrumentation.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.Instrumentation.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8AB4750FEC2D4D2BB68B584A9A35C072" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Data.EntityFrameworkCore.Design, Version=8.0.18.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_8AB4750FEC2D4D2BB68B584A9A35C072" + { + "Name" = "8:MySQL.Data.EntityFrameworkCore.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\MySQL.Data.EntityFrameworkCore.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E0CCEA1D7658B4EAEFC8B91EB19133D" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:NationalInstruments.Visa, Version=15.5.0.49152, Culture=neutral, PublicKeyToken=2eaa5af0834e221d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_8E0CCEA1D7658B4EAEFC8B91EB19133D" + { + "Name" = "8:NationalInstruments.Visa.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:NationalInstruments.Visa.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_91012EC7884047C68264E7FACF9B4E55" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.Razor.xml" + "TargetName" = "8:System.Web.Razor.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_919D3EA0147144FD87D3CF802DC2887E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_919D3EA0147144FD87D3CF802DC2887E" + { + "Name" = "8:System.Web.Helpers.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.Helpers.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91B25D09566D76ACE29286681A81594C" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_91B25D09566D76ACE29286681A81594C" + { + "Name" = "8:Microsoft.Web.Infrastructure.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.Web.Infrastructure.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91DC1CCCB1584927AFFAB8E64071A2FE" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_91DC1CCCB1584927AFFAB8E64071A2FE" + { + "Name" = "8:System.Web.WebPages.Razor.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.WebPages.Razor.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_965D1C9E6EF547D38DA4B002830073FA" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\Newtonsoft.Json.xml" + "TargetName" = "8:Newtonsoft.Json.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A1B9EA35CD0145AEB3B35274A5B01CE9" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Schedule, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A1B9EA35CD0145AEB3B35274A5B01CE9" + { + "Name" = "8:DevComponents.DotNetBar.Schedule.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.Schedule.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A214135493E84854B38CD7EEC629BDFA" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A214135493E84854B38CD7EEC629BDFA" + { + "Name" = "8:System.Web.WebPages.Deployment.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.WebPages.Deployment.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A24CCFB76EF8C9DDEE0A0C2C6217D459" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Data.EntityFrameworkCore, Version=8.0.18.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A24CCFB76EF8C9DDEE0A0C2C6217D459" + { + "Name" = "8:MySql.Data.EntityFrameworkCore.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:MySql.Data.EntityFrameworkCore.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9C476DF70324E04B842AEE70C28078F" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\app.ico" + "TargetName" = "8:app.ico" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A9DAEBA8C081EC6F7F1E37F7C46BD704" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:DevComponents.Instrumentation, Version=14.1.0.37, Culture=neutral, PublicKeyToken=f90dc37c26666a67, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A9DAEBA8C081EC6F7F1E37F7C46BD704" + { + "Name" = "8:DevComponents.Instrumentation.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.Instrumentation.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AA8C20FF7D34F451DF7DB0A551BC83F4" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Layout, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_AA8C20FF7D34F451DF7DB0A551BC83F4" + { + "Name" = "8:DevComponents.DotNetBar.Layout.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.Layout.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AD650E83EB25F79334777D65DE308F0E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=26d81176cfa2b486, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_AD650E83EB25F79334777D65DE308F0E" + { + "Name" = "8:DevComponents.SuperGrid.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.SuperGrid.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B38B4BDCE1DDC150231BAF6224559A8C" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_B38B4BDCE1DDC150231BAF6224559A8C" + { + "Name" = "8:System.Web.WebPages.Deployment.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Web.WebPages.Deployment.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BD7699D45452B6ACCFA0734D07317659" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_BD7699D45452B6ACCFA0734D07317659" + { + "Name" = "8:log4net.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:log4net.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF74B7CFF033E4D9A64554C29CA09B66" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.Instrumentation.Design, Version=14.1.0.36, Culture=neutral, PublicKeyToken=76cb4c6eb576bca5, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_BF74B7CFF033E4D9A64554C29CA09B66" + { + "Name" = "8:DevComponents.Instrumentation.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.Instrumentation.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C0B6DDD5F29C4227ACC561B444622C92" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=26d81176cfa2b486, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C0B6DDD5F29C4227ACC561B444622C92" + { + "Name" = "8:DevComponents.SuperGrid.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.SuperGrid.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C3B9AD72A61A48E787FF9EAF0CDCE196" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.Mvc.xml" + "TargetName" = "8:System.Web.Mvc.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C4F4A346BE4B4CC98D94C8EA0849F7CC" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.Helpers.xml" + "TargetName" = "8:System.Web.Helpers.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C789A31E9AC7C02C5B007B8815A3C745" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Charts, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C789A31E9AC7C02C5B007B8815A3C745" + { + "Name" = "8:DevComponents.DotNetBar.Charts.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.Charts.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8ED63133FFA4D208B3C364DD187698C" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Data.EntityFrameworkCore, Version=8.0.18.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C8ED63133FFA4D208B3C364DD187698C" + { + "Name" = "8:MySQL.Data.EntityFrameworkCore.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\MySQL.Data.EntityFrameworkCore.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C9F50CDCB4A6B4C0B5EB55C81FEE270F" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MySql.Data, Version=5.2.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C9F50CDCB4A6B4C0B5EB55C81FEE270F" + { + "Name" = "8:MySql.Data.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:MySql.Data.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CDACFA15F5894435B7FD75C07912710D" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:NationalInstruments.VisaNS, Version=9.0.40.156, Culture=neutral, PublicKeyToken=dc6ad606294fc298, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_CDACFA15F5894435B7FD75C07912710D" + { + "Name" = "8:NationalInstruments.VisaNS.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\NationalInstruments.VisaNS.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D61082109D33432AAAEF657C90995627" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Ivi.Visa, Version=5.11.0.0, Culture=neutral, PublicKeyToken=a128c98f1d7717c1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_D61082109D33432AAAEF657C90995627" + { + "Name" = "8:Ivi.Visa.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\Ivi.Visa.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DA418D658FC7487BB8111FE903CBE233" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_DA418D658FC7487BB8111FE903CBE233" + { + "Name" = "8:Newtonsoft.Json.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\Newtonsoft.Json.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE8092F760064AA19427561144CFD79E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:NationalInstruments.Visa, Version=15.5.0.49152, Culture=neutral, PublicKeyToken=2eaa5af0834e221d, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_DE8092F760064AA19427561144CFD79E" + { + "Name" = "8:NationalInstruments.Visa.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\NationalInstruments.Visa.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DF3A65A96B2840819DD4B6C6AF9AA0FB" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\log4net.xml" + "TargetName" = "8:log4net.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E35D8F0DA75F4F35B52B9BB3AE00EC75" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Keyboard, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_E35D8F0DA75F4F35B52B9BB3AE00EC75" + { + "Name" = "8:DevComponents.DotNetBar.Keyboard.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.Keyboard.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E58ACE1251417E198DB7FB12C93699D1" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_E58ACE1251417E198DB7FB12C93699D1" + { + "Name" = "8:System.Web.WebPages.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Web.WebPages.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EE2AADD07663406192906612388316D3" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:RbFreqStandMeasure, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_EE2AADD07663406192906612388316D3" + { + "Name" = "8:RbFreqStandMeasure.exe" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\RbFreqStandMeasure.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1A2F68FF877442EB7641777229E9643" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_F1A2F68FF877442EB7641777229E9643" + { + "Name" = "8:DevComponents.DotNetBar.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F2922485FBA44268BF5F67DDF367719B" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_F2922485FBA44268BF5F67DDF367719B" + { + "Name" = "8:DevComponents.DotNetBar2.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.DotNetBar2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F56447543171436AA553FBD1194485AD" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\System.Web.WebPages.Deployment.xml" + "TargetName" = "8:System.Web.WebPages.Deployment.xml" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F6C2E2E98F314379A2556D90385E9500" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.Instrumentation.Design, Version=14.1.0.36, Culture=neutral, PublicKeyToken=76cb4c6eb576bca5, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_F6C2E2E98F314379A2556D90385E9500" + { + "Name" = "8:DevComponents.Instrumentation.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\RbFreqStandMeasure\\bin\\Debug\\DevComponents.Instrumentation.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA43CE8B7432BA8AF52C37331A1AF899" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_FA43CE8B7432BA8AF52C37331A1AF899" + { + "Name" = "8:DevComponents.DotNetBar.Design.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DevComponents.DotNetBar.Design.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC9FDFCC986590F9A5A45B8F29C80E48" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_FC9FDFCC986590F9A5A45B8F29C80E48" + { + "Name" = "8:System.Web.Razor.DLL" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Web.Razor.DLL" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + } + "FileType" + { + } + "Folder" + { + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_1084960B63014436B9ECC0E164907644" + { + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "Name" = "8:#1925" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:TARGETDIR" + "Folders" + { + } + } + "{1525181F-901A-416C-8A58-119130FE478E}:_96E8BB29CD684DCC919C39104C3FC659" + { + "Name" = "8:#1916" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:DesktopFolder" + "Folders" + { + } + } + "{1525181F-901A-416C-8A58-119130FE478E}:_C87E4E6FAFA24F7BA25A7D342F1124E6" + { + "Name" = "8:#1919" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:ProgramMenuFolder" + "Folders" + { + } + } + } + "LaunchCondition" + { + } + "Locator" + { + } + "MsiBootstrapper" + { + "LangId" = "3:2052" + "RequiresElevation" = "11:FALSE" + } + "Product" + { + "Name" = "8:Microsoft Visual Studio" + "ProductName" = "8:RbFreqStandMeasure" + "ProductCode" = "8:{37E4AFC3-7938-4253-B05E-04A4A3D15512}" + "PackageCode" = "8:{DC4CDDE8-7E54-4860-8965-E16B9F889F2C}" + "UpgradeCode" = "8:{4DA889E8-641C-48C0-A947-DE74618944C7}" + "AspNetVersion" = "8:4.0.30319.0" + "RestartWWWService" = "11:FALSE" + "RemovePreviousVersions" = "11:FALSE" + "DetectNewerInstalledVersion" = "11:TRUE" + "InstallAllUsers" = "11:FALSE" + "ProductVersion" = "8:1.0.0" + "Manufacturer" = "8:Casic203" + "ARPHELPTELEPHONE" = "8:" + "ARPHELPLINK" = "8:" + "Title" = "8:Setup" + "Subject" = "8:" + "ARPCONTACT" = "8:Casic203" + "Keywords" = "8:" + "ARPCOMMENTS" = "8:" + "ARPURLINFOABOUT" = "8:" + "ARPPRODUCTICON" = "8:" + "ARPIconIndex" = "3:0" + "SearchPath" = "8:" + "UseSystemSearchPath" = "11:TRUE" + "TargetPlatform" = "3:0" + "PreBuildEvent" = "8:" + "PostBuildEvent" = "8:" + "RunPostBuildEvent" = "3:0" + } + "Registry" + { + "HKLM" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_A5BCAC8C96C74E5B9D77117CE7E4791C" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_D13409F8AE2F4348B40F702860AE59D0" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCU" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_BED86152F03C42478172351EA8A0F496" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_EA1DDFACA80449C88EE357D34BB1FC7E" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCR" + { + "Keys" + { + } + } + "HKU" + { + "Keys" + { + } + } + "HKPU" + { + "Keys" + { + } + } + } + "Sequences" + { + } + "Shortcut" + { + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_9CEAA00B672B4207B595671B1ECEAA6A" + { + "Name" = "8:软件" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_8BF64AC0699F4E4BB2D04CE59B499361" + "Folder" = "8:_96E8BB29CD684DCC919C39104C3FC659" + "WorkingFolder" = "8:_1084960B63014436B9ECC0E164907644" + "Icon" = "8:" + "Feature" = "8:" + } + } + "UserInterface" + { + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_33E8531728AF423B991EDB91ACD1AABE" + { + "Name" = "8:#1901" + "Sequence" = "3:1" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3D86E57A0A58431CAB935937DBE9E471" + { + "Sequence" = "3:100" + "DisplayName" = "8:进度" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_38A4EC4F127740FA9E07303575EE8FFB" + { + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4CE7BF6BF524B809FB181C23796DF41" + { + "Sequence" = "3:100" + "DisplayName" = "8:已完成" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "UpdateText" + { + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3DB353671241410DA993E04096B0FE66" + { + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_68E168749A624F67930CBDB4B6EB9460" + { + "Sequence" = "3:100" + "DisplayName" = "8:进度" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_71FB61F4C1304464A9F0DE339C502A65" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1A4832C0CA094CF19F63E8C8BAF39135" + { + "Sequence" = "3:200" + "DisplayName" = "8:安装文件夹" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1ED4DC218E3A4366BB7773CF677525D7" + { + "Sequence" = "3:100" + "DisplayName" = "8:欢迎使用" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6F97AE868AF74CB6B26F593D4461EB5C" + { + "Sequence" = "3:300" + "DisplayName" = "8:确认安装" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A2B91508978B47AAA093ABE9026A41B5" + { + "Name" = "8:#1902" + "Sequence" = "3:2" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B2B3329D6A64C288E0EBE53897EC661" + { + "Sequence" = "3:100" + "DisplayName" = "8:已完成" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_B7C2A44F0C634C3289A71D5C06D90C56" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdBasicDialogs.wim" + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_B8D50D6175B64971BC708DB9DF7367B2" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E059C1D6FAC24CCC8C5CDDD285BC66B8" + { + "Name" = "8:#1900" + "Sequence" = "3:1" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1879C58533604DDE8A52E0248D8659A1" + { + "Sequence" = "3:200" + "DisplayName" = "8:安装文件夹" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A165A0A9CBC545E2AB5AA974831E26C6" + { + "Sequence" = "3:300" + "DisplayName" = "8:确认安装" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E1397B94351A4E0F94F8134AE01C5218" + { + "Sequence" = "3:100" + "DisplayName" = "8:欢迎使用" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + } + "MergeModule" + { + } + "ProjectOutput" + { + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BF64AC0699F4E4BB2D04CE59B499361" + { + "SourcePath" = "8:..\\RbFreqStandMeasure\\obj\\Debug\\RbFreqStandMeasure.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_1084960B63014436B9ECC0E164907644" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{F9A73B92-70CF-4F91-B58B-E461A180A75C}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + } + } +}