diff --git a/source/Triangulum/Generator.cs b/source/Triangulum/Generator.cs index bba81ff..9f27367 100644 --- a/source/Triangulum/Generator.cs +++ b/source/Triangulum/Generator.cs @@ -24,11 +24,14 @@ You should have received a copy of the GNU General Public License using System.Text; using System.Text.RegularExpressions; using System.Numerics; +using System.IO; namespace Triangulum { public class Generator { + public static string output; + /// /// Pascals Triangle - Method /// @@ -120,6 +123,13 @@ public static void PascalsTriangle(ViewModel vm, int rows) } // End Loop + // Progress Info + if (vm.Display_IsChecked == false) + { + vm.Display_Text = "Complete\r\n\r\nPlease Enable Display or Save Output."; + } + + // ------------------------- // Center // ------------------------- @@ -136,7 +146,7 @@ public static void PascalsTriangle(ViewModel vm, int rows) // ------------------------- // Output // ------------------------- - string output = string.Join("\r\n", triangle); + output = string.Join("\r\n", triangle); // ------------------------- @@ -162,6 +172,7 @@ public static void PascalsTriangle(ViewModel vm, int rows) // Do not Regex Replace } + // ------------------------- // Convert to ASCII // ------------------------- @@ -196,6 +207,7 @@ public static void PascalsTriangle(ViewModel vm, int rows) "9: " + output.Count(d => d == '9'); } + // ------------------------- // Inline // ------------------------- @@ -205,10 +217,22 @@ public static void PascalsTriangle(ViewModel vm, int rows) output = Regex.Replace(output, "\r\n", ""); } + // ------------------------- + // Autosave Export + // ------------------------- + if (vm.Autosave_IsChecked == true) + { + //Export.SaveFile(); + File.WriteAllText(MainWindow.desktopDir + "Triangulum " + DateTime.Now.ToString("yyyy-MM-dd HHmmss") + ".txt", Generator.output, Encoding.Unicode); + } + // ------------------------- // Display // ------------------------- - vm.Display_Text = output; + if (vm.Display_IsChecked == true) + { + vm.Display_Text = output; + } } diff --git a/source/Triangulum/MainWindow.xaml b/source/Triangulum/MainWindow.xaml index 674a414..9fd03d2 100644 --- a/source/Triangulum/MainWindow.xaml +++ b/source/Triangulum/MainWindow.xaml @@ -32,7 +32,7 @@ Closing="Window_Closing" Icon="icon.ico" - Title="Triangulum v0.3.0" + Title="Triangulum v0.3.1" RenderOptions.BitmapScalingMode="Fant" UseLayoutRounding="True" @@ -106,9 +106,9 @@ IsChecked="{Binding Decimal_IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding Decimal_IsEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="Decimal" - Margin="0,138,31,0" + Margin="0,138,18,0" HorizontalAlignment="Right" - Width="66" + Width="79" Checked="cbxDecimal_Checked" Height="15" VerticalAlignment="Top" @@ -121,9 +121,9 @@ + + + + + + + +