#161

sys27 · Nov 14, 2016 · a31f526 · a31f526
1 parent de77e85
commit a31f526
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 0 deletions.
diff --git a/xFunc/Properties/Settings.Designer.cs b/xFunc/Properties/Settings.Designer.cs
diff --git a/xFunc/Properties/Settings.settings b/xFunc/Properties/Settings.settings
@@ -116,5 +116,8 @@
     <Setting Name="ComplexNumberExpanded" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="StatisticalExpanded" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/xFunc/Resources/Resource.Designer.cs b/xFunc/Resources/Resource.Designer.cs
diff --git a/xFunc/Resources/Resource.resx b/xFunc/Resources/Resource.resx
@@ -786,4 +786,16 @@
   <data name="ModuleToolTip" xml:space="preserve">
     <value>The modulo operator. Example: 7 % 2, 7 mod 2.</value>
   </data>
+  <data name="AvgToolTip" xml:space="preserve">
+    <value>The Avg function. Example: avg(1, 2, 3).</value>
+  </data>
+  <data name="MaxToolTip" xml:space="preserve">
+    <value>The Max function. Example: max(1, 2, 3).</value>
+  </data>
+  <data name="MinToolTip" xml:space="preserve">
+    <value>The Min function. Example: min(1, 2, 3).</value>
+  </data>
+  <data name="StatisticalExpanderHeader" xml:space="preserve">
+    <value>Statistical</value>
+  </data>
 </root>
diff --git a/xFunc/Resources/Resource.ru.resx b/xFunc/Resources/Resource.ru.resx
@@ -786,4 +786,16 @@
   <data name="ModuleToolTip" xml:space="preserve">
     <value>Остаток от деления. Пример: 7 % 2, 7 mod 2.</value>
   </data>
+  <data name="AvgToolTip" xml:space="preserve">
+    <value>Среднее арифметическое. Пример: avg(1, 2, 3).</value>
+  </data>
+  <data name="MaxToolTip" xml:space="preserve">
+    <value>Максимум. Пример: max(1, 2, 3).</value>
+  </data>
+  <data name="MinToolTip" xml:space="preserve">
+    <value>Минимум. Пример: min(1, 2, 3).</value>
+  </data>
+  <data name="StatisticalExpanderHeader" xml:space="preserve">
+    <value>Статистические</value>
+  </data>
 </root>
diff --git a/xFunc/Resources/Resource.uk.resx b/xFunc/Resources/Resource.uk.resx
@@ -786,4 +786,16 @@
   <data name="ModuleToolTip" xml:space="preserve">
     <value>Залишок від ділення. Приклад: 7 % 2, 7 mod 2.</value>
   </data>
+  <data name="AvgToolTip" xml:space="preserve">
+    <value>Середнє арифметичне. Приклад: avg(1, 2, 3).</value>
+  </data>
+  <data name="MaxToolTip" xml:space="preserve">
+    <value>Максимум. Приклад: max(1, 2, 3).</value>
+  </data>
+  <data name="MinToolTip" xml:space="preserve">
+    <value>Мінімум. Приклад: min(1, 2, 3).</value>
+  </data>
+  <data name="StatisticalExpanderHeader" xml:space="preserve">
+    <value>Статистичні</value>
+  </data>
 </root>
diff --git a/xFunc/Views/MainView.xaml b/xFunc/Views/MainView.xaml
@@ -767,6 +767,44 @@ limitations under the License. -->
                         </Button>
                     </Grid>
                 </Expander>
