Changeset 835

Timestamp:

09/14/11 15:58:18 (21 months ago)

Author:

jjr8

Message:

Fixed various minor bugs.

Location:

MGET/Branches/Jason/PythonPackage/src/GeoEco

Files:

• DataProducts/UMaineOMG.py (modified) (2 diffs)
• Datasets/ArcGIS.py (modified) (5 diffs)
• SpatialAnalysis/Lines.py (modified) (1 diff)
• Statistics/PredictLMForArcGISRasters.r (modified) (1 diff)

MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/UMaineOMG.py

@@ -2085 +2085 @@
 * temp - Potential temperature, in degrees C.
 
-* u - Northward sea water velocity, in m/s.
-
-* v - Eastward sea water velocity, in m/s.
+* u - Eastward sea water velocity, in m/s.
+
+* v - Northward sea water velocity, in m/s.
 
 * zz1 - Biomass concentration of microzooplankton, in nitrogen units,
@@ -2402 +2402 @@
 * temp - Potential temperature, in degrees C.
 
-* u - Northward sea water velocity, in m/s.
-
-* v - Eastward sea water velocity, in m/s.
+* u - Eastward sea water velocity, in m/s.
+
+* v - Northward sea water velocity, in m/s.
 
 * zz1 - Biomass concentration of microzooplankton, in nitrogen units,

MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/ArcGIS.py

@@ -483 +483 @@
                         d = gp.Describe(workspace)
                         if d.DataType.lower() == u'workspace' or d.DataType.lower() == u'folder' and (os.path.basename(workspace) != 'info' or not os.path.exists(os.path.join(path, workspace, 'arc.dir'))):
+                            workspace = os.path.basename(workspace)
                             contents.append(workspace)
                             self._TreeDataTypeCache[os.path.join(path, workspace)] = d.DataType
@@ -493 +494 @@
                         d = gp.Describe(dataset)
                         if issubclass(self._DatasetType, ArcGISRaster) and d.DataType.lower() == u'rastercatalog' or issubclass(self._DatasetType, ArcGISTable) and d.DataType.lower() == u'featuredataset':
+                            dataset = os.path.basename(dataset)
                             contents.append(dataset)
                             self._TreeDataTypeCache[os.path.join(path, dataset)] = d.DataType
@@ -525 +527 @@
                     raster = enum.Next()
                     while isinstance(raster, basestring) and len(raster) > 0:
-                        contents.append(raster)
+                        contents.append(os.path.basename(raster))
                         raster = enum.Next()
 
@@ -538 +540 @@
                 featureClass = enum.Next()
                 while isinstance(featureClass, basestring) and len(featureClass) > 0:
-                    contents.append(featureClass)
+                    contents.append(os.path.basename(featureClass))
                     featureClass = enum.Next()
 
@@ -545 +547 @@
                     table = enum.Next()
                     while isinstance(table, basestring) and len(table) > 0:
-                        contents.append(table)
+                        contents.append(os.path.basename(table))
                         table = enum.Next()
 

MGET/Branches/Jason/PythonPackage/src/GeoEco/SpatialAnalysis/Lines.py

@@ -58 +58 @@
             raise ValueError(_(u'The X components grid has a different cell size than the Y components grid. Please provide grids that have the same cell size.'))
 
-        if abs(xGrid.CenterCoords['x', 0] - yGrid.CenterCoords['x', 0]) / xGrid.CoordIncrements[0] > 0.001 or abs(xGrid.CenterCoords['y', 0] - yGrid.CenterCoords['y', 0]) / xGrid.CoordIncrements[1] > 0.001:
-            raise ValueError(_(u'The X components grid has a different extent than the Y components grid. Please provide grids that have the same extent.'))
+##        if abs(xGrid.CenterCoords['x', 0] - yGrid.CenterCoords['x', 0]) / xGrid.CoordIncrements[0] > 0.001 or abs(xGrid.CenterCoords['y', 0] - yGrid.CenterCoords['y', 0]) / xGrid.CoordIncrements[1] > 0.001:
+##            raise ValueError(_(u'The X components grid has a different extent than the Y components grid. Please provide grids that have the same extent.'))
 
         if xGrid.NoDataValue != yGrid.NoDataValue:

MGET/Branches/Jason/PythonPackage/src/GeoEco/Statistics/PredictLMForArcGISRasters.r

@@ -28 +28 @@
     for (predictor in labels(rastersForPredictors))
     {
-        minFittedPredictorValues[[predictor]] <- min(model$data[[predictor]], na.rm=TRUE)
-        maxFittedPredictorValues[[predictor]] <- max(model$data[[predictor]], na.rm=TRUE)
+        minFittedPredictorValues[[predictor]] <- min(c(model$data[[predictor]]), na.rm=TRUE)
+        maxFittedPredictorValues[[predictor]] <- max(c(model$data[[predictor]]), na.rm=TRUE)
     }