Home / Browse / Apophysis / Mail / Archive
Apophysis

Email Archive: apophysis-cvs-commits (read-only)

2005:	_Jan	_Feb	_Mar	_Apr	_May (3)	_Jun (27)	_Jul (15)	_Aug (1)	_Sep (63)	_Oct (50)	_Nov (3)	_Dec (8)
2006:	_Jan (5)	_Feb	_Mar (24)	_Apr (29)	_May (1)	_Jun (5)	_Jul	_Aug (4)	_Sep (18)	_Oct (3)	_Nov (10)	_Dec (13)
2007:	_Jan	_Feb	_Mar	_Apr (3)	_May	_Jun (27)	_Jul (8)	_Aug	_Sep	_Oct (8)	_Nov	_Dec
2008:	_Jan	_Feb (5)	_Mar	_Apr	_May	_Jun	_Jul (10)	_Aug (18)	_Sep (10)	_Oct (13)	_Nov	_Dec (2)
2009:	_Jan	_Feb (2)	_Mar (1)	_Apr (22)	_May	_Jun	_Jul	_Aug (4)	_Sep (3)	_Oct (3)	_Nov	_Dec
2010:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov (5)	_Dec
[Apophysis-cvs-commits] 2.10/Source Main.dfm,1.4,1.5 Main.pas,1.4,1.5
From: Ronald Hordijk <ronaldhordijk@us...> - 2005-06-05 06:52
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7332/Source

Modified Files:
	Main.dfm Main.pas 
Log Message:
Zoom out added
fixed; B1199407  'Use current' gradient option bug

Index: Main.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Main.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.pas	29 Apr 2005 23:06:36 -0000	1.4
--- Main.pas	5 Jun 2005 06:52:05 -0000	1.5
***************
*** 40,44 ****
  
  type
