[Apophysis-cvs-commits] 2.10/Source Adjust.pas,1.19,1.20 Editor.pas,1.39,1.40 Main.pas,1.38,1.39 Regstry.pas,1.11,1.12

[Peter S. <zu...@us...>]

Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11310/Source

Modified Files:
	Adjust.pas Editor.pas Main.pas Regstry.pas 
Log Message:
small fixes

Index: Regstry.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Regstry.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Regstry.pas	6 Mar 2006 15:34:54 -0000	1.11
--- Regstry.pas	22 Mar 2006 13:58:26 -0000	1.12
***************
*** 278,282 ****
        if Registry.ValueExists('VariationOptions') then
        begin
!         VariationOptions := Registry.ReadInteger('VariationOptions');
        end
        else
--- 278,284 ----
        if Registry.ValueExists('VariationOptions') then
        begin
!         Registry.ReadBinaryData('VariationOptions', VariationOptions, 8);
! //        Delphi_Suxx := Registry.ReadString('VariationOptions');
! //        VariationOptions := StrToInt64(Delphi_Suxx);
        end
        else
***************
*** 941,945 ****
        Registry.WriteInteger('SymmetryOrder', SymmetryOrder);
        Registry.WriteInteger('SymmetryNVars', SymmetryNVars);
!       Registry.WriteInteger('VariationOptions', VariationOptions);
        Registry.WriteInteger('ReferenceMode', ReferenceMode);
        Registry.WriteInteger('RotationMode', MainForm_RotationMode);
--- 943,947 ----
        Registry.WriteInteger('SymmetryOrder', SymmetryOrder);
        Registry.WriteInteger('SymmetryNVars', SymmetryNVars);
!       Registry.WriteBinaryData('VariationOptions', VariationOptions, 8);
        Registry.WriteInteger('ReferenceMode', ReferenceMode);
        Registry.WriteInteger('RotationMode', MainForm_RotationMode);

Index: Editor.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Editor.pas,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Editor.pas	18 Mar 2006 18:05:15 -0000	1.39
--- Editor.pas	22 Mar 2006 13:58:26 -0000	1.40
***************
*** 1,5 ****
  {
       Apophysis Copyright (C) 2001-2004 Mark Townsend
!      Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Boris, Peter Sdobnov     
  
       This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  {
       Apophysis Copyright (C) 2001-2004 Mark Townsend
!      Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Borys, Peter Sdobnov     
  
       This program is free software; you can redistribute it and/or modify
***************
*** 812,817 ****
  
  procedure TEditForm.UpdateFlameX;
- var
-   i: integer;
  begin
    cp.GetFromTriangles(MainTriangles, Transforms);
--- 812,815 ----
***************
*** 826,830 ****
  //;    MainForm.StopThread;
    StatusBar.Panels[2].Text := Format('Zoom: %f', [GraphZoom]);
!   cp.GetFromTriangles(MainTriangles, Transforms);
  //  if not chkPreserve.Checked then ComputeWeights(cp, MainTriangles, transforms);
    DrawPreview;
--- 824,828 ----
  //;    MainForm.StopThread;
    StatusBar.Panels[2].Text := Format('Zoom: %f', [GraphZoom]);
!   cp.GetFromTriangles(MainTriangles, LastTriangle);
  //  if not chkPreserve.Checked then ComputeWeights(cp, MainTriangles, transforms);
    DrawPreview;
***************
*** 1986,1990 ****
      cbTransforms.clear;
      for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i));
!     if cp.HasFinalXForm = true then cbTransforms.Items.Add('Final');
      UpdateFlame(True);
    end;
--- 1984,1988 ----
      cbTransforms.clear;
      for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i));
!     if EnableFinalXform or (cp.HasFinalXForm = true) then cbTransforms.Items.Add('Final');
      UpdateFlame(True);
    end;
***************
*** 2010,2013 ****
--- 2008,2012 ----
      cbTransforms.clear;
      for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i));
+     if EnableFinalXform or (cp.HasFinalXForm = true) then cbTransforms.Items.Add('Final');
      UpdateFlame(True);
    end;

Index: Main.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Main.pas,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Main.pas	21 Mar 2006 21:51:47 -0000	1.38
--- Main.pas	22 Mar 2006 13:58:26 -0000	1.39
***************
*** 1,5 ****
  {
       Apophysis Copyright (C) 2001-2004 Mark Townsend
!      Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Boris, Peter Sdobnov     
  
       This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  {
       Apophysis Copyright (C) 2001-2004 Mark Townsend
!      Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Borys, Peter Sdobnov     
  
       This program is free software; you can redistribute it and/or modify
***************
*** 38,42 ****
    RS_VO = 3;
  
!   AppVersionString = 'Apophysis 2.03d pre-release 3';
  
  type
--- 38,42 ----
    RS_VO = 3;
  
!   AppVersionString = 'Apophysis 2.03d pre-release 4';
  
  type
***************
*** 336,341 ****
  function CleanUPRTitle(ident: string): string;
  function GradientString(c: TColorMap): string;
! function PackVariations: cardinal;
! procedure UnpackVariations(v: integer);
  //procedure NormalizeWeights(var cp: TControlPoint);
  //procedure EqualizeWeights(var cp: TControlPoint);
--- 336,341 ----
  function CleanUPRTitle(ident: string): string;
  function GradientString(c: TColorMap): string;
! function PackVariations: int64;
! procedure UnpackVariations(v: int64);
  //procedure NormalizeWeights(var cp: TControlPoint);
  //procedure EqualizeWeights(var cp: TControlPoint);
***************
*** 435,452 ****
  end;
  
! function PackVariations: cardinal;
  { Packs the variation options into an integer with Linear as lowest bit }
  var
!   r, i: cardinal;
  begin
!   r := 0;
!   for i := 0 to NRVAR - 1 do
    begin
!     r := r or byte(Variations[i]) shl i;
    end;
-   Result := r;
  end;
  
! procedure UnpackVariations(v: integer);
  { Unpacks the variation options form an integer }
  var
--- 435,451 ----
  end;
  
! function PackVariations: int64;
  { Packs the variation options into an integer with Linear as lowest bit }
  var
!   i: integer;
  begin
!   result := 0;
!   for i := NRVAR-1 downto 0 do
    begin
!     result := (result shl 1) or integer(Variations[i]);
    end;
  end;
  
! procedure UnpackVariations(v: int64);
  { Unpacks the variation options form an integer }
  var
***************
*** 1350,1354 ****
        Filelist.Add('   </xformset>');
  {$else}
!       FileList.Add(cp1.xform[i].FinalToXMLString(cp1.finalXformEnabled));
  {$ifend}
  
--- 1349,1353 ----
        Filelist.Add('   </xformset>');
  {$else}
!       FileList.Add(cp1.xform[t].FinalToXMLString(cp1.finalXformEnabled));
  {$ifend}
  

Index: Adjust.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Adjust.pas,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Adjust.pas	18 Mar 2006 18:12:59 -0000	1.19
--- Adjust.pas	22 Mar 2006 13:58:26 -0000	1.20
***************
*** 1,5 ****
  {
       Apophysis Copyright (C) 2001-2004 Mark Townsend
!      Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Boris, Peter Sdobnov     
  
       This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  {
       Apophysis Copyright (C) 2001-2004 Mark Townsend
!      Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Borys, Peter Sdobnov     
  
       This program is free software; you can redistribute it and/or modify