Changeset 83

Timestamp:

Jun 24, 2012, 12:22:17 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Chyba při změně velikosti obrázků při zobrazení náhledu všech.

Location:

trunk

Files:

• Pages/UWebCamPage.pas (modified) (5 diffs)
• UCore.lrs (modified) (1 diff)
• UCore.pas (modified) (1 diff)

trunk/Pages/UWebCamPage.pas

@@ -39 +39 @@
   DbRows: TDbRows;
   I: Integer;
-  Id: Integer;
+  CameraId: Integer;
+  IdParam: string;
   LastFileDate: string;
   ImageWidth, ImageHeight: Integer;
@@ -53 +54 @@
       //HandlerData.Request.Query.Values['W'] := 'dsd';
       //HandlerData.Request.Query.Values['H'] := 'dsd';
-      if HandlerData.Request.Query.IndexOfName('Id') = -1 then Id := ''
-        else Id := IntToStr(StrToInt(HandlerData.Request.Query.Values['Id']));
+      if HandlerData.Request.Query.IndexOfName('Id') = -1 then CameraId := -1
+        else CameraId := StrToInt(HandlerData.Request.Query.Values['Id']);
       if (HandlerData.Request.Query.IndexOfName('W') = -1) then begin
         ImageWidth := 640;
@@ -61 +62 @@
       end;
 
+      if CameraId >= 0 then IdParam := '&Id=' + IntToStr(CameraId)
+        else IdParam := '';
       Text := Text + '<table style="width: 100%"><tr><td style="width: 20%" valign="top">' +
         '<strong>Velikost</strong><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/>';
+        '<a href="?W=160' + IdParam + '">Malá</a><br/> ' +
+        '<a href="?W=320' + IdParam + '">Menší</a><br/> ' +
+        '<a href="?W=640' + IdParam + '">Střední</a><br/> ' +
+        '<a href="?W=1024' + IdParam + '">Větší</a><br/> ' +
+        '<a href="?W=1280' + IdParam + '">Velká</a><br/><br/>';
 
       Text := Text + '<strong>Místní kamery</strong><br/>';
@@ -88 +91 @@
         '</td><td style="width: 80%" valign="top">';
 
-      if Id = '' then begin
+      if CameraId = -1 then begin
         try
           DbRows := TDbRows.Create;
@@ -109 +112 @@
         DbRows := TDbRows.Create;
         Database.Query(DbRows, 'SELECT * FROM `Webcam` WHERE (`Id`=' +
-          Id + ') AND (`Enabled`=1)');
+          IntToStr(CameraId) + ') AND (`Enabled`=1)');
         if DbRows.Count > 0 then begin
 
           WebCamImage := 'images/webcam/' + DbRows[0].Values['ImageName'];
           RefreshInterval := StrToInt(DbRows[0].Values['ImagePeriod']);
-          Id := DbRows[0].Values['Id'];
+          CameraId := StrToInt(DbRows[0].Values['Id']);
           ImageHeight := Round(ImageWidth * StrToInt(DbRows[0].Values['Height']) / StrToInt(DbRows[0].Values['Width']));
 

trunk/UCore.lrs

@@ +1 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TCore','FORMDATA',[
   'TPF0'#5'TCore'#4'Core'#14'OldCreateOrder'#8#6'Height'#3#22#1#16'HorizontalOf'

trunk/UCore.pas

@@ -179 +179 @@
     RegisterPage(TServerInfoPage, ServerInfoPage, 'serverinfo');
     RegisterPage(TWebCamPage, WebCamPage, 'kamery');
-    RegisterPage(TUserControlPage, UserControlPage, 'uzivatel');
+    //RegisterPage(TUserControlPage, UserControlPage, 'uzivatel');
     RegisterPage(TPlansPage, PlansPage, 'plany');
     RegisterPage(TNetworkPage, NetworkPage, 'sit');