Merge pull request #2 from Sv-Vik/master

толщина для рамки
Pr-Mex · Oct 24, 2019 · c2ea7f2 · c2ea7f2
2 parents ad69e68 + 5f04f3b
commit c2ea7f2
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 1,357 deletions.
diff --git a/Pramougolnik/Arrow_Icon.ico b/Pramougolnik/Arrow_Icon.ico
diff --git a/Pramougolnik/GDIPAPI.dcu b/Pramougolnik/GDIPAPI.dcu
diff --git a/Pramougolnik/GDIPOBJ.dcu b/Pramougolnik/GDIPOBJ.dcu
diff --git a/Pramougolnik/Arrow.cfg → Pramougolnik/Rectangle.cfg b/Pramougolnik/Arrow.cfg → Pramougolnik/Rectangle.cfg
diff --git a/Pramougolnik/Arrow.dof → Pramougolnik/Rectangle.dof b/Pramougolnik/Arrow.dof → Pramougolnik/Rectangle.dof
@@ -134,3 +134,6 @@ OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
 Comments=
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/Pramougolnik/Rectangle.dpr b/Pramougolnik/Rectangle.dpr
@@ -8,6 +8,7 @@ uses
 
 begin
   Application.Initialize;
+  Application.Title := 'Rectangle';
   Application.CreateForm(TForm1, Form1);
   Application.Run;
 end.
diff --git a/Pramougolnik/Rectangle.dproj b/Pramougolnik/Rectangle.dproj
diff --git a/Pramougolnik/Rectangle.dproj.local b/Pramougolnik/Rectangle.dproj.local
diff --git a/Pramougolnik/Rectangle.identcache b/Pramougolnik/Rectangle.identcache
diff --git a/Pramougolnik/Rectangle.res b/Pramougolnik/Rectangle.res
diff --git a/Pramougolnik/Rectangle_Icon.ico b/Pramougolnik/Rectangle_Icon.ico
diff --git a/Pramougolnik/Unit1.dcu b/Pramougolnik/Unit1.dcu
diff --git a/Pramougolnik/Unit1.dfm b/Pramougolnik/Unit1.dfm
@@ -1,9 +1,9 @@
 object Form1: TForm1
-  Left = 191
-  Top = 124
+  Left = -8
+  Top = -8
+  Width = 1936
+  Height = 1056
   Caption = 'Form1'
-  ClientHeight = 636
-  ClientWidth = 1290
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText

diff --git a/Pramougolnik/Unit1.pas b/Pramougolnik/Unit1.pas
@@ -9,8 +9,8 @@ interface
 type
   TForm1 = class(TForm)
     Button1: TButton;
-    RectangleTimer: TTimer;
     Image1: TImage;
+    RectangleTimer: TTimer;
     procedure Button1Click(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure RectangleTimerTimer(Sender: TObject);
@@ -24,7 +24,7 @@   TForm1 = class(TForm)
 var
   Form1: TForm1;
   glX1,glX2,glY1,glY2,glColor, glHowLong:Integer;
-  glColorR,glColorG,glColorB:Integer;
+  glColorR,glColorG,glColorB, glWidth:Integer;
   glFileName:String;
   CountTimer,MaxCountTimer:Integer;
   glFirstShow:Boolean;
@@ -59,29 +59,6 @@ function RightStr(S:String; Kol:Integer):String;
 end;
 
 
-procedure DrawArrowHead(Canvas: TCanvas; X,Y: Integer; Angle,LW: Extended);
-var
-  A1,A2: Extended;
-  Arrow: array[0..3] of TPoint;
-  OldWidth: Integer;
-const
-  Beta=0.322;
-  LineLen=4.74;
-  CentLen=3;
-begin
-  Angle:=Pi+Angle;
-  Arrow[0]:=Point(X,Y);
-  A1:=Angle-Beta;
-  A2:=Angle+Beta;
-  Arrow[1]:=Point(X+Round(LineLen*LW*Cos(A1)),Y-Round(LineLen*LW*Sin(A1)));
-  Arrow[2]:=Point(X+Round(CentLen*LW*Cos(Angle)),Y-Round(CentLen*LW*Sin(Angle)));
-  Arrow[3]:=Point(X+Round(LineLen*LW*Cos(A2)),Y-Round(LineLen*LW*Sin(A2)));
-  OldWidth:=Canvas.Pen.Width;
-  Canvas.Pen.Width:=1;
-  Canvas.Polygon(Arrow);
-  Canvas.Pen.Width:=OldWidth
-end;
-
 procedure DrawRectangle(Canvas: TCanvas; X1,Y1,X2,Y2: Integer; LW: Extended);
 begin
    glgraphics.DrawRectangle(glPN, X1,Y1, X2-X1,Y2-Y1);
@@ -125,8 +102,8 @@ procedure TForm1.FormCreate(Sender: TObject);
   end;
  }
 
