feat:

ViewModel/Grading/DiamondSelectVM.cs

@@ -259,12 +259,13 @@ public class DiamondSelectVM : BaseViewModel
     {
         Application.Current.Dispatcher.Invoke(() =>
         {
+            loading.Close();
             new MessageBox().Show(errorMessage);
             // MessageBox msgDialog = 
             // // msgDialog.ErrorMessage = errorMessage;
             // msgDialog.ShowDialog();
         });
-        loading.Dispatcher.Invoke(() => loading.Close());
+        //loading.Dispatcher.Invoke(() => loading.Close());
     }
 
     /// <summary>

ViewModel/Grading/GradingResultVM.cs

@@ -1280,14 +1280,32 @@ public class GradingResultVM : BaseViewModel
     private void setGIRDLE_VALLEY_DETAIL(RowDetail row)
     {
         GirdleValleyDetail girdleValleyDetail = algorithmResult.measurements.GIRDLE_VALLEY_DETAIL;
-        row.item1 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_1);
-        row.item2 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_2);
-        row.item3 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_3);
-        row.item4 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_4);
-        row.item5 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_5);
-        row.item6 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_6);
-        row.item7 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_7);
-        row.item8 = FormatDouble_P(girdleValleyDetail.GIRDLE_VALLEY_8);
+        List<double> doubles = new List<double>();
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_1);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_2);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_3);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_4);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_5);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_6);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_7);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_8);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_9);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_10);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_11);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_12);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_13);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_14);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_15);
+        doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_16);
+        doubles.Sort();
+        row.item1 = FormatDouble_P(doubles[0]);
+        row.item2 = FormatDouble_P(doubles[1]);
+        row.item3 = FormatDouble_P(doubles[2]);
+        row.item4 = FormatDouble_P(doubles[3]);
+        row.item5 = FormatDouble_P(doubles[12]);
+        row.item6 = FormatDouble_P(doubles[13]);
+        row.item7 = FormatDouble_P(doubles[14]);
+        row.item8 = FormatDouble_P(doubles[15]);
         calIndex(row);
     }
     private void setSTAR_DETAIL(RowDetail row)