Fixed #15 + Fixed #16 + Fixed #17

Author: bomrafinha

modules/CombSort/U_Sort.Comb.pas

@@ -6,10 +6,13 @@ interface
 
 type
   TSortComb = class(TSortClass, ISortInterface)
+  private
+    procedure algoritmo(); Override;
+
   public
     constructor Create(layout01 : TLayout);
 
-    procedure sort(); Override;
+    procedure sort();
 
   end;
 
@@ -23,7 +26,13 @@ constructor TSortComb.Create(layout01: TLayout);
 
 end;
 
-procedure TSortComb.sort();
+procedure TSortComb.sort;
+begin
+  inherited sort();
+
+end;
+
+procedure TSortComb.algoritmo();
 var
   i, gap, tamanho : Integer;
 

modules/InsertionSort/U_Sort.Insertion.pas

@@ -6,10 +6,13 @@ interface
 
 type
   TSortInsertion = class(TSortClass, ISortInterface)
+  private
+    procedure algoritmo(); Override;
+
   public
     constructor Create(layout01 : TLayout);
 
-    procedure sort(); Override;
+    procedure sort();
 
   end;
 
@@ -23,7 +26,13 @@ constructor TSortInsertion.Create(layout01: TLayout);
 
 end;
 
-procedure TSortInsertion.sort();
+procedure TSortInsertion.sort;
+begin
+  inherited sort();
+
+end;
+
+procedure TSortInsertion.algoritmo();
 var
   i, j : Integer;
   key : Single;

modules/SelectionSort/U_Sort.Selection.pas

@@ -6,10 +6,13 @@ interface
 
 type
   TSortSelection = class(TSortClass, ISortInterface)
+  private
+    procedure algoritmo(); Override;
+
   public
     constructor Create(layout01 : TLayout);
 
-    procedure sort(); Override;
+    procedure sort();
 
   end;
 
@@ -23,7 +26,13 @@ constructor TSortSelection.Create(layout01: TLayout);
 
 end;
 
-procedure TSortSelection.sort();
+procedure TSortSelection.sort;
+begin
+  inherited sort();
+
+end;
+
+procedure TSortSelection.algoritmo();
 var
   i, j, min : Integer;
 

src/Sorting/U_Sorting.Viewer.fmx

@@ -209,7 +209,7 @@ object SortingViewer: TSortingViewer
           TextSettings.Font.Size = 14.000000000000000000
           TextSettings.Font.StyleExt = {00070000000000000004000000}
         end
-        object Button10: TButton
+        object bInsertionSort: TButton
           Align = Top
           StyledSettings = [FontColor]
           Margins.Left = 5.000000000000000000
@@ -222,11 +222,13 @@ object SortingViewer: TSortingViewer
           Size.Height = 22.000000000000000000
           Size.PlatformDefault = False
           TabOrder = 5
+          Text = 'InsertionSort'
           TextSettings.Font.Family = 'Calibri'
           TextSettings.Font.Size = 14.000000000000000000
           TextSettings.Font.StyleExt = {00070000000000000004000000}
+          OnClick = bInsertionSortClick
         end
-        object Button11: TButton
+        object bSelectionSort: TButton
           Align = Top
           StyledSettings = [FontColor]
           Margins.Left = 5.000000000000000000
@@ -239,11 +241,13 @@ object SortingViewer: TSortingViewer
           Size.Height = 22.000000000000000000
           Size.PlatformDefault = False
           TabOrder = 4
+          Text = 'SelectionSort'
           TextSettings.Font.Family = 'Calibri'
           TextSettings.Font.Size = 14.000000000000000000
           TextSettings.Font.StyleExt = {00070000000000000004000000}
+          OnClick = bSelectionSortClick
         end
-        object Button12: TButton
+        object bCombSort: TButton
           Align = Top
           StyledSettings = [FontColor]
           Margins.Left = 5.000000000000000000
@@ -256,9 +260,11 @@ object SortingViewer: TSortingViewer
           Size.Height = 22.000000000000000000
           Size.PlatformDefault = False
           TabOrder = 3
+          Text = 'CombSort'
           TextSettings.Font.Family = 'Calibri'
           TextSettings.Font.Size = 14.000000000000000000
           TextSettings.Font.StyleExt = {00070000000000000004000000}
+          OnClick = bCombSortClick
         end
         object Button13: TButton
           Align = Top

src/Sorting/U_Sorting.Viewer.pas

@@ -3,7 +3,7 @@
 interface
 
 uses
-  U_SortClass, U_Sort.Bubble, {U_Sort.Insertion, U_Sort.Selection, U_Sort.Comb,}
+  U_SortClass, U_Sort.Bubble, U_Sort.Insertion, U_Sort.Selection, U_Sort.Comb,
   FMX.Controls, FMX.Layouts, System.Classes, FMX.Types, FMX.Forms, System.SysUtils,
   FMX.Objects, FMX.Effects, FMX.Controls.Presentation, FMX.StdCtrls,
   FMX.Filter.Effects, System.Types;
@@ -25,9 +25,9 @@   TSortingViewer = class(TForm)
     Button7: TButton;
     Button8: TButton;
     Button9: TButton;
-    Button10: TButton;
-    Button11: TButton;
-    Button12: TButton;
+    bInsertionSort: TButton;
+    bSelectionSort: TButton;
+    bCombSort: TButton;
     Button13: TButton;
     Button14: TButton;
     Button15: TButton;
@@ -36,6 +36,9 @@   TSortingViewer = class(TForm)
     Rectangle1: TRectangle;
     procedure bBubbleSortClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure bInsertionSortClick(Sender: TObject);
+    procedure bSelectionSortClick(Sender: TObject);
+    procedure bCombSortClick(Sender: TObject);
   private
     var
       fSort : TSortClass;
@@ -63,6 +66,39 @@ procedure TSortingViewer.bBubbleSortClick(Sender: TObject);
 end;
 
 
+procedure TSortingViewer.bCombSortClick(Sender: TObject);
+begin
+  if Assigned(fSort) then
+  begin
+    fSort.Free;
+  end;
+  fSort := TSortComb.Create(Layout5);
+  fSort.sort();
+
+end;
+
+procedure TSortingViewer.bInsertionSortClick(Sender: TObject);
+begin
+  if Assigned(fSort) then
+  begin
+    fSort.Free;
+  end;
+  fSort := TSortInsertion.Create(Layout5);
+  fSort.sort();
+
+end;
+
+procedure TSortingViewer.bSelectionSortClick(Sender: TObject);
+begin
+  if Assigned(fSort) then
+  begin
+    fSort.Free;
+  end;
+  fSort := TSortSelection.Create(Layout5);
+  fSort.sort();
+
+end;
+
 procedure TSortingViewer.FormCreate(Sender: TObject);
 var
   ScreenSize: TSize;