- //X1, Y1, X2, Y2, Öâåò, Äëèòåëüíîñòü,{Èìÿ ñòîï ôàéëà(íåîáÿçàòåëüíûé)}
- //åñëè íà äèñêå åñòü ñòîï ôàéë, çíà÷èò íàäî ñäåëàòü exit
+ //X1, Y1, X2, Y2, ????, ????????????,{??? ???? ?????(??????????????)}
+ //???? ?? ????? ???? ???? ????, ?????? ???? ??????? exit
 
  glFirstShow:=True;
 
@@ -137,6 +114,7 @@ procedure TForm1.FormCreate(Sender: TObject);
  glHowLong:=30000;
  glColor := 255;
  glFileName:='';
+ glWidth := 3;
 
  for i := 1 to ParamCount do
     begin
@@ -156,7 +134,8 @@ procedure TForm1.FormCreate(Sender: TObject);
         glColorB:=StrToInt(ParamStr(i));
       if i=8 then
         glHowLong:=StrToInt(ParamStr(i));
-
+      if i=9 then
+        glWidth:=StrToInt(ParamStr(i));
 
       if LeftStr(ParamStr(i),13) = 'stopfilename=' then
       begin
@@ -169,28 +148,6 @@ procedure TForm1.FormCreate(Sender: TObject);
 
 end;
 
-procedure CopyScreenToImage();
-var
-  bm: TBitMap;
-  ms: TMemoryStream;
-begin
-    bm := TBitMap.Create;
-    bm.Width := Form1.Width; // øèðèíà õîëñòà
-    bm.Height := Form1.Height; // äëèíà õîëñòà
-    BitBlt(bm.Canvas.Handle, 0, 0,  bm.Width, bm.Height,
-    GetDC(0), Form1.Left, Form1.Top, SRCCOPY); // 0, 0,  bm.Width, bm.Height çäåñü ýòî òà ÷àñòü ýêðàíà
-    // êîòîðóþ íóæíî êîïèðîâàòü
-
-    ms := TMemoryStream.Create;
-    bm.SaveToStream(ms);
-    ms.Position := 0;
-    Form1.Image1.Picture.Bitmap.LoadFromStream(ms);
-    bm.Destroy;
-    ms.Free;
-
-end;
-
-
 procedure TForm1.RectangleTimerTimer(Sender: TObject);
   var
     OffsetX,OffsetY : integer;
@@ -270,7 +227,7 @@ procedure TForm1.RectangleTimerTimer(Sender: TObject);
   glgraphics.SetCompositingQuality(CompositingQualityAssumeLinear);
   glgraphics.SetInterpolationMode(InterpolationModeHighQualityBilinear);
 
-  glPN.SetWidth(3);
+  glPN.SetWidth(glWidth);
 
 
   ResX:=glX1+OffsetX;

diff --git a/Pramougolnik/__history/Rectangle.dpr.~1~ b/Pramougolnik/__history/Rectangle.dpr.~1~
diff --git a/Pramougolnik/__history/Unit1.dfm.~1~ b/Pramougolnik/__history/Unit1.dfm.~1~
diff --git a/Pramougolnik/__history/Unit1.dfm.~2~ b/Pramougolnik/__history/Unit1.dfm.~2~