v0.2.2

Improved Integer Center Display

source/Triangulum/MainWindow.xaml

@@ -32,7 +32,7 @@
         Closing="Window_Closing"
 
         Icon="icon.ico"
-        Title="Triangulum v0.2.1" 
+        Title="Triangulum v0.2.2" 
 
         RenderOptions.BitmapScalingMode="Fant"
         UseLayoutRounding="True"
@@ -53,7 +53,6 @@
     <Grid>
 
         <!-- Display -->
-        <!--FontSize="{Binding Value, ElementName=slFontSize, UpdateSourceTrigger=PropertyChanged}"-->
         <TextBox x:Name="tbxDisplay" 
                  FontFamily="{DynamicResource RobotoMono}"
                  Text="{Binding Display_Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
@@ -75,6 +74,25 @@
             </TextBox.Resources>
         </TextBox>
 
+        <!--<RichTextBox x:Name="rtbDisplay" 
+                     Margin="10,10,10,46" 
+                     Padding="10"
+                     FontSize="12"
+                     Foreground="White" 
+                     Background="Black"
+                     IsReadOnly="True"
+                     Grid.ColumnSpan="1" 
+                     IsUndoEnabled="False"
+                     VerticalScrollBarVisibility="Auto" 
+                     HorizontalScrollBarVisibility="Auto">
+            <RichTextBox.Resources>
+                <Style x:Key="RobotMono-Regular">
+                    <Setter Property="TextElement.FontFamily" 
+                            Value="Resources/#Roboto Mono" />
+                </Style>
+            </RichTextBox.Resources>
+        </RichTextBox>-->
+
         <!-- Sum -->
         <CheckBox x:Name="cbxSum" 
                   IsChecked="{Binding Sum_IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

source/Triangulum/MainWindow.xaml.cs

@@ -30,6 +30,7 @@ You should have received a copy of the GNU General Public License
 using System.ComponentModel;
 using System.Numerics;
 using System.Linq;
+using System.Windows.Documents;
 
 namespace Triangulum
 {
@@ -43,6 +44,11 @@ public partial class MainWindow : Window
         /// </summary>
         public ViewModel vm = new ViewModel();
 
+        /// <summary>
+        ///     RichTextBox
+        /// </summary>
+        public static Paragraph p = new Paragraph();
+
 
         /// <summary>
         ///     Main Window
@@ -263,29 +269,23 @@ public void PascalsTriangle(ViewModel vm, int rows)
                 if (vm.Decimal_IsChecked == false &&
                     vm.Sum_IsChecked == false)
                 {
-                    // Center
-                    if (vm.Center_IsChecked == true)
-                    {
-                        string rowJoin = string.Join(" ", triangle_row);
+                    triangle.Add(string.Join(" ", triangle_row));
+                }
 
-                        int maxLength = rows;
+            } // End Loop
 
-                        int spacer = maxLength - i;
 
-                        rowJoin = new string(' ', spacer) + rowJoin;
 
-                        triangle.Add(rowJoin);
-                    }
-
-                    // Left
-                    else if (vm.Center_IsChecked == false)
-                    {
-                        triangle.Add(string.Join(" ", triangle_row));
-                    }
-
+            // Center
+            if (vm.Center_IsChecked == true)
+            {
+                var maxLength = triangle.Last().Length;
+                for (i = 0; i < rows; i++)
+                {
+                    triangle[i] = new string(' ', (maxLength - triangle[i].Length) / 2) + triangle[i];
                 }
+            }
 
-            } // End Loop
 
 
             // Output
@@ -333,6 +333,16 @@ public void PascalsTriangle(ViewModel vm, int rows)
 
             // Display
             vm.Display_Text = output;
+
+            //Dispatcher.BeginInvoke((Action)(() =>
+            //{
+            //    p.Inlines.Clear();
+            //    rtbDisplay.Document = new FlowDocument(p);
+            //    rtbDisplay.BeginChange();
+            //    p.Inlines.Add(new Run(vm.Display_Text));
+            //    rtbDisplay.EndChange();
+            //}));
+
         }
 
 

source/Triangulum/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.1")]
-[assembly: AssemblyFileVersion("0.0.2.1")]
+[assembly: AssemblyVersion("0.0.2.2")]
+[assembly: AssemblyFileVersion("0.0.2.2")]

source/Triangulum/ViewModel.cs

@@ -60,7 +60,7 @@ public ViewModel()
 
             Inline_IsChecked = false;
 
-            Rows_Text = "300";
+            Rows_Text = "200";
         }