#110 implemented. core part length validation rule. reducing width of…

… layer editing columns
itislab · May 17, 2018 · 0d19a02 · 0d19a02
1 parent 5bec604
commit 0d19a02
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/Application/AnnotationPlane/LayerBoundaries/LayerLabel.xaml b/Application/AnnotationPlane/LayerBoundaries/LayerLabel.xaml
@@ -10,7 +10,7 @@
     <UserControl.Resources>
         <ap:NumberSelectorConverter x:Key="NumberSelectorConverter"/>
     </UserControl.Resources>
-    <Grid Height="40" Width="100">
+    <Grid Height="40" Width="50">
         <Rectangle HorizontalAlignment="Stretch" Height="40" Fill="LightCoral" Name="Rect"/>
         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16">
             <TextBlock.Text>

diff --git a/Application/AnnotationPlane/PlaneVM.cs b/Application/AnnotationPlane/PlaneVM.cs
@@ -1017,7 +1017,7 @@ public void SetPresentationColumns(ColumnSettingsVM columnDefinitions, Intervals
 
 
                         blankColumnVM.ColumnHeight = colHeight;
-                        blankColumnVM.ColumnWidth = 100;
+                        blankColumnVM.ColumnWidth = 50;
                         AnnoGridVM.Columns.Add(beVM);
                         RegisterForScaleSync(beVM, true);
                     }

diff --git a/Application/PhotoMarkup/CalibratedRegionInfoView.xaml b/Application/PhotoMarkup/CalibratedRegionInfoView.xaml
@@ -11,6 +11,7 @@
     <UserControl.Resources>
         <app:VisibilityHiddenConverter x:Key="visibilityHiddenConverter"/>
         <app:NanToEmptyStringDoubleConverter x:Key="nanToEmptyStringDoubleConverter"/>
+        <local:NonZeroDoubleValidationRule x:Key="nonZeroDoubleValidationRule"/>
     </UserControl.Resources>
     <Border CornerRadius="0" Background="White" Padding="15" Margin="15" Opacity="0.95">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
@@ -24,7 +25,15 @@
                 <Run Text="Участок №"/>
                 <Run Text="{Binding Order, FallbackValue=1}"/>
             </TextBlock>
-            <app:TextInput HintText="Введите длину участка (м)" Text="{Binding Length, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource nanToEmptyStringDoubleConverter}, ConverterParameter=#.00}" MinWidth="350"></app:TextInput>
+            <app:TextInput HintText="Введите длину участка (м)" MinWidth="350">
+                <app:TextInput.Text>
+                    <Binding Path="Length" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" Converter="{StaticResource nanToEmptyStringDoubleConverter}" ConverterParameter="0.00">
+                        <Binding.ValidationRules>
+                            <local:NonZeroDoubleValidationRule />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </app:TextInput.Text>
+            </app:TextInput>
             <Button Margin="2,10" FontSize="20" Visibility="{Binding CanMoveUp,Converter={StaticResource visibilityHiddenConverter}}" Command="{Binding MoveUp}" CommandParameter="{Binding Order}" Style="{StaticResource MetroButton}" Width="50">
                 <media:Arrow_In_circle>
                 </media:Arrow_In_circle>

diff --git a/Application/PhotoMarkup/CalibratedRegionInfoView.xaml.cs b/Application/PhotoMarkup/CalibratedRegionInfoView.xaml.cs
@@ -25,4 +25,32 @@ public CalibratedRegionInfoView()
             InitializeComponent();
         }
     }
+
+    public class NonZeroDoubleValidationRule : ValidationRule
+    {
+        public NonZeroDoubleValidationRule()
+        {
+        }
+
+        public override ValidationResult Validate(object value, System.Globalization.CultureInfo cultureInfo)
+        {
+            double result = 0;
+
+            try
+            {
+                if (((string)value).Length > 0) {
+                    result = Double.Parse((String)value);
+                }
+                else
+                    return new ValidationResult(false, "Пустое значение длины");
+            }
+            catch (Exception e)
+            {
+                return new ValidationResult(false, "Вы ввели не число: " + e.Message+". ВВедите число");
+            }
+            if (result <= 0.0)
+                return new ValidationResult(false,"Длина должна быть положительна");
+            return ValidationResult.ValidResult;
+        }
+    }
 }