Menu
▾
▴
[Apophysis-cvs-commits] 2.10/Source ControlPoint.pas,1.15,1.16 Global.pas,1.9,1.10 Options.pas,1.6,1.7 Options.dfm,1.5,1.6 Regstry.pas,1.7,1.8
|
From: Piotr B. <ut...@us...> - 2005-10-09 13:26:36
|
Update of /cvsroot/apophysis/2.10/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15427 Modified Files: ControlPoint.pas Global.pas Options.pas Options.dfm Regstry.pas Log Message: Added definable limit of added variations count when generating a symmetric flame. Index: Options.dfm =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Options.dfm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Options.dfm 29 Sep 2005 14:11:29 -0000 1.5 --- Options.dfm 9 Oct 2005 13:26:27 -0000 1.6 *************** *** 5,9 **** BorderStyle = bsDialog Caption = 'Options' ! ClientHeight = 296 ClientWidth = 467 Color = clBtnFace --- 5,9 ---- BorderStyle = bsDialog Caption = 'Options' ! ClientHeight = 308 ClientWidth = 467 Color = clBtnFace *************** *** 23,27 **** object btnOK: TButton Left = 304 ! Top = 264 Width = 75 Height = 25 --- 23,27 ---- object btnOK: TButton Left = 304 ! Top = 280 Width = 75 Height = 25 *************** *** 33,37 **** object btnCancel: TButton Left = 384 ! Top = 264 Width = 75 Height = 25 --- 33,37 ---- object btnCancel: TButton Left = 384 ! Top = 280 Width = 75 Height = 25 *************** *** 44,49 **** Top = 8 Width = 451 ! Height = 249 ! ActivePage = GeneralPage TabOrder = 0 TabStop = False --- 44,49 ---- Top = 8 Width = 451 ! Height = 265 ! ActivePage = RandomPage TabOrder = 0 TabStop = False *************** *** 491,495 **** Top = 136 Width = 193 ! Height = 72 Caption = 'Forced symmetry' TabOrder = 3 --- 491,495 ---- Top = 136 Width = 193 ! Height = 97 Caption = 'Forced symmetry' TabOrder = 3 *************** *** 512,515 **** --- 512,524 ---- Caption = 'Order:' end + object Label24: TLabel + Left = 8 + Top = 72 + Width = 32 + Height = 13 + Alignment = taRightJustify + AutoSize = False + Caption = 'Limit:' + end object cmbSymType: TComboBox Left = 48 *************** *** 549,552 **** --- 558,580 ---- Thousands = False end + object txtSymNVars: TEdit + Left = 48 + Top = 70 + Width = 121 + Height = 21 + TabOrder = 3 + Text = '12' + end + object udSymNVars: TUpDown + Left = 169 + Top = 70 + Width = 15 + Height = 21 + Associate = txtSymNVars + Min = 4 + Position = 12 + TabOrder = 4 + Thousands = False + end end end *************** *** 558,562 **** Top = 0 Width = 341 ! Height = 217 HelpContext = 1026 Caption = 'Enabled' --- 586,590 ---- Top = 0 Width = 341 ! Height = 233 HelpContext = 1026 Caption = 'Enabled' *************** *** 566,570 **** Top = 16 Width = 309 ! Height = 189 ItemHeight = 13 TabOrder = 0 --- 594,598 ---- Top = 16 Width = 309 ! Height = 209 ItemHeight = 13 TabOrder = 0 *************** *** 574,578 **** object btnSetAll: TButton Left = 356 ! Top = 160 Width = 75 Height = 25 --- 602,606 ---- object btnSetAll: TButton Left = 356 ! Top = 176 Width = 75 Height = 25 *************** *** 584,588 **** object btnClearAll: TButton Left = 356 ! Top = 192 Width = 75 Height = 25 --- 612,616 ---- object btnClearAll: TButton Left = 356 ! Top = 208 Width = 75 Height = 25 *************** *** 1432,1436 **** object OpenDialog: TOpenDialog Left = 16 ! Top = 264 end end --- 1460,1464 ---- object OpenDialog: TOpenDialog Left = 16 ! Top = 280 end end Index: Regstry.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Regstry.pas,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Regstry.pas 2 Oct 2005 07:32:02 -0000 1.7 --- Regstry.pas 9 Oct 2005 13:26:27 -0000 1.8 *************** *** 268,271 **** --- 268,279 ---- SymmetryOrder := 4; end; + if Registry.ValueExists('SymmetryNVars') then + begin + SymmetryNVars := Registry.ReadInteger('SymmetryNVars'); + end + else + begin + SymmetryNVars := 12; + end; if Registry.ValueExists('VariationOptions') then begin *************** *** 536,539 **** --- 544,548 ---- SymmetryType := 0; SymmetryOrder := 4; + SymmetryNVars := 12; VariationOptions := 262143; UnpackVariations(VariationOptions); *************** *** 873,876 **** --- 882,886 ---- Registry.WriteInteger('SymmetryType', SymmetryType); Registry.WriteInteger('SymmetryOrder', SymmetryOrder); + Registry.WriteInteger('SymmetryNVars', SymmetryNVars); Registry.WriteInteger('VariationOptions', VariationOptions); Registry.WriteInteger('ReferenceMode', ReferenceMode); Index: Options.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Options.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Options.pas 29 Sep 2005 14:11:29 -0000 1.6 --- Options.pas 9 Oct 2005 13:26:27 -0000 1.7 *************** *** 179,182 **** --- 179,185 ---- txtJPEGquality: TComboBox; rgTransparency: TRadioGroup; + Label24: TLabel; + txtSymNVars: TEdit; + udSymNVars: TUpDown; procedure btnCancelClick(Sender: TObject); procedure FormShow(Sender: TObject); *************** *** 281,286 **** chkKeepbackground.Checked := KeepBackground; cmbSymType.ItemIndex := SymmetryType; ! if (SymmetryType = 0) or (SymmetryType = 1) then txtSymOrder.enabled := false; udSymOrder.Position := SymmetryOrder; { Variations tab } --- 284,294 ---- chkKeepbackground.Checked := KeepBackground; cmbSymType.ItemIndex := SymmetryType; ! if (SymmetryType = 0) or (SymmetryType = 1) then ! begin ! txtSymOrder.enabled := false; ! txtSymNVars.enabled := false; ! end; udSymOrder.Position := SymmetryOrder; + udSymNVars.Position := SymmetryNVars; { Variations tab } *************** *** 396,399 **** --- 404,408 ---- SymmetryType := cmbSymType.ItemIndex; SymmetryOrder := udSymOrder.Position; + SymmetryNVars := udSymNVars.Position; KeepBackground := chkKeepbackground.Checked; *************** *** 478,484 **** begin if (cmbSymType.ItemIndex = 0) or (cmbSymType.ItemIndex = 1) then ! txtSymOrder.enabled := false ! else txtSymOrder.enabled := true; end; --- 487,498 ---- begin if (cmbSymType.ItemIndex = 0) or (cmbSymType.ItemIndex = 1) then ! begin ! txtSymOrder.enabled := false; ! txtSymNVars.enabled := false; ! end else ! begin txtSymOrder.enabled := true; + txtSymNVars.enabled := true; + end; end; Index: ControlPoint.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/ControlPoint.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ControlPoint.pas 2 Oct 2005 07:31:01 -0000 1.15 --- ControlPoint.pas 9 Oct 2005 13:26:27 -0000 1.16 *************** *** 1651,1655 **** // for (k = 1; (k < sym)&&(i < NXFORMS); k + + ) { k := 1; ! while (k < sym) and (i < NXFORMS) do begin cp.xform[i].density := 1.0; --- 1651,1656 ---- // for (k = 1; (k < sym)&&(i < NXFORMS); k + + ) { k := 1; ! // while (k < sym) and (i < NXFORMS) do ! while (k < sym) and (i < SymmetryNVars) do begin cp.xform[i].density := 1.0; Index: Global.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Global.pas,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Global.pas 29 Sep 2005 14:11:29 -0000 1.9 --- Global.pas 9 Oct 2005 13:26:27 -0000 1.10 *************** *** 108,111 **** --- 108,112 ---- SymmetryType: integer; SymmetryOrder: integer; + SymmetryNVars: integer; Variations: array[0..63] of boolean; VariationOptions: int64; |