From a31f5260072677a9743498288994e6020ec7133f Mon Sep 17 00:00:00 2001 From: Dmytro Kyshchenko Date: Mon, 14 Nov 2016 16:54:56 +0200 Subject: [PATCH] #161 --- xFunc/Properties/Settings.Designer.cs | 12 +++++++++ xFunc/Properties/Settings.settings | 3 +++ xFunc/Resources/Resource.Designer.cs | 36 +++++++++++++++++++++++++ xFunc/Resources/Resource.resx | 12 +++++++++ xFunc/Resources/Resource.ru.resx | 12 +++++++++ xFunc/Resources/Resource.uk.resx | 12 +++++++++ xFunc/Views/MainView.xaml | 38 +++++++++++++++++++++++++++ xFunc/Views/MainView.xaml.cs | 3 +++ xFunc/app.config | 3 +++ 9 files changed, 131 insertions(+) diff --git a/xFunc/Properties/Settings.Designer.cs b/xFunc/Properties/Settings.Designer.cs index a9bf7645d..f96b1beac 100644 --- a/xFunc/Properties/Settings.Designer.cs +++ b/xFunc/Properties/Settings.Designer.cs @@ -477,5 +477,17 @@ public bool ComplexNumberExpanded { this["ComplexNumberExpanded"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool StatisticalExpanded { + get { + return ((bool)(this["StatisticalExpanded"])); + } + set { + this["StatisticalExpanded"] = value; + } + } } } diff --git a/xFunc/Properties/Settings.settings b/xFunc/Properties/Settings.settings index aa9060485..242a20d99 100644 --- a/xFunc/Properties/Settings.settings +++ b/xFunc/Properties/Settings.settings @@ -116,5 +116,8 @@ False + + False + \ No newline at end of file diff --git a/xFunc/Resources/Resource.Designer.cs b/xFunc/Resources/Resource.Designer.cs index 1ceb2ee9f..30bc375b7 100644 --- a/xFunc/Resources/Resource.Designer.cs +++ b/xFunc/Resources/Resource.Designer.cs @@ -420,6 +420,15 @@ public static string AutoFormatButtonHeader { } } + /// + /// Looks up a localized string similar to The Avg function. Example: avg(1, 2, 3).. + /// + public static string AvgToolTip { + get { + return ResourceManager.GetString("AvgToolTip", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bitwise & Logical. /// @@ -1203,6 +1212,24 @@ public static string MatrixExpanderHeader { } } + /// + /// Looks up a localized string similar to The Max function. Example: max(1, 2, 3).. + /// + public static string MaxToolTip { + get { + return ResourceManager.GetString("MaxToolTip", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The Min function. Example: min(1, 2, 3).. + /// + public static string MinToolTip { + get { + return ResourceManager.GetString("MinToolTip", resourceCulture); + } + } + /// /// Looks up a localized string similar to The modulo operator. Example: 7 % 2, 7 mod 2.. /// @@ -1806,6 +1833,15 @@ public static string StandartExpanderHeader { } } + /// + /// Looks up a localized string similar to Statistical. + /// + public static string StatisticalExpanderHeader { + get { + return ResourceManager.GetString("StatisticalExpanderHeader", resourceCulture); + } + } + /// /// Looks up a localized string similar to The "-=" operator. Example: x -= 2.. /// diff --git a/xFunc/Resources/Resource.resx b/xFunc/Resources/Resource.resx index dc17b37a5..d8687dbbe 100644 --- a/xFunc/Resources/Resource.resx +++ b/xFunc/Resources/Resource.resx @@ -786,4 +786,16 @@ The modulo operator. Example: 7 % 2, 7 mod 2. + + The Avg function. Example: avg(1, 2, 3). + + + The Max function. Example: max(1, 2, 3). + + + The Min function. Example: min(1, 2, 3). + + + Statistical + \ No newline at end of file diff --git a/xFunc/Resources/Resource.ru.resx b/xFunc/Resources/Resource.ru.resx index 5e1ccd294..ad99fa88b 100644 --- a/xFunc/Resources/Resource.ru.resx +++ b/xFunc/Resources/Resource.ru.resx @@ -786,4 +786,16 @@ Остаток от деления. Пример: 7 % 2, 7 mod 2. + + Среднее арифметическое. Пример: avg(1, 2, 3). + + + Максимум. Пример: max(1, 2, 3). + + + Минимум. Пример: min(1, 2, 3). + + + Статистические + \ No newline at end of file diff --git a/xFunc/Resources/Resource.uk.resx b/xFunc/Resources/Resource.uk.resx index e1eb78344..f36113c25 100644 --- a/xFunc/Resources/Resource.uk.resx +++ b/xFunc/Resources/Resource.uk.resx @@ -786,4 +786,16 @@ Залишок від ділення. Приклад: 7 % 2, 7 mod 2. + + Середнє арифметичне. Приклад: avg(1, 2, 3). + + + Максимум. Приклад: max(1, 2, 3). + + + Мінімум. Приклад: min(1, 2, 3). + + + Статистичні + \ No newline at end of file diff --git a/xFunc/Views/MainView.xaml b/xFunc/Views/MainView.xaml index e0e0c6b51..3333ac658 100644 --- a/xFunc/Views/MainView.xaml +++ b/xFunc/Views/MainView.xaml @@ -767,6 +767,44 @@ limitations under the License. --> + + + + + + + + + + + + + + + + + diff --git a/xFunc/Views/MainView.xaml.cs b/xFunc/Views/MainView.xaml.cs index 3df010bc7..9b6a1a364 100644 --- 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 index ac2754f15..afa1803c5 100644 --- a/xFunc/app.config +++ b/xFunc/app.config @@ -118,6 +118,9 @@ False + + False +