|
|
|
|
@ -10,6 +10,7 @@ using Newtonsoft.Json; |
|
|
|
|
using Newtonsoft.Json.Linq; |
|
|
|
|
using SparkClient.Model.Common; |
|
|
|
|
using SparkClient.Model.Entity.ApiEntity; |
|
|
|
|
using SparkClient.Model.Extension; |
|
|
|
|
using SparkClient.Model.Helper; |
|
|
|
|
using SparkClient.Model.Services; |
|
|
|
|
using SparkClient.ViewModel.BaseWindow; |
|
|
|
|
@ -52,6 +53,8 @@ public class GradingLoadingVM : BaseViewModel,IDisposable |
|
|
|
|
private Diamond _diamond; |
|
|
|
|
private Scanner _scanner; |
|
|
|
|
private CancellationTokenSource _completionCts; |
|
|
|
|
|
|
|
|
|
string strImageModeImagePath = string.Empty; |
|
|
|
|
|
|
|
|
|
#region 图片播放控制 |
|
|
|
|
private PlayStatus _currentStatus = PlayStatus.Stopped; |
|
|
|
|
@ -197,7 +200,7 @@ public class GradingLoadingVM : BaseViewModel,IDisposable |
|
|
|
|
LoadImages(processImage.Result.Images); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
string strImageModeImagePath = string.Empty; |
|
|
|
|
|
|
|
|
|
if (type == 1) |
|
|
|
|
{ |
|
|
|
|
ImageSelect jsonImport = new ImageSelect(); |
|
|
|
|
@ -345,6 +348,7 @@ public class GradingLoadingVM : BaseViewModel,IDisposable |
|
|
|
|
parameter.Shape = _diamnondType.Split(" ")[0]; |
|
|
|
|
parameter.CrownType = _diamnondType.Split(" ")[1]; |
|
|
|
|
parameter.PavType = _diamnondType.Split(" ")[2]; |
|
|
|
|
parameter.error_msg = _diamnondType; |
|
|
|
|
|
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
@ -595,7 +599,7 @@ public class GradingLoadingVM : BaseViewModel,IDisposable |
|
|
|
|
{ |
|
|
|
|
if (ImagePaths == null || CurrentIndex < 0 || CurrentIndex >= ImagePaths.Length) |
|
|
|
|
return; |
|
|
|
|
string? savePath = ConfigurationManager.AppSettings["ImageFileBasePath"]; |
|
|
|
|
string? savePath = strImageModeImagePath.IsNullOrEmpty()? ConfigurationManager.AppSettings["ImageFileBasePath"]:strImageModeImagePath; |
|
|
|
|
var bitmap = new BitmapImage(); |
|
|
|
|
bitmap.BeginInit(); |
|
|
|
|
bitmap.CacheOption = BitmapCacheOption.OnLoad; |
|
|
|
|
|