bug fixes and tasks: #106, #109, #118

itislab · May 10, 2018 · 6f335bc · 6f335bc
1 parent 534d6db
commit 6f335bc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/Application/AnnotationPlane/Columns/VisualColumnView.xaml.cs b/Application/AnnotationPlane/Columns/VisualColumnView.xaml.cs
@@ -45,6 +45,7 @@ public static class SideCurveGeneratorFactory
 
         public static ISideCurveGenerator GetGeneratorFor(Template.RightSideFormEnum rightSideForm) {
             switch (rightSideForm) {
+                case Template.RightSideFormEnum.NotDefined: return straight;
                 case Template.RightSideFormEnum.Straight: return straight;
                 case Template.RightSideFormEnum.Steps: return steps;
                 case Template.RightSideFormEnum.Wave: return wave;

diff --git a/Application/AnnotationPlane/Plane.xaml b/Application/AnnotationPlane/Plane.xaml
@@ -26,7 +26,7 @@
                 <media:GearsIcon />
             </Button>
             <Button Style="{StaticResource MetroButton}" Command="{Binding SaveImageCommand}" Height="50">
-                <media:ApertureIcon />
+                SVG
             </Button>
             <Button Style="{StaticResource MetroButton}" Command="{Binding SaveProjectCommand}" Height="50">
                 <media:SaveIcon />

diff --git a/Application/Intervals/BoreIntervalsVM.cs b/Application/Intervals/BoreIntervalsVM.cs
@@ -80,6 +80,7 @@ private void Initialize()
                 //activating the command that are set externally
                 ActivateIntervalImagesCommand.Execute(obj);
                 ///now performing additional actions
+                MessageBox.Show("Геологи!!! Разметка фотографии начинается с верхнего фрагмента керна!", "Направление разметки фото", MessageBoxButton.OK, MessageBoxImage.Exclamation);
                 PhotoCalibratedBoreIntervalVM vm = obj as PhotoCalibratedBoreIntervalVM;
                 if (vm.ImagesCount == 0)
                     vm.AddNewImageCommand.Execute(null);

diff --git a/Application/PhotoMarkup/AnnotatedPolygon.xaml.cs b/Application/PhotoMarkup/AnnotatedPolygon.xaml.cs
@@ -160,7 +160,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
 
                 string lengthStr = "не задана";
                 if (length > 0.0)
-                    lengthStr = string.Format("{0:#.00} м ({1:#.00} м - {2:#.00} м)", length, upperDepth,lowerDepth);
+                    lengthStr = string.Format("{0:#.00} м ({1:#.00} м - {2:#.00} м)", length, lowerDepth, upperDepth);
                 return string.Format("№{0}: длина {1}", order, lengthStr);
             }
             else return null;

diff --git a/Application/Reports/SVG/VisualColumnPainter.cs b/Application/Reports/SVG/VisualColumnPainter.cs
@@ -42,9 +42,14 @@ public override RenderedSvg RenderColumn()
             for (int i = 0; i < layers.Length; i++)
             {
                 VisualLayerPresentingVM lvm = layers[i];
-                if (lvm.BackgroundClass.CurrentClass != null && lvm.RightSideClass.CurrentClass != null && lvm.WidthClass.CurrentClass != null)
+                if (lvm.BackgroundClass.CurrentClass != null)
                 {
-                    ISideCurveGenerator sideCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(lvm.RightSideClass.CurrentClass.RightSideForm);
+                    ISideCurveGenerator sideCurveGenerator = null;
+
+                    if (lvm.RightSideClass.CurrentClass != null)
+                        sideCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(lvm.RightSideClass.CurrentClass.RightSideForm);
+                    else
+                        sideCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(AnnotationPlane.Template.RightSideFormEnum.NotDefined);
 
                     SvgPatternServer sps = lvm.BackgroundClass.CurrentClass.BackgroundPattern;
                     sps.PatternContentUnits = SvgCoordinateUnits.ObjectBoundingBox;