First working version!

diff --git a/DemChop/Makefile.am b/DemChop/Makefile.am
index ff5474731d9d544612af78f499bd74f1b4ed6b93..46710ee4492c6d73ed42f5c740884a71f0e1efb2 100644 (file)
--- a/DemChop/Makefile.am
+++ b/DemChop/Makefile.am
@@ -33,6 +33,7 @@ demchop_LDADD = \
        $(top_builddir)/Tools/Lib/DEM/libDEM.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
+       $(top_builddir)/Lib/Debug/libDebug.a \
        $(top_builddir)/Lib/zlib/libz.a \
        $(base_LIBS)
 
@@ -46,6 +47,9 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.2  1999/03/12 22:53:45  curt
+# First working version!
+#
 # Revision 1.1  1999/03/10 01:02:54  curt
 # Initial revision.
 #

diff --git a/DemChop/demchop.cxx b/DemChop/demchop.cxx
index 5a1b66dc6b2b320889e322db2c2fa9831bf57845..8182c8d8ee3d12e2ed7b60aaae4ee6e5c2b6f402 100644 (file)
--- a/DemChop/demchop.cxx
+++ b/DemChop/demchop.cxx
@@ -48,7 +48,7 @@ int main(int argc, char **argv) {
 
     fglog().setLogLevels( FG_ALL, FG_DEBUG );
 
-    if ( argc != 4 ) {
+    if ( argc != 3 ) {
        FG_LOG( FG_GENERAL, FG_ALERT, 
                "Usage " << argv[0] << " <dem_file> <work_dir>" );
        exit(-1);
@@ -59,21 +59,23 @@ int main(int argc, char **argv) {
     string command = "mkdir -p " + work_dir;
     system( command.c_str() );
 
-    fgDEM dem(dem_name);
+    FGDem dem(dem_name);
     dem.parse();
     dem.close();
 
     point2d min, max;
-    min.x = dem.get_originx() / 3600.0;
-    min.y = dem.get_originy() / 3600.0;
+    min.x = dem.get_originx() / 3600.0 + FG_HALF_BUCKET_SPAN;
+    min.y = dem.get_originy() / 3600.0 + FG_HALF_BUCKET_SPAN;
     FGBucket b_min( min.x, min.y );
 
-    max.x = min.x + ( dem.get_cols() * dem.get_col_step() ) / 3600.0;
-    max.y = min.y + ( dem.get_rows() * dem.get_row_step() ) / 3600.0;
+    max.x = (dem.get_originx() + dem.get_cols() * dem.get_col_step()) / 3600.0 
+       - FG_HALF_BUCKET_SPAN;
+    max.y = (dem.get_originy() + dem.get_rows() * dem.get_row_step()) / 3600.0 
+       - FG_HALF_BUCKET_SPAN;
     FGBucket b_max( max.x, max.y );
 
     if ( b_min == b_max ) {
-       dem.write_area( b_min );
+       dem.write_area( work_dir, b_min, true );
     } else {
        FGBucket b_cur;
        int dx, dy, i, j;
@@ -90,7 +92,7 @@ int main(int argc, char **argv) {
        for ( j = 0; j <= dy; j++ ) {
            for ( i = 0; i <= dx; i++ ) {
                b_cur = fgBucketOffset(min.x, min.y, i, j);
-               dem.write_area( b_cur );
+               dem.write_area( work_dir, b_cur, true );
            }
        }
     }
@@ -100,6 +102,9 @@ int main(int argc, char **argv) {
 
 
 // $Log$
+// Revision 1.3  1999/03/12 22:53:46  curt
+// First working version!
+//
 // Revision 1.2  1999/03/10 16:09:44  curt
 // Hacking towards the first working version.
 //