Changeset 172 for trunk/UMap.pas

Timestamp:

Nov 24, 2017, 10:11:54 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Rectangle points were not normalized.
• Fixed: Error in rect to polygon conversion.

File:

• trunk/UMap.pas (modified) (3 diffs)

trunk/UMap.pas

@@ -239 +239 @@
 { TVoronoiMap }
 
-function CompareDistance(C1, C2: Pointer): Integer;
-begin
-  if TCellsDistance(C1).Distance > TCellsDistance(C2).Distance then Result := 1
-  else if TCellsDistance(C1).Distance < TCellsDistance(C2).Distance then Result := -1
-  else Result := 0;
-end;
-
-function CompareDistanceReverse(const C1, C2: TCellsDistance): Integer;
-begin
-  if C1.Distance > C2.Distance then Result := -1
-  else if C1.Distance < C2.Distance then Result := 1
+function CompareDistance(const C1, C2: TCellsDistance): Integer;
+begin
+  if C1.Distance > C2.Distance then Result := 1
+  else if C1.Distance < C2.Distance then Result := -1
   else Result := 0;
 end;
@@ -321 +314 @@
     CellsDistance.Add(NewCellDist);
   end;
-  CellsDistance.Sort(CompareDistanceReverse);
+  CellsDistance.Sort(CompareDistance);
 
   // Keep shortest non-intersected cell pairs
   SelectedCells := TFPGObjectList<TCellsDistance>.Create;
   SelectedCells.FreeObjects := False;
-  I := CellsDistance.Count - 1;
-  while I >= 0 do begin
+  I := 0;
+  while I < CellsDistance.Count do begin
     Intersected := False;
     for J := 0 to SelectedCells.Count - 1 do
@@ -347 +340 @@
     end;
     if not Intersected then SelectedCells.Add(CellsDistance[I]);
-    Dec(I);
+    Inc(I);
   end;