Changeset 82 for trunk

Timestamp:

Jun 23, 2012, 11:58:40 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Na stránce web kamer velikost změněna na slovní označení místo bodových rozměrů. Nově jsou podporovány obrázky s jiným poměrem než 4:3.

Location:

trunk

Files:

• Pages/UWebCamPage.pas (modified) (6 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.lrs (modified) (1 diff)
• ZdechovNET.lpi (modified) (3 diffs)

trunk/Pages/UWebCamPage.pas

@@ -41 +41 @@
   Id: Integer;
   LastFileDate: string;
-  ImageWidth, ImageHeight: string;
+  ImageWidth, ImageHeight: Integer;
+  ImageWidthThumb, ImageHeightThumb: Integer;
 begin
   with TWebSession(HandlerData) do begin
@@ -54 +55 @@
       if HandlerData.Request.Query.IndexOfName('Id') = -1 then Id := ''
         else Id := IntToStr(StrToInt(HandlerData.Request.Query.Values['Id']));
-      if (HandlerData.Request.Query.IndexOfName('W') = -1) or
-        (HandlerData.Request.Query.IndexOfName('H') = -1) then begin
-        ImageWidth := '640';
-        ImageHeight := '480';
+      if (HandlerData.Request.Query.IndexOfName('W') = -1) then begin
+        ImageWidth := 640;
       end else begin
-        ImageWidth := IntToStr(StrToInt(HandlerData.Request.Query.Values['W']));
-        ImageHeight := IntToStr(StrToInt(HandlerData.Request.Query.Values['H']));
+        ImageWidth := StrToInt(HandlerData.Request.Query.Values['W']);
       end;
 
       Text := Text + '<table style="width: 100%"><tr><td style="width: 20%" valign="top">' +
         '<strong>Velikost</strong><br/>' +
-        '<a href="?W=320&H=240&Id=' + Id + '">320x240</a><br/> ' +
-        '<a href="?W=640&H=480&Id=' + Id + '">640x480</a><br/> ' +
-        '<a href="?W=1024&H=768&Id=' + Id + '">1024x768</a><br/> ' +
-        '<a href="?W=1280&H=1024&Id=' + Id + '">1280x1024</a><br/><br/>';
+        '<a href="?W=160&Id=' + Id + '">Malá</a><br/> ' +
+        '<a href="?W=320&Id=' + Id + '">Menší</a><br/> ' +
+        '<a href="?W=640&Id=' + Id + '">Střední</a><br/> ' +
+        '<a href="?W=1024&Id=' + Id + '">Větší</a><br/> ' +
+        '<a href="?W=1280&Id=' + Id + '">Velká</a><br/><br/>';
 
       Text := Text + '<strong>Místní kamery</strong><br/>';
-      Text := Text + '<a href="?W=' + ImageWidth +
-      '&H=' + ImageHeight +'">Všechny</a><br/>';
+      Text := Text + '<a href="?W=' + IntToStr(ImageWidth) + '">Všechny</a><br/>';
       try
         DbRows := TDbRows.Create;
-        Database.Query(DbRows, 'SELECT * FROM Webcam WHERE Enabled=1');
+        Database.Query(DbRows, 'SELECT * FROM `Webcam` WHERE `Enabled`=1');
         for I := 0 to DbRows.Count - 1 do begin
-          Text := Text + '<a href="?Id=' + DbRows[I].Values['Id'] + '&W=' + ImageWidth +
-          '&H=' + ImageHeight +'">' + DbRows[I].Values['Name'] + '</a><br/>';
+          Text := Text + '<a href="?Id=' + DbRows[I].Values['Id'] + '&W=' + IntToStr(ImageWidth) +
+          '">' + DbRows[I].Values['Name'] + '</a><br/>';
         end;
       finally
@@ -93 +91 @@
         try
           DbRows := TDbRows.Create;
-          Database.Query(DbRows, 'SELECT * FROM Webcam WHERE Enabled=1');
+          Database.Query(DbRows, 'SELECT * FROM `Webcam` WHERE `Enabled`=1');
+          ImageWidthThumb := 160;
           for I := 0 to DbRows.Count - 1 do begin
+            ImageHeightThumb := Round(ImageWidthThumb * StrToInt(DbRows[I].Values['Height']) / StrToInt(DbRows[I].Values['Width']));
             WebCamImage := 'images/webcam/' + DbRows[I].Values['ImageName'];
-            Text := Text + '<span align="center">' + //DbRows[I].Values['Name'] + '<br/>' +
-        '<a href="?Id=' + DbRows[I].Values['Id'] + '&W=' + ImageWidth +
-          '&H=' + ImageHeight +'">' +
-        '<img name="theImage" src="' + NavigationLink('/' + WebCamImage) + '" width="160" height="120" alt="' +
-        DbRows[I].Values['Name'] + '"/></a></span> ';
+            Text := Text + '<span align="center" valign="middle" style="vertical-align: middle;">' + //DbRows[I].Values['Name'] + '<br/>' +
+              '<a href="?Id=' + DbRows[I].Values['Id'] + '&W=' + IntToStr(ImageWidth) + '">' +
+              '<img name="theImage" src="' + NavigationLink('/' + WebCamImage) + '" width="' +
+            IntToStr(ImageWidthThumb) + '" height="' + IntToStr(ImageHeightThumb) + '" alt="' +
+            DbRows[I].Values['Name'] + '"/></a></span> ';
           end;
         finally
@@ -108 +108 @@
       try
         DbRows := TDbRows.Create;
-        Database.Query(DbRows, 'SELECT * FROM Webcam WHERE (Id=' +
-          Id + ') AND (Enabled=1)');
+        Database.Query(DbRows, 'SELECT * FROM `Webcam` WHERE (`Id`=' +
+          Id + ') AND (`Enabled`=1)');
         if DbRows.Count > 0 then begin
 
@@ -115 +115 @@
           RefreshInterval := StrToInt(DbRows[0].Values['ImagePeriod']);
           Id := DbRows[0].Values['Id'];
+          ImageHeight := Round(ImageWidth * StrToInt(DbRows[0].Values['Height']) / StrToInt(DbRows[0].Values['Width']));
 
         if FileExists(WebCamImage) then begin
@@ -142 +143 @@
         '<br /><div align="center">' + DbRows[0].Values['Name'] + '<br/>' +
         '<img name="theImageTemp" src="' + NavigationLink('/' + WebCamImage) + '" width="0" height="0" alt="Temp image"/>' +
-        '<img name="theImage" src="' + NavigationLink('/' + WebCamImage) + '" width="' + ImageWidth + '" height="' + ImageHeight + '" alt="' +
+        '<img name="theImage" src="' + NavigationLink('/' + WebCamImage) + '" width="' + IntToStr(ImageWidth) +
+        '" height="' + IntToStr(ImageHeight) + '" alt="' +
         DbRows[0].Values['Name'] + '"/><br/>Aktualizace: <span id="lasttime">' +
           LastFileDate + '</span>, Perioda: ' +

trunk/UCore.lfm

@@ -1 @@
-object MainModule: TMainModule
+object Core: TCore
   OldCreateOrder = False
   Height = 278

trunk/UCore.lrs

@@ -1 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TMainModule','FORMDATA',[
-  'TPF0'#11'TMainModule'#10'MainModule'#14'OldCreateOrder'#8#6'Height'#3#22#1#16
-  +'HorizontalOffset'#3#17#1#14'VerticalOffset'#3#208#0#5'Width'#3#175#1#0#7'TW'
-  +'ebApp'#7'WebApp1'#13'OnPageProduce'#7#18'WebApp1PageProduce'#10'ServerType'
-  +#7#5'stTCP'#4'left'#3#160#0#3'top'#2'X'#0#0#0
+LazarusResources.Add('TCore','FORMDATA',[
+  'TPF0'#5'TCore'#4'Core'#14'OldCreateOrder'#8#6'Height'#3#22#1#16'HorizontalOf'
+  +'fset'#3#17#1#14'VerticalOffset'#3#208#0#5'Width'#3#175#1#0#7'TWebApp'#7'Web'
+  +'App1'#13'OnPageProduce'#7#18'WebApp1PageProduce'#10'ServerType'#7#5'stTCP'#4
+  +'left'#3#160#0#3'top'#2'X'#0#0#0
 ]);

trunk/ZdechovNET.lpi

@@ -191 +191 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectsPage"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="UProjectsPage"/>
@@ -207 +208 @@
         <Filename Value="UCore.pas"/>
         <IsPartOfProject Value="True"/>
-        <HasResources Value="True"/>
+        <ComponentName Value="Core"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="UCore"/>
       </Unit23>
@@ -218 +221 @@
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="/usr/lib/mysql;/usr/lib64/mysql;Application;WebServer;Network;Pages;Modules/User;Common"/>
+      <OtherUnitFiles Value="/usr/lib/mysql/;/usr/lib64/mysql/;Application;WebServer;Network;Pages;Modules/User;Common"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>