Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nil method and whitespace fixes #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nil method and whitespace fixes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/nimcache/
fp_denoise
fp_denoise.exe
*~
73 changes: 36 additions & 37 deletions fp_denoise.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,41 +41,40 @@ when isMainModule:
var arg: string
for i in 0..<arguments.len:
arg = arguments[i].strip.replace("--", "-")
if not arg.isNilOrWhitespace:
if arg.toLowerAscii == "-wd":
workingDir = arguments[i+1]
elif arg.toLowerAscii.startsWith "-wd=":
workingDir = arg.split("=")[1]
elif arg.toLowerAscii == "-i" or arg.toLowerAscii == "-input":
inputFile = arguments[i+1]
elif arg.toLowerAscii.startsWith("-i=") or arg.toLowerAscii.startsWith("-input="):
inputFile = arg.split("=")[1]
elif arg.toLowerAscii == "-o" or arg.toLowerAscii == "-output":
outputFile = arguments[i+1]
elif arg.toLowerAscii.startsWith("-o=") or arg.toLowerAscii.startsWith("-output="):
outputFile = arg.split("=")[1]
elif arg.toLowerAscii == "-threshold":
threshold = parseFloat(arguments[i+1].strip)
elif arg.toLowerAscii.startsWith "-threshold=":
threshold = parseFloat(arg.split("=")[1].strip)
elif arg.toLowerAscii == "-filter":
filterSize = parseInt(arguments[i+1].strip)
elif arg.toLowerAscii.startsWith "-filter=":
filterSize = parseInt(arg.split("=")[1].strip)
elif arg.toLowerAscii == "-iterations":
iterations = parseInt(arguments[i+1].strip)
elif arg.toLowerAscii.startsWith "-iterations=":
iterations = parseInt(arg.split("=")[1].strip)
elif arg.toLowerAscii == "-shaded_relief" or arg.toLowerAscii == "-sr":
shadedReliefFile = arguments[i+1].strip
createShadedRelief = true
elif arg.toLowerAscii.startsWith("-shaded_relief=") or arg.toLowerAscii.startsWith("-sr="):
shadedReliefFile = arg.split("=")[1].strip
createShadedRelief = true
elif arg.toLowerAscii == "-m":
simpleMeanFilter = true
elif arg.toLowerAscii.contains("-h"):
echo """
if arg.toLowerAscii == "-wd":
workingDir = arguments[i+1]
elif arg.toLowerAscii.startsWith "-wd=":
workingDir = arg.split("=")[1]
elif arg.toLowerAscii == "-i" or arg.toLowerAscii == "-input":
inputFile = arguments[i+1]
elif arg.toLowerAscii.startsWith("-i=") or arg.toLowerAscii.startsWith("-input="):
inputFile = arg.split("=")[1]
elif arg.toLowerAscii == "-o" or arg.toLowerAscii == "-output":
outputFile = arguments[i+1]
elif arg.toLowerAscii.startsWith("-o=") or arg.toLowerAscii.startsWith("-output="):
outputFile = arg.split("=")[1]
elif arg.toLowerAscii == "-threshold":
threshold = parseFloat(arguments[i+1].strip)
elif arg.toLowerAscii.startsWith "-threshold=":
threshold = parseFloat(arg.split("=")[1].strip)
elif arg.toLowerAscii == "-filter":
filterSize = parseInt(arguments[i+1].strip)
elif arg.toLowerAscii.startsWith "-filter=":
filterSize = parseInt(arg.split("=")[1].strip)
elif arg.toLowerAscii == "-iterations":
iterations = parseInt(arguments[i+1].strip)
elif arg.toLowerAscii.startsWith "-iterations=":
iterations = parseInt(arg.split("=")[1].strip)
elif arg.toLowerAscii == "-shaded_relief" or arg.toLowerAscii == "-sr":
shadedReliefFile = arguments[i+1].strip
createShadedRelief = true
elif arg.toLowerAscii.startsWith("-shaded_relief=") or arg.toLowerAscii.startsWith("-sr="):
shadedReliefFile = arg.split("=")[1].strip
createShadedRelief = true
elif arg.toLowerAscii == "-m":
simpleMeanFilter = true
elif arg.toLowerAscii.contains("-h"):
echo """
fp_denoise:
This tool performs feature-preserving de-noising on a raster digital elevation model (DEM).

Expand All @@ -89,8 +88,8 @@ Usage:
--shaded_relief, --sr Optional output hillshade image file name
-m If this flag is present, a simple mean filter is used
-h Help
"""
quit(QuitSuccess)
"""
quit(QuitSuccess)

else:
# No arguments have been supplied, so ask the user for input.
Expand Down
5 changes: 2 additions & 3 deletions raster.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,8 @@ proc readArcAscii(self: var Raster) =
self.values = newSeq[float64](self.rows * self.columns)

for val in lineSplit:
if not val.isNilOrWhitespace():
self.values[index] = parseFloat(val.strip)
index += 1
self.values[index] = parseFloat(val.strip)
index += 1

# set the North, East, South, and West coodinates
if xllcorner.classify != fcNegInf:
Expand Down