Changeset 2194

Timestamp:

10/13/10 19:13:41 (19 months ago)

Author:

dart

Message:

LotATC:
o Fix weather
o Fix init for map centering
o Remove debug

Location:

trunk

Files:

• common/mapview.py (modified) (1 diff)
• logging.conf (modified) (1 diff)
• lotatc_client/lotatcwnd.py (modified) (2 diffs)
• lotatc_server/lotatc_radarServer.py (modified) (1 diff)

trunk/common/mapview.py

@@ -61 +61 @@
         self.foreground_color = QColor("black")
         self.setViewportUpdateMode(QGraphicsView.SmartViewportUpdate)
-        self.current_pos = QPoint(0,0)
+        self.current_pos = QPointF(0,0)
 
 

trunk/logging.conf

@@ -27 +27 @@
 
 [logger_lotatcwnd]
-level=DEBUG
+level=WARNING
 handlers=file_client,console
 propagate=1

trunk/lotatc_client/lotatcwnd.py

@@ -1412 +1412 @@
                 meteo = self.mission.get_meteo()
             else:
-                meteo = self.mission["weather"]
+                meteo = self.mission["mission"]["weather"]
             self.ui.mapView.scene().set_meteo( meteo )
             self.update_meteo_dock()
@@ -1423 +1423 @@
                 meteo = self.mission.get_meteo()
             else:
-                meteo = self.mission["weather"]
+                meteo = self.mission["mission"]["weather"]
             self.dockWidgets["Weather"].widget().update_meteo( meteo, self.version_chooser.version )
 #----------------------------------------------------------------

trunk/lotatc_server/lotatc_radarServer.py

@@ -372 +372 @@
     if self.globalServerConfig.Mission:
       for m in self.globalServerConfig.Mission:
-        self.cnxObj.sendFrame( MISSION_REP + "|" + m)
+        self.cnxObj.sendFrame( MISSION_REP + "|" + m.encode('utf_8'))
       # End of: for m in self.globalServerConfig.Mission: