Update for issue #110

jblindsay · Sep 11, 2020 · 672fecc · 672fecc
1 parent 428d5a7
commit 672fecc
Show file tree

Hide file tree

Showing 27 changed files with 167 additions and 43 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/doc_img/ArcGIS_toolbox.png b/doc_img/ArcGIS_toolbox.png
diff --git a/doc_img/DSM.png b/doc_img/DSM.png
diff --git a/doc_img/FirstReturnTIN.png b/doc_img/FirstReturnTIN.png
diff --git a/doc_img/GHRGLogoSm.png b/doc_img/GHRGLogoSm.png
diff --git a/doc_img/HorizonAngle.png b/doc_img/HorizonAngle.png
diff --git a/doc_img/LidarSegmentation.png b/doc_img/LidarSegmentation.png
diff --git a/doc_img/MultidirectionalHillshade_fig1.png b/doc_img/MultidirectionalHillshade_fig1.png
diff --git a/doc_img/MultidirectionalHillshade_fig2.png b/doc_img/MultidirectionalHillshade_fig2.png
diff --git a/doc_img/MultidirectionalHillshade_fig3.png b/doc_img/MultidirectionalHillshade_fig3.png
diff --git a/doc_img/QGIS_add_repo.png b/doc_img/QGIS_add_repo.png
diff --git a/doc_img/QGIS_plugin.png b/doc_img/QGIS_plugin.png
diff --git a/doc_img/QGIS_settings.png b/doc_img/QGIS_settings.png
diff --git a/doc_img/QGIS_whitebox.png b/doc_img/QGIS_whitebox.png
diff --git a/doc_img/StElis_point_cloud.png b/doc_img/StElis_point_cloud.png
diff --git a/doc_img/TimeInDaylight.png b/doc_img/TimeInDaylight.png
diff --git a/doc_img/WBRunner.png b/doc_img/WBRunner.png
diff --git a/doc_img/WhiteboxToolsLogoBlue.png b/doc_img/WhiteboxToolsLogoBlue.png
diff --git a/doc_img/WhiteboxToolsLogo_vert.svg b/doc_img/WhiteboxToolsLogo_vert.svg
diff --git a/doc_img/example_project_dir.png b/doc_img/example_project_dir.png
diff --git a/doc_img/flow_accum.png b/doc_img/flow_accum.png
diff --git a/doc_img/hypsometricallyTintedHillshade_fig1.png b/doc_img/hypsometricallyTintedHillshade_fig1.png
diff --git a/doc_img/wbt_auotcomplete.png b/doc_img/wbt_auotcomplete.png
diff --git a/doc_img/wbt_directory.png b/doc_img/wbt_directory.png
diff --git a/src/main.rs b/src/main.rs
@@ -297,7 +297,7 @@ fn help() {
         ext = ".exe";
     }
 
-    let exe_name = &format!("whitebox-tools{}", ext);
+    let exe_name = &format!("whitebox_tools{}", ext);
     let sep: String = path::MAIN_SEPARATOR.to_string();
     let s = "WhiteboxTools Help
 

diff --git a/src/tools/hydro_analysis/impoundment_index.rs b/src/tools/hydro_analysis/impoundment_index.rs
@@ -558,30 +558,6 @@ impl WhiteboxTool for ImpoundmentSizeIndex {
         }
 
 
-
-
-        // let mut output = Raster::initialize_using_file(&output_file, &input);
-        // for row in 0..rows {
-        //     for col in 0..columns {
-        //         z = input.get_value(row, col);
-        //         if z != nodata {
-        //             output.set_value(row, col, filled_dem.get_value(row, col) - crest_elev.get_value(row, col));
-        //         }
-        //     }
-        //     if verbose {
-        //         progress = (100.0_f64 * row as f64 / (rows - 1) as f64) as usize;
-        //         if progress != old_progress {
-        //             println!("Progress: {}%", progress);
-        //             old_progress = progress;
-        //         }
-        //     }
-        // }
-
-
-
-
-
-
         /*
         Perform the index calculation. This is essentially a downstream-directed flow-path
         tracing and accumulation operation that begins at the divides and ends at outlets.
@@ -674,23 +650,6 @@ impl WhiteboxTool for ImpoundmentSizeIndex {
             }
         }
 
-        let mut output = Raster::initialize_using_file(&output_file, &input);
-        for row in 0..rows {
-            for col in 0..columns {
-                z = input.get_value(row, col);
-                if z != nodata {
-                    output.set_value(row, col, filled_dem.get_value(row, col)); // - crest_elev.get_value(row, col));
-                }
-            }
-            if verbose {
-                progress = (100.0_f64 * row as f64 / (rows - 1) as f64) as usize;
-                if progress != old_progress {
-                    println!("Progress: {}%", progress);
-                    old_progress = progress;
-                }
-            }
-        }
-
         // Output the dam height above the ground elevation
         let extension: String = match Path::new(&output_file).extension().unwrap().to_str() {
             Some(n) => n.to_string(),

diff --git a/src/tools/stream_network_analysis/stream_link_id.rs b/src/tools/stream_network_analysis/stream_link_id.rs
@@ -392,7 +392,12 @@ impl WhiteboxTool for StreamLinkIdentifier {
         }
 
         let elapsed_time = get_formatted_elapsed_time(start);
-        output.configs.data_type = DataType::I32;
+        if current_id < 32767f64 {
+            output.configs.data_type = DataType::I16;
+        } else {
+            output.configs.data_type = DataType::I32;
+        }
+
         output.configs.palette = "qual.plt".to_string();
         output.configs.photometric_interp = PhotometricInterpretation::Categorical;
         output.add_metadata_entry(format!(