final interface fixes
This commit is contained in:
parent
6c02a3d075
commit
2c9a9705cc
@ -299,6 +299,7 @@ object MainForm: TMainForm
|
|||||||
Caption = 'ToolButton2'
|
Caption = 'ToolButton2'
|
||||||
ImageIndex = 39
|
ImageIndex = 39
|
||||||
Style = tbsSeparator
|
Style = tbsSeparator
|
||||||
|
Visible = False
|
||||||
end
|
end
|
||||||
object tbShowTrace: TToolButton
|
object tbShowTrace: TToolButton
|
||||||
Left = 579
|
Left = 579
|
||||||
@ -306,6 +307,7 @@ object MainForm: TMainForm
|
|||||||
Hint = 'Show trace window'
|
Hint = 'Show trace window'
|
||||||
Caption = 'tbShowTrace'
|
Caption = 'tbShowTrace'
|
||||||
ImageIndex = 38
|
ImageIndex = 38
|
||||||
|
Visible = False
|
||||||
OnClick = tbShowTraceClick
|
OnClick = tbShowTraceClick
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -39,7 +39,7 @@ const
|
|||||||
RS_XO = 2;
|
RS_XO = 2;
|
||||||
RS_VO = 3;
|
RS_VO = 3;
|
||||||
|
|
||||||
AppVersionString = 'Apophysis 2.05 pre-release 17';
|
AppVersionString = 'Apophysis 2.05 rc1';
|
||||||
|
|
||||||
type
|
type
|
||||||
TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove,
|
TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove,
|
||||||
@ -1787,7 +1787,6 @@ end;
|
|||||||
procedure TMainForm.DrawFlame;
|
procedure TMainForm.DrawFlame;
|
||||||
var
|
var
|
||||||
GlobalMemoryInfo: TMemoryStatus; // holds the global memory status information
|
GlobalMemoryInfo: TMemoryStatus; // holds the global memory status information
|
||||||
RenderMem: integer;
|
|
||||||
RenderCP: TControlPoint;
|
RenderCP: TControlPoint;
|
||||||
Mem, ApproxMem: cardinal;
|
Mem, ApproxMem: cardinal;
|
||||||
begin
|
begin
|
||||||
@ -4230,13 +4229,17 @@ procedure TMainForm.ImageMouseDown(Sender: TObject; Button: TMouseButton;
|
|||||||
begin
|
begin
|
||||||
if button <> mbLeft then exit;
|
if button <> mbLeft then exit;
|
||||||
FClickRect.TopLeft := Point(x, y);
|
FClickRect.TopLeft := Point(x, y);
|
||||||
FClickRect.BottomRight := FclickRect.TopLeft;
|
FClickRect.BottomRight := FClickRect.TopLeft;
|
||||||
case FMouseMoveState of
|
case FMouseMoveState of
|
||||||
msZoomWindow:
|
msZoomWindow:
|
||||||
begin
|
begin
|
||||||
FSelectRect.TopLeft := Point(x, y);
|
FSelectRect.TopLeft := Point(x, y);
|
||||||
FSelectRect.BottomRight := Point(x, y);
|
FSelectRect.BottomRight := Point(x, y);
|
||||||
DrawZoomWindow;
|
DrawZoomWindow;
|
||||||
|
|
||||||
|
// if ssAlt in Shift then
|
||||||
|
// FMouseMoveState := msZoomOutWindowMove
|
||||||
|
// else
|
||||||
FMouseMoveState := msZoomWindowMove;
|
FMouseMoveState := msZoomWindowMove;
|
||||||
end;
|
end;
|
||||||
msZoomOutWindow:
|
msZoomOutWindow:
|
||||||
@ -4244,6 +4247,10 @@ begin
|
|||||||
FSelectRect.TopLeft := Point(x, y);
|
FSelectRect.TopLeft := Point(x, y);
|
||||||
FSelectRect.BottomRight := Point(x, y);
|
FSelectRect.BottomRight := Point(x, y);
|
||||||
DrawZoomWindow;
|
DrawZoomWindow;
|
||||||
|
|
||||||
|
// if ssAlt in Shift then
|
||||||
|
// FMouseMoveState := msZoomWindowMove
|
||||||
|
// else
|
||||||
FMouseMoveState := msZoomOutWindowMove;
|
FMouseMoveState := msZoomOutWindowMove;
|
||||||
end;
|
end;
|
||||||
msDrag:
|
msDrag:
|
||||||
@ -4293,7 +4300,7 @@ begin
|
|||||||
dx := x - FClickRect.TopLeft.X;
|
dx := x - FClickRect.TopLeft.X;
|
||||||
dy := y - FClickRect.TopLeft.Y;
|
dy := y - FClickRect.TopLeft.Y;
|
||||||
|
|
||||||
if ssAlt in Shift then begin
|
if ssShift in Shift then begin
|
||||||
if (dy = 0) or (abs(dx/dy) >= Image.Width/Image.Height) then
|
if (dy = 0) or (abs(dx/dy) >= Image.Width/Image.Height) then
|
||||||
dy := Round(dx / Image.Width * Image.Height)
|
dy := Round(dx / Image.Width * Image.Height)
|
||||||
else
|
else
|
||||||
@ -4303,7 +4310,7 @@ begin
|
|||||||
FSelectRect.Right := FClickRect.TopLeft.X + dx;
|
FSelectRect.Right := FClickRect.TopLeft.X + dx;
|
||||||
FSelectRect.Bottom := FClickRect.TopLeft.Y + dy;
|
FSelectRect.Bottom := FClickRect.TopLeft.Y + dy;
|
||||||
end
|
end
|
||||||
else if ssShift in Shift then begin
|
else if ssCtrl in Shift then begin
|
||||||
FSelectRect.TopLeft := FClickRect.TopLeft;
|
FSelectRect.TopLeft := FClickRect.TopLeft;
|
||||||
sgn := IfThen(dy*dx >=0, 1, -1);
|
sgn := IfThen(dy*dx >=0, 1, -1);
|
||||||
if (dy = 0) or (abs(dx/dy) >= Image.Width/Image.Height) then begin
|
if (dy = 0) or (abs(dx/dy) >= Image.Width/Image.Height) then begin
|
||||||
@ -4597,7 +4604,7 @@ begin
|
|||||||
|
|
||||||
Pen.Style := psDot; //psDash;
|
Pen.Style := psDot; //psDash;
|
||||||
|
|
||||||
if ssAlt in FShiftState then
|
if ssShift in FShiftState then
|
||||||
begin
|
begin
|
||||||
dx := FClickRect.Right - FClickRect.Left;
|
dx := FClickRect.Right - FClickRect.Left;
|
||||||
dy := FClickRect.Bottom - FClickRect.Top;
|
dy := FClickRect.Bottom - FClickRect.Top;
|
||||||
|
@ -486,7 +486,7 @@ begin
|
|||||||
|
|
||||||
MainPreviewScale := 1 + 0.02 * StrToFloatDef(cbExtendPercent.Text, 0);
|
MainPreviewScale := 1 + 0.02 * StrToFloatDef(cbExtendPercent.Text, 0);
|
||||||
if MainPreviewScale < 1 then MainPreviewScale := 1
|
if MainPreviewScale < 1 then MainPreviewScale := 1
|
||||||
else if MainPreviewScale > 3 then MainPreviewScale := 3;
|
else if MainPreviewScale > 5 then MainPreviewScale := 5;
|
||||||
ExtendMainPreview := chkExtendMainPreview.Checked;
|
ExtendMainPreview := chkExtendMainPreview.Checked;
|
||||||
|
|
||||||
ShowRenderStats := chkShowRenderStats.Checked;
|
ShowRenderStats := chkShowRenderStats.Checked;
|
||||||
|
@ -70,6 +70,8 @@ procedure TTraceForm.FormCreate(Sender: TObject);
|
|||||||
var
|
var
|
||||||
Registry: TRegistry;
|
Registry: TRegistry;
|
||||||
begin
|
begin
|
||||||
|
TraceLevel := 0; // Tracer disabled in release version
|
||||||
|
|
||||||
{ Read position from registry }
|
{ Read position from registry }
|
||||||
Registry := TRegistry.Create;
|
Registry := TRegistry.Create;
|
||||||
try
|
try
|
||||||
@ -85,8 +87,8 @@ begin
|
|||||||
if Registry.ValueExists('Height') then
|
if Registry.ValueExists('Height') then
|
||||||
self.Height := Registry.ReadInteger('Height');
|
self.Height := Registry.ReadInteger('Height');
|
||||||
|
|
||||||
if Registry.ValueExists('TraceLevel') then
|
// if Registry.ValueExists('TraceLevel') then
|
||||||
TraceLevel := Registry.ReadInteger('TraceLevel');
|
// TraceLevel := Registry.ReadInteger('TraceLevel');
|
||||||
end;
|
end;
|
||||||
Registry.CloseKey;
|
Registry.CloseKey;
|
||||||
finally
|
finally
|
||||||
|
Loading…
Reference in New Issue
Block a user