!   TMouseMoveState = (msUsual, msZoomWindow, msZoomWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
  
  type
--- 40,44 ----
  
  type
!   TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
  
  type
***************
*** 178,181 ****
--- 178,183 ----
      tbRotate: TToolButton;
      mnuimage: TMenuItem;
+     tbzoomoutwindow: TToolButton;
+     procedure tbzoomoutwindowClick(Sender: TObject);
      procedure mnuimageClick(Sender: TObject);
      procedure mnuExitClick(Sender: TObject);
***************
*** 662,665 ****
--- 664,668 ----
  begin
    cp1.Free;
+   cp1 := nil;
    cp1 := RandomFlame(MainCP, alg);
  (*
***************
*** 4006,4009 ****
--- 4009,4019 ----
          FMouseMoveState := msZoomWindowMove;
        end;
+     msZoomOutWindow:
+       begin
+         FSelectRect.TopLeft := Point(x, y);
+         FSelectRect.BottomRight := Point(x, y);
+         DrawZoomWindow(FSelectRect);
+         FMouseMoveState := msZoomOutWindowMove;
+       end;
      msDrag:
        begin
***************
*** 4054,4058 ****
  begin
    case FMouseMoveState of
!     msZoomWindowMove:
        begin
          DrawZoomWindow(FSelectRect);
--- 4064,4069 ----
  begin
    case FMouseMoveState of
!     msZoomWindowMove,
!     msZoomOutWindowMove:
        begin
          DrawZoomWindow(FSelectRect);
***************
*** 4111,4114 ****
--- 4122,4141 ----
          UpdateWindows;
        end;
+     msZoomOutWindowMove:
+       begin
+         DrawZoomWindow(FSelectRect);
+         FSelectRect.BottomRight := Point(x, y);
+         FMouseMoveState := msZoomOutWindow;
+         if (abs(FSelectRect.Left - FSelectRect.Right) < 10) or
+            (abs(FSelectRect.Top - FSelectRect.Bottom) < 10) then
+           Exit; // zoom to much or double clicked
+ 
+         StopThread;
+         UpdateUndo;
+         MainCp.ZoomOuttoRect(FSelectRect);
+ 
+         RedrawTimer.Enabled := True;
+         UpdateWindows;
+       end;
      msDragMove:
        begin
***************
*** 4214,4217 ****
--- 4241,4250 ----
  
  ///////////////////////////////////////////////////////////////////////////////
+ procedure TMainForm.tbzoomoutwindowClick(Sender: TObject);
+ begin
+   FMouseMoveState := msZoomOutWindow;
+ end;
+ 
+ ///////////////////////////////////////////////////////////////////////////////
  procedure TMainForm.tbDragClick(Sender: TObject);
  begin
***************
*** 4257,4260 ****
--- 4290,4294 ----
  end;
  
+ 
  ///////////////////////////////////////////////////////////////////////////////
  end.

Index: Main.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Main.dfm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.dfm	29 Apr 2005 23:06:36 -0000	1.4
--- Main.dfm	5 Jun 2005 06:52:05 -0000	1.5
***************
*** 28,32 ****
      Top = 28
      Width = 4
!     Height = 482
    end
    object ToolBar: TToolBar
--- 28,32 ----
      Top = 28
      Width = 4
!     Height = 474
    end
    object ToolBar: TToolBar
***************
*** 219,233 ****
        Left = 431
        Top = 0
!       Hint = 'Zoom To rectangle'
        Caption = 'tbzoomwindow'
        Down = True
        Grouped = True
!       ImageIndex = 28
        Style = tbsCheck
        OnClick = tbzoomwindowClick
      end
!     object tbDrag: TToolButton
        Left = 454
        Top = 0
        Hint = 'Translate image'
        Caption = 'tbDrag'
--- 219,243 ----
        Left = 431
        Top = 0
!       Hint = 'Zoom to rectangle'
        Caption = 'tbzoomwindow'
        Down = True
        Grouped = True
!       ImageIndex = 50
        Style = tbsCheck
        OnClick = tbzoomwindowClick
      end
!     object tbzoomoutwindow: TToolButton
        Left = 454
        Top = 0
+       Hint = 'Zoom out using rectangle'
+       Caption = 'tbzoomoutwindow'
+       Grouped = True
+       ImageIndex = 49
+       Style = tbsCheck
+       OnClick = tbzoomoutwindowClick
+     end
+     object tbDrag: TToolButton
+       Left = 477
+       Top = 0
        Hint = 'Translate image'
        Caption = 'tbDrag'
***************
*** 238,242 ****
      end
      object tbRotate: TToolButton
!       Left = 477
        Top = 0
        Hint = 'Rotate'
--- 248,252 ----
      end
      object tbRotate: TToolButton
!       Left = 500
        Top = 0
        Hint = 'Rotate'
***************
*** 252,256 ****
      Top = 28
      Width = 160
!     Height = 482
      Align = alLeft
      Columns = <
--- 262,266 ----
      Top = 28
      Width = 160
!     Height = 474
      Align = alLeft
      Columns = <
***************
*** 271,275 ****
      Top = 28
      Width = 402
!     Height = 482
      Align = alClient
      BevelInner = bvLowered
--- 281,285 ----
      Top = 28
      Width = 402
!     Height = 474
      Align = alClient
      BevelInner = bvLowered
***************
*** 282,286 ****
        Top = 1
        Width = 400
!       Height = 480
        Align = alClient
        AutoSize = True
--- 292,296 ----
        Top = 1
        Width = 400
!       Height = 472
        Align = alClient
        AutoSize = True
***************
*** 294,298 ****
    object StatusBar: TStatusBar
      Left = 0
!     Top = 510
      Width = 566
      Height = 19
--- 304,308 ----
    object StatusBar: TStatusBar
      Left = 0
!     Top = 502
      Width = 566
      Height = 19
***************
*** 312,316 ****
      Top = 56
      Bitmap = {
!       494C010131003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
        000000000000360000002800000040000000E0000000010020000000000000E0
        0000000000000000000000000000000000000000000000000000000000000000
--- 322,326 ----
      Top = 56
      Bitmap = {
!       494C010133003600040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
        000000000000360000002800000040000000E0000000010020000000000000E0
        0000000000000000000000000000000000000000000000000000000000000000
***************
*** 445,448 ****
--- 455,462 ----
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       0000000000000000000000000000000000000000000000000000292B2F000000
+       00002F3236000000000000000000000000000000000000000000000000000000
+       0000000000000000000000000000000000000000000000000000292B2F000000
+       00002F3236000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
***************
*** 457,460 ****
--- 471,478 ----
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000003F43480000000000575C
+       6400000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000003F43480000000000575C
+       6400000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
***************
*** 469,473 ****
--- 487,493 ----
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000393C410000000000626871000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000393C410000000000626871000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
***************
*** 475,506 ****
--- 495,565 ----
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       0000000000006E52440033262100382A22000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       0000000000006E52440033262100382A22000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       0000000000000000000000000000000000000000000000000000000000008668
+       5A002A080000B57E5D00EFE4DF00E0CFC500AD7150002D0F0200957464000000
+       0000000000000000000000000000000000000000000000000000000000008668
+       5A002A080000B57E5D00EFE4DF00E0CFC500AD7150002D0F0200957464000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000000000000000000000350B
+       0500E9DAC900FDF5E600FCEFE300FBEDE300FCF3EA00E2D1C8003B160B00A288
+       800000000000000000000000000000000000000000000000000000000000350B
+       0500E9DAC900FDF5E600FCEFE300FBEDE300FCF3EA00E2D1C8003B160B00A288
+       8000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       00000000000000000000000000000000000000000000000000003C2D2400D0AB
+       9600FCECD800F8DCC700F3D7C500F3D9C900F9E3D100FCF3E400D2B4A1002219
+       14000000000000000000000000000000000000000000000000003C2D2400D0AB
+       9600FCECD800F8DCC7000000000000000000F9E3D100FCF3E400D2B4A1002219
+       1400000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000000000000001010100F6E3
+       D300F9D1BB00EEBEA500EDBCA200ECC2A800F0CDB800FAE2CD00FEFCE2000000
+       000000000000000000000000000000000000000000000000000001010100F6E3
+       D300F9D1BB00EEBEA5000000000000000000F0CDB800FAE2CD00FEFCE2000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000000000000000000000FDEA
+       D900000000000000000000000000000000000000000000000000FFEED3000A08
+       050000000000000000000000000000000000000000000000000000000000FDEA
+       D900000000000000000000000000000000000000000000000000FFEED3000A08
+       0500000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000000000000000000000FBE2
+       D300F8BCA300EC9D7F00E6978000E79D8400ECAD8D00F7C4A800EBCAB0000C09
+       080000000000000000000000000000000000000000000000000000000000FBE2
+       D300F8BCA300EC9D7F000000000000000000ECAD8D00F7C4A800EBCAB0000C09
+       0800000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       000000000000000000000000000000000000000000000000000067565100B57C
+       5F00FDD1BA00F5AD9400F19B7E00F09D8200F6B29500FDC7A400925039006655
+       500000000000000000000000000000000000000000000000000067565100B57C
+       5F00FDD1BA00F5AD94000000000000000000F6B29500FDC7A400925039006655
+       5000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       0000000000000000000000000000000000000000000000000000000000006147
+       3800BD8B7100FEDECC00FED2BF00FCC0A900FEC7A9008E4C36001D1713000000
+       0000000000000000000000000000000000000000000000000000000000006147
+       3800BD8B7100FEDECC00FED2BF00FCC0A900FEC7A9008E4C36001D1713000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
***************
*** 508,563 ****
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
!       0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
--- 567,573 ----
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
+       00005144400005030200583B2700452D1F000000000042383400000000000000
        0000000000000000000000000000000000000000000000000000000000000000
!       00005144400005030200583B2700452D1F000000000042383400000000000000
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
***************
*** 2112,2120 ****
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
!       00000000000000000000000000000000FBF7000000000000FBF7000000000000
!       F7F7000000000000EFFB000000000000DFFB000000000000DFFD000000000000
!       BFFD00000000000077FD00000000000067FE00000000000097F6000000000000
!       EDB6000000000000CDB2000000000000D9B5000000000000E5B7000000000000
!       FD8F000000000000FE7F000000000000FFFF0000FFFFFFFFFFFF0000FC010001
        FE7F0000FC010001FE3F0000E0010001FE1F0000E0010001C00F000000010001
        C007000000010001C003000000010001C003000000010805C007000000030001
--- 2122,2130 ----
        0000000000000000000000000000000000000000000000000000000000000000
        0000000000000000000000000000000000000000000000000000000000000000
!       00000000000000000000000000000000FBF7FFC7FFC70000FBF7FFCFFFCF0000
!       F7F7FF8FFF8F0000EFFBFF9FFF9F0000DFFBFF1FFF1F0000DFFDF83FF83F0000
!       BFFDE01FE01F000077FDE00FE00F000067FEC00FC00F000097F6C00FC00F0000
!       EDB6C00FC00F0000CDB2C00FC00F0000D9B5C00FC00F0000E5B7E01FE01F0000
!       FD8FF03FF03F0000FE7FFFFFFFFF0000FFFF0000FFFFFFFFFFFF0000FC010001
        FE7F0000FC010001FE3F0000E0010001FE1F0000E0010001C00F000000010001
        C007000000010001C003000000010001C003000000010805C007000000030001
***************
*** 2164,2169 ****
        C003000180018000C003001F80018000C003001F80018001C003001F80018001
        C0038FF180018001C007FFF980018001C00FFF7580018001C01FFF8F80018001
!       C03FFFFF80018001FFFFFFFFFFFFFFFF00000000000000000000000000000000
!       000000000000}
    end
    object SmallImages: TImageList
--- 2174,2178 ----
        C003000180018000C003001F80018000C003001F80018001C003001F80018001
        C0038FF180018001C007FFF980018001C00FFF7580018001C01FFF8F80018001
!       C03FFFFF80018001FFFFFFFFFFFFFFFF}
    end
    object SmallImages: TImageList
***************
*** 2920,2926 ****
    object HTTP: TIdHTTP
      OnStatus = HTTPStatus
-     MaxLineAction = maException
-     ReadTimeout = 0
      AuthRetries = 0
      AllowCookies = True
      ProxyParams.BasicAuthentication = False
--- 2929,2934 ----
    object HTTP: TIdHTTP
      OnStatus = HTTPStatus
      AuthRetries = 0
+     AuthProxyRetries = 0
      AllowCookies = True
      ProxyParams.BasicAuthentication = False