Changeset 620 for trunk/Modules/Network/Network.php

Timestamp:

Dec 26, 2013, 11:01:38 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: V seznamu bezdrátových zažízení lze upřesnit také šířku postranních kanálů a režim.
• Upraveno: Zobrazení mapy obsazení frekvencí se nyní načítá ze seznamu bezdrátových zařízení.

File:

• trunk/Modules/Network/Network.php (modified) (2 diffs)

trunk/Modules/Network/Network.php

@@ -48 +48 @@
         }
         $Output .= '</tr>';
-        $DbResult = $this->Database->query('SELECT Frequency FROM NetworkAP WHERE '.$Where.' GROUP BY Frequency');
+        $DbResult = $this->Database->query('SELECT `Frequency` FROM `NetworkInterfaceWireless` WHERE '.$Where.' AND (`Mode`=0) GROUP BY `Frequency`');
         while($DbRow = $DbResult->fetch_assoc())
         {
-          $DbResult2 = $this->Database->query('SELECT * FROM NetworkAP WHERE Frequency='.$DbRow['Frequency'].' AND '.$Where);
+          $DbResult2 = $this->Database->query('SELECT * FROM `NetworkInterfaceWireless` WHERE (`Frequency`='.$DbRow['Frequency'].') AND '.$Where);
           while($DbRow2 = $DbResult2->fetch_assoc())
           {
-            $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2;
-            $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2;
+            $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthLower'];
+            $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthUpper'];
             $Output .= '<tr><td>'.$DbRow2['SSID'].'</td>';
             foreach($ChannelList as $Frequency)        
             {
-              if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
+              if(($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
+                else if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
                 else if(($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
+                
                 else $Color = '#ffffff';
               $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
@@ -288 +290 @@
         'AntennaPolarity' => array('Type' => 'TAntennaPolarity', 'Caption' => 'Polarizace antény', 'Default' => '0'),
         'Frequency' => array('Type' => 'Float', 'Caption' => 'Frekvence', 'Default' => '5600', 'Suffix' => 'MHz'),
+        'ChannelWidthLower' => array('Type' => 'Integer', 'Caption' => 'Šírka kanálu dolního', 'Default' => '0', 'Suffix' => 'MHz'),
         'ChannelWidth' => array('Type' => 'Integer', 'Caption' => 'Šírka kanálu', 'Default' => '20', 'Suffix' => 'MHz'),
+        'ChannelWidthUpper' => array('Type' => 'Integer', 'Caption' => 'Šírka kanálu horního', 'Default' => '0', 'Suffix' => 'MHz'),
+        'Mode' => array('Type' => 'TWirelessMode', 'Caption' => 'Režim', 'Default' => '0', 'Suffix' => ''),
         'TotalPower' => array('Type' => 'Integer', 'Caption' => 'Celkový výkon', 'Default' => '20', 'Suffix' => 'dBm', 
           'SQL' => '(`TxPower` - `CableAttenuation` + `AntenaGain`)', 'ReadOnly' => true),