Changeset 2388 for trunk

Timestamp:

12/27/11 15:31:29 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Introduced some parameter for user input.
setupGrid() is called within grid(), not defineImage().

Location:

trunk/src

Files:

• STGrid.cpp (modified) (6 diffs)
• STGrid.h (modified) (3 diffs)

trunk/src/STGrid.cpp

@@ -67 +67 @@
   nprocessed_ = 0 ;
   nchunk_ = 0 ;
+
+  // initialize user input 
+  nxUI_ = -1 ;
+  nyUI_ = -1 ;
+  cellxUI_ = "" ;
+  cellyUI_ = "" ;
+  centerUI_ = "" ;
 }
 
@@ -74 +81 @@
   if ( infile_.compare( name ) != 0 ) {
     infile_ = String( infile ) ;
-    tab_ = Table( infile_ ) ;
   }
 }
@@ -100 +106 @@
                           string scenter ) 
 {
-  ROArrayColumn<Double> dirCol( tab_, "DIRECTION" ) ;
-  Matrix<Double> direction = dirCol.getColumn() ;
-  Double rmax, rmin, dmax, dmin ;
-  minMax( rmin, rmax, direction.row( 0 ) ) ;
-  minMax( dmin, dmax, direction.row( 1 ) ) ;
-
-  Int npx = (Int)nx ;
-  Int npy = (Int)ny ;
-  String cellx( scellx ) ;
-  String celly( scelly ) ;
-  String center( scenter ) ;
-  setupGrid( npx, npy, 
-             cellx, celly, 
-             rmin, rmax, 
-             dmin, dmax, 
-             center ) ;
+  nxUI_ = (Int)nx ;
+  nyUI_ = (Int)ny ;
+  cellxUI_ = String( scellx ) ;
+  cellyUI_ = String( scelly ) ;
+  centerUI_ = String( scenter ) ;
 }
   
@@ -255 +250 @@
   os << "selectData: elapsed time is " << t1-t0 << " sec." << LogIO::POST ;
 
+  setupGrid() ;
   setupArray() ;
 
@@ -592 +588 @@
 }
 
+void STGrid::setupGrid() 
+{
+  Double xmin,xmax,ymin,ymax ;
+  mapExtent( xmin, xmax, ymin, ymax ) ;
+  
+  setupGrid( nxUI_, nyUI_, cellxUI_, cellyUI_, 
+             xmin, xmax, ymin, ymax, centerUI_ ) ;
+}
+
 void STGrid::setupGrid( Int &nx, 
                         Int &ny, 
@@ -708 +713 @@
     ny_ = Int( ceil( wy/celly_ ) ) ;
   }
+}
+
+void STGrid::mapExtent( Double &xmin, Double &xmax, 
+                        Double &ymin, Double &ymax ) 
+{
+  //LogIO os( LogOrigin("STGrid","mapExtent",WHERE) ) ;
+  ROArrayColumn<Double> dirCol( tab_, "DIRECTION" ) ;
+  Matrix<Double> direction = dirCol.getColumn() ;
+  //os << "dirCol.nrow() = " << dirCol.nrow() << LogIO::POST ;
+  minMax( xmin, xmax, direction.row( 0 ) ) ;
+  minMax( ymin, ymax, direction.row( 1 ) ) ;
+  //os << "(xmin,xmax)=(" << xmin << "," << xmax << ")" << LogIO::POST ; 
+  //os << "(ymin,ymax)=(" << ymin << "," << ymax << ")" << LogIO::POST ; 
 }
 

trunk/src/STGrid.h

@@ -72 +72 @@
   void gridPerPol() ;
 
+  void setupGrid() ;
   void setupGrid( Int &nx, 
                   Int &ny, 
@@ -81 +82 @@
                   Double &ymax,
                   String &center ) ;
+  void mapExtent( Double &xmin, Double &xmax,
+                  Double &ymin, Double &ymax ) ;
 
   void setData( Array<Complex> &gdata,
@@ -156 +159 @@
 
 
+  // user input
+  Int nxUI_ ;
+  Int nyUI_ ;
+  String cellxUI_ ;
+  String cellyUI_ ;
+  String centerUI_ ;
+
   String infile_ ;
   Int ifno_ ;