+                <Expander x:Name="statisticalToolBar" Header="{x:Static res:Resource.StatisticalExpanderHeader}">
+                    <Grid Margin="0,4,0,2" TextBlock.FontSize="18">
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+
+                        <Button Grid.Row="0" Grid.Column="0" Tag="min" Click="InsertDoubleArgFunc_Click">
+                            <Viewbox>
+                                <TextBlock>min(x)</TextBlock>
+                            </Viewbox>
+                            <Button.ToolTip>
+                                <ToolTip Content="{x:Static res:Resource.MinToolTip}" />
+                            </Button.ToolTip>
+                        </Button>
+                        <Button Grid.Row="0" Grid.Column="1" Tag="max" Click="InsertDoubleArgFunc_Click">
+                            <Viewbox>
+                                <TextBlock>max(x)</TextBlock>
+                            </Viewbox>
+                            <Button.ToolTip>
+                                <ToolTip Content="{x:Static res:Resource.MaxToolTip}" />
+                            </Button.ToolTip>
+                        </Button>
+                        <Button Grid.Row="0" Grid.Column="2" Tag="avg" Click="InsertDoubleArgFunc_Click">
+                            <Viewbox>
+                                <TextBlock>avg(x)</TextBlock>
+                            </Viewbox>
+                            <Button.ToolTip>
+                                <ToolTip Content="{x:Static res:Resource.AvgToolTip}" />
+                            </Button.ToolTip>
+                        </Button>
+                    </Grid>
+                </Expander>
                 <Expander x:Name="complexNumberToolBar" Header="{x:Static res:Resource.ComplexNumberExpanderHeader}">
                     <Grid Margin="0,4,0,2" TextBlock.FontSize="18">
                         <Grid.RowDefinitions>

diff --git a/xFunc/Views/MainView.xaml.cs b/xFunc/Views/MainView.xaml.cs
@@ -215,6 +215,7 @@ private void LoadSettings()
             trigonometricToolBar.IsExpanded = Settings.Default.TrigonometricExpanded;
             hyperbolicToolBar.IsExpanded = Settings.Default.HyperbolicExpanded;
             matrixToolBar.IsExpanded = Settings.Default.MatrixExpanded;
+            statisticalToolBar.IsExpanded = Settings.Default.StatisticalExpanded;
             complexNumberToolBar.IsExpanded = Settings.Default.ComplexNumberExpanded;
             bitwiseToolBar.IsExpanded = Settings.Default.BitwiseExpanded;
             progToolBar.IsExpanded = Settings.Default.ProgExpanded;
@@ -272,6 +273,7 @@ private void SaveSettings()
                 Settings.Default.TrigonometricExpanded = trigonometricToolBar.IsExpanded;
                 Settings.Default.HyperbolicExpanded = hyperbolicToolBar.IsExpanded;
                 Settings.Default.MatrixExpanded = matrixToolBar.IsExpanded;
+                Settings.Default.StatisticalExpanded = statisticalToolBar.IsExpanded;
                 Settings.Default.ComplexNumberExpanded = complexNumberToolBar.IsExpanded;
                 Settings.Default.BitwiseExpanded = bitwiseToolBar.IsExpanded;
                 Settings.Default.ProgExpanded = progToolBar.IsExpanded;
@@ -285,6 +287,7 @@ private void SaveSettings()
                 Settings.Default.TrigonometricExpanded = bool.Parse(Settings.Default.Properties["TrigonometricExpanded"].DefaultValue.ToString());
                 Settings.Default.HyperbolicExpanded = bool.Parse(Settings.Default.Properties["HyperbolicExpanded"].DefaultValue.ToString());
                 Settings.Default.MatrixExpanded = bool.Parse(Settings.Default.Properties["MatrixExpanded"].DefaultValue.ToString());
+                Settings.Default.StatisticalExpanded = bool.Parse(Settings.Default.Properties["StatisticalExpanded"].DefaultValue.ToString());
                 Settings.Default.ComplexNumberExpanded = bool.Parse(Settings.Default.Properties["ComplexNumberExpanded"].DefaultValue.ToString());
                 Settings.Default.BitwiseExpanded = bool.Parse(Settings.Default.Properties["BitwiseExpanded"].DefaultValue.ToString());
                 Settings.Default.ProgExpanded = bool.Parse(Settings.Default.Properties["ProgExpanded"].DefaultValue.ToString());

diff --git a/xFunc/app.config b/xFunc/app.config
@@ -118,6 +118,9 @@
             <setting name="ComplexNumberExpanded" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="StatisticalExpanded" serializeAs="String">
+                <value>False</value>
+            </setting>
         </xFunc.Properties.Settings>
     </userSettings>
   <runtime>