From 04c9d64c70ec69d5a57de176dc7dc930d0c081ef Mon Sep 17 00:00:00 2001
From: zueuk <zueuk>
Date: Sat, 3 Jun 2006 02:17:58 +0000
Subject: [PATCH] new naming in UF export

---
 2.10/Source/Main.pas | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/2.10/Source/Main.pas b/2.10/Source/Main.pas
index 5d06ca2..9b2a863 100644
--- a/2.10/Source/Main.pas
+++ b/2.10/Source/Main.pas
@@ -37,7 +37,7 @@ const
   RS_XO = 2;
   RS_VO = 3;
 
-  AppVersionString = 'Apophysis 2.04 beta';
+  AppVersionString = 'Apophysis 2.04 beta 1.5';
 
 type
   TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
@@ -2026,8 +2026,8 @@ function TMainForm.UPRString(cp1: TControlPoint; Entry: string): string;
 { Returns a string containing an Ultra Fractal parameter set for copying
   or saving to file }
 var
-  IterDensity, m, i: integer;
-  scale, a, b, c, d, e, f, p: double;
+  IterDensity, m, i, j: integer;
+  scale, a, b, c, d, e, f, p, v: double;
   GradStrings, Strings: TStringList;
   rept, cby, smap, sol: string;
   uprcenter: array[0..1] of double; // camera center
@@ -2091,9 +2091,13 @@ begin
         'p_xf' + inttostr(m) + '_cfd=' + Format('%.6g ', [d]));
       Strings.Add('  p_xf' + inttostr(m) + '_cfe=' + Format('%.6g ', [e]) +
         ' p_xf' + inttostr(m) + '_cff=' + Format('%.6g ', [f]));
-      for i := 0 to NRVAR - 1 do
-        Strings.Add('  p_xf' + inttostr(m) + '_var' + inttostr(i) + '=' +
+      for i := 0 to NRVAR-1 do
+        Strings.Add('  p_xf' + inttostr(m) + '_var_' + VarNames(i) + '=' +
           floatToStr(cp1.xform[m].vars[i]));
+      for j:= 0 to GetNrVariableNames - 1 do begin
+        cp1.xform[m].GetVariable(GetVariableNameAt(j), v);
+        Strings.Add('  p_xf' + inttostr(m) + '_par_' + GetVariableNameAt(j) + '=' + floatToStr(v));
+      end;
     end;
     Strings.Add('gradient:');
     Strings.Add(GradientString(cp1.cmap));