細かい重要なミスに気が付いた

diff --git a/fourier/Unit1.pas b/fourier/Unit1.pas
index 1b9a7d6..56e2414 100644 (file)
--- a/fourier/Unit1.pas
+++ b/fourier/Unit1.pas
@@ -74,8 +74,6 @@ type
     cap: Boolean;
     farr: TBinary;
     numRect: integer;
-    numDescriptor: integer;
-    numEntry: integer;
     Fourier: TFourier;
     { private \90é\8c¾ }
     procedure ShowToolbar(AShow: Boolean);
@@ -129,8 +127,8 @@ begin
               rr.Width := r.Width;
               rr.Height := r.Height * rr.Width / r.Width;
             end;
-            //rr.Left := (Image2.Width - rr.Width) / 2;
-            //rr.Top := (Image2.Height - rr.Height) / 2;
+            // rr.Left := (Image2.Width - rr.Width) / 2;
+            // rr.Top := (Image2.Height - rr.Height) / 2;
             Image2.Canvas.FillRect(Image2.BoundsRect, 0, 0, [], 1.0);
             Image2.Canvas.DrawBitmap(Image1.Bitmap, r, rr, 1.0);
             break;
@@ -162,7 +160,7 @@ begin
   SetLength(id, Fourier.numEntry);
   SetLength(estima, Fourier.numEntry);
   test := TModel.Create;
-  bnd:=TBoundary.Create;
+  bnd := TBoundary.Create;
   try
     n := bnd.numP;
     for i := 0 to Fourier.numDescriptor - 1 do
@@ -240,7 +238,7 @@ begin
         estima[n] := Sqrt(dist);
       end
       else
-        estima[n] := Fourier.Correlation(a, b, 4 * numDescriptor);
+        estima[n] := Fourier.Correlation(a, b, 4 * Fourier.numDescriptor);
     end;
     if RadioButton1.IsChecked = true then
       Fourier.sortingSmall(estima, id, Fourier.numEntry)
@@ -279,7 +277,8 @@ var
   k: integer;
   fr, fi, ss, cc: Double;
 begin
-  for i := 0 to numEntry - 1 do
+  Fourier.numEntry := Edit5.Text.ToInteger;
+  for i := 0 to Fourier.numEntry - 1 do
   begin
     n := Fourier.boundary[i].numP;
     for j := 0 to Fourier.numDescriptor - 1 do
@@ -294,13 +293,13 @@ begin
       with Fourier.boundary[i] do
       begin
         m := Count div n;
-        X[n*m] := X[0];
-        Y[n*m] := Y[0];
+        X[n * m] := X[0];
+        Y[n * m] := Y[0];
       end;
       for k := 0 to n - 1 do
       begin
-        fr := Fourier.boundary[i].X[k*m + 1] - Fourier.boundary[i].X[k*m];
-        fi := Fourier.boundary[i].Y[k*m + 1] - Fourier.boundary[i].Y[k*m];
+        fr := Fourier.boundary[i].X[(k + 1) * m] - Fourier.boundary[i].X[k * m];
+        fi := Fourier.boundary[i].Y[(k + 1) * m] - Fourier.boundary[i].Y[k * m];
         cc := cos(2 * pi * j * k / n);
         ss := sin(2 * pi * j * k / n);
         with Fourier.model[i] do

diff --git a/fourier/Unit2.pas b/fourier/Unit2.pas
index 768dac1..2922f73 100644 (file)
--- a/fourier/Unit2.pas
+++ b/fourier/Unit2.pas
@@ -174,7 +174,7 @@ begin
   i := 10;
   j := 10;
   result := 0;
-  boundary[0].Count:=0;
+  boundary[0].Count := 0;
   while j < ny - 10 do
   begin
     if (f[i, j] = 1) and (id[i, j] = 0) then
@@ -201,7 +201,7 @@ begin
         if labelborder8(nx, ny, i, j, code, result, f, id) = true then
           inc(result);
         if result < numEntry then
-          boundary[result].Count:=0
+          boundary[result].Count := 0
         else
           break;
       end
@@ -465,7 +465,7 @@ begin
   Clear;
   for i := 0 to Value - 1 do
   begin
-    FModels[i]:=TModel.Create;
+    FModels[i] := TModel.Create;
     FBoundary[i] := TBoundary.Create;
   end;
 end;