Frame: bugfix

Author: miili

src/scene.py

@@ -95,7 +95,7 @@ def __init__(self, scene, config=FrameConfig()):
 
         self._updateConfig(config)
         self._scene.evConfigChanged.subscribe(self._updateConfig)
-        self._scene.evChanged.subscribe(self._updateExtent)
+        self._scene.evChanged.subscribe(self.updateExtent)
 
     def _updateConfig(self, config=None):
         if config is not None:
@@ -105,14 +105,14 @@ def _updateConfig(self, config=None):
         else:
             return
 
-        self._updateExtent()
+        self.updateExtent()
         self.evChanged.notify()
 
-    def _updateExtent(self):
+    def updateExtent(self):
         if self._scene.cols == 0 or self._scene.rows == 0:
             return
 
-        self.llEutm, self.llNutm, self.utm_zone, self.utm_zone_letter =\
+        self.llEutm, self.llNutm, self.utm_zone, self.utm_zone_letter = \
             utm.from_latlon(self.llLat, self.llLon)
 
         self.cols = self._scene.cols
@@ -134,9 +134,8 @@ def _updateExtent(self):
                                           urlat, urlon)
         self.spherical_distortion = num.abs(self.extentE - extentE_top)
 
-        if self.dE is None or self.dN is None:
-            self.dE = (self.extentE + extentE_top) / (2*self.cols)
-            self.dN = self.extentN / self.rows
+        self.dE = (self.extentE + extentE_top) / (2 * self.cols)
+        self.dN = self.extentN / self.rows
 
         self.E = num.arange(self.cols) * self.dE + self.offsetE
         self.N = num.arange(self.rows) * self.dN + self.offsetN
@@ -146,11 +145,11 @@ def _updateExtent(self):
         self.urE = self.E.max()
         self.urN = self.N.max()
 
-        self.config.regularize()
-
         self.gridE = None
         self.gridN = None
         self.coordinates = None
+
+        self.config.regularize()
         return
 
     @property
@@ -161,7 +160,6 @@ def llLat(self):
     def llLat(self, llLat):
         self.config.llLat = llLat
         self._llLat = llLat
-        self._updateExtent()
 
     @property
     def llLon(self):
@@ -171,7 +169,6 @@ def llLon(self):
     def llLon(self, llLon):
         self.config.llLon = llLon
         self._llLon = llLon
-        self._updateExtent()
 
     @property
     def dLat(self):
@@ -180,7 +177,6 @@ def dLat(self):
     @dLat.setter
     def dLat(self, dLat):
         self.config.dLat = dLat
-        self._updateExtent()
 
     @property
     def dLon(self):
@@ -189,7 +185,6 @@ def dLon(self):
     @dLon.setter
     def dLon(self, dLon):
         self.config.dLon = dLon
-        self._updateExtent()
 
     @property
     def dN(self):
@@ -250,7 +245,7 @@ def setENOffset(self, east, north):
         '''
         self.offsetE = east
         self.offsetN = north
-        self._updateExtent()
+        self.updateExtent()
 
     def setLatLonReference(self, lat, lon):
         pass
@@ -760,6 +755,7 @@ def _import_from_dict(scene, data):
             if mv is not None:
                 setattr(scene.meta, mk, mv)
         scene.meta.extra.update(data['extra'])
+        scene.frame.updateExtent()
 
         scene._testImport()
         return scene

src/scene_io.py

@@ -405,11 +405,12 @@ def read(self, filename, **kwargs):
 
         else:
             self._log.info('Using Lat/Lon reference')
-            c['frame']['llLat'] = params['corner_lat']\
-                + (params['post_lat'] * nrows)
+            c['frame']['llLat'] = params['corner_lat'] \
+                + params['post_lat'] * nrows
             c['frame']['llLon'] = params['corner_lon']
             c['frame']['dLon'] = abs(params['post_lon'])
             c['frame']['dLat'] = abs(params['post_lat'])
+            print(c)
         return self.container