[Liblas-commits] hg: 2 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Nov 16 11:30:35 EST 2010
changeset b11e88c32c9b in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=b11e88c32c9b
summary: tweak setup.py to remove osgeo4w single-package build stuff which is no longer relevant on windows
changeset 59f5f131affb in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=59f5f131affb
summary: remove laskdtree and colorize.py which are scripts that have been replaced by lasblock and las2las --color-source
diffstat:
python/scripts/colorize.py | 238 --------------------------------------------
python/scripts/laskdtree.py | 154 ----------------------------
python/setup.py | 10 +-
3 files changed, 1 insertions(+), 401 deletions(-)
diffs (truncated from 427 to 300 lines):
diff -r c2b2bfcd28c6 -r 59f5f131affb python/scripts/colorize.py
--- a/python/scripts/colorize.py Mon Nov 15 15:24:19 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-#!/usr/bin/env python
-
-"""
-/******************************************************************************
- * $Id$
- *
- * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
- * Purpose: Pull color from a GDAL raster into an LAS file
- * Author: Howard Butler, hobu.inc at gmail.com
- *
- ******************************************************************************
- * Copyright (c) 2010, Howard Butler
- * Copyright (c) 2010, Aaron Reyna
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following
- * conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of the Martin Isenburg or Iowa Department
- * of Natural Resources nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- ****************************************************************************/
- """
-
-import optparse
-import os
-import sys
-
-from liblas import header
-from liblas import color
-from liblas import file as lasfile
-from liblas import schema
-from liblas import srs
-
-from osgeo import gdal
-gdal.UseExceptions()
-
-# usage
-# go fetch http://liblas.org/samples/Autzen_Stadium.zip
-
-# ./colorize.py Autzen_Stadium/LAS/44123A1305_ALL.las Autzen_Stadium/naip_1_1_1n_s_or039_2005_1_C2.img --bands 1,2,3 -w -a EPSG:26910 -t EPSG:4269
-class Colorizer(object):
-
- def construct_parser(self):
- from optparse import OptionParser, OptionGroup
- usage = "usage: %prog [options] arg"
- parser = OptionParser(usage)
- g = OptionGroup(parser, "Base options", "Basic Colorization Options")
- g.add_option("-o", "--output", dest='output',
- help="LAS file to write", metavar="OUTPUT")
- g.add_option("-i", "--input", dest='input',
- help="LAS file to read", metavar="INPUT")
- g.add_option("-r", "--image", dest='image',
- help="GDAL raster image to use for color ", metavar="IMAGE")
- g.add_option("-b", "--bands", dest='bands',
- help="Comma-separated list of bands numbers to use for R,G,B ", metavar="BANDS")
-
- g.add_option("-s", "--scale",
- action="store_true", dest="scale",
- help="Scale the color values to 16 bit by multiplying by 256")
-
- g.add_option("-t", "--target-srs", dest='target_srs',
- help="Output SRS for LAS file", metavar="TARGET_SRS")
-
- g.add_option("-a", "--assign-srs", dest='assign_srs',
- help="Assign specified SRS for input LAS file", metavar="ASSIGN_SRS")
-
- g.add_option("-w", "--overwrite",
- action="store_true", dest="overwrite",
- help="overwrite the existing LAS output file")
-
- g.add_option("-q", "--quiet",
- action="store_false", dest="verbose", default=False,
- help="Don't say what we're doing on stdout")
-
- parser.add_option_group(g)
-
- if self.opts:
- g = OptionGroup(parser, "Special Options", "Special options")
- for o in self.opts:
- g.add_option(o)
- parser.add_option_group(g)
-
- parser.set_defaults(verbose=True, precision = 6)
-
- self.parser = parser
-
- def __init__(self, arguments, options=None):
- self.las = None
- self.image = None
- self.output = None
- self.sql = None
-
- self.opts = options
- self.construct_parser()
- self.options, self.args = self.parser.parse_args(args=arguments)
-
-
- if not self.options.image:
- try:
- self.options.image = self.args[1]
- self.options.image = gdal.Open(self.options.image)
- except IndexError:
- raise self.parser.error("No input image was selected to use for color values!")
- except Exception as inst:
- raise self.parser.error("Unable to open GDAL image: %s" % inst.args[0])
-
- if not self.options.bands:
- self.options.bands = (1,2,3)
- else:
- self.options.bands = [int(i) for i in self.options.bands.split(',')]
-
- if not self.options.output:
- try:
- self.options.output = self.args[2]
- except IndexError:
- self.options.output = 'output.las'
-
- if self.options.output:
- self.options.output = os.path.abspath(self.options.output)
- if os.path.isdir(self.options.output):
- raise self.parser.error("Output '%s' is a directory, not a file " % self.options.output)
-
- if os.path.exists(self.options.output):
- if not self.options.overwrite:
- raise self.parser.error("Output file '%s' exists, but you have not selected the --overwrite option" % self.options.output)
- else:
- raise self.parser.error("No output was specified")
-
- if self.options.target_srs:
- s = srs.SRS()
- s.set_userinput(self.options.target_srs)
- self.options.target_srs = s
-
- if self.options.assign_srs:
- s = srs.SRS()
- s.set_userinput(self.options.assign_srs)
- self.options.assign_srs = s
-
- if self.args:
- self.options.las = self.args[0]
- try:
- f = self.options.las
- self.options.las = lasfile.File(f, mode='r')
- if self.options.assign_srs:
- # if we're assigning an SRS, take the header from the
- # file, grab it, and then stick our SRS on it and use it
- # to read the file
- h = self.options.las.header
- h.srs = self.options.assign_srs
-
- self.options.las = lasfile.File(f, header=h)
- except Exception as inst:
- raise self.parser.error("Unable to open input LAS file: %s" % inst.args[0])
-
- def create_output(self):
- # Use the same header as before, but just add support for color
- # and adjust our version to 1.2
- h = self.options.las.header
- s = h.schema
- s.color = True
- h.schema = s
- h.version = '1.2'
- if self.options.target_srs:
- h.srs = self.options.target_srs
- self.options.output = lasfile.File(self.options.output, header=h, mode='w')
- if self.options.target_srs:
- self.options.output.set_srs(self.options.target_srs)
-
- def process(self):
- rows = self.options.image.RasterYSize
- cols = self.options.image.RasterXSize
- bands = self.options.image.RasterCount
-
- # get georeference info
- transform = self.options.image.GetGeoTransform()
- xOrigin = transform[0]
- yOrigin = transform[3]
- pixelWidth = transform[1]
- pixelHeight = transform[5]
-
- red_band = self.options.image.GetRasterBand(self.options.bands[0]) # 1-based index
- green_band = self.options.image.GetRasterBand(self.options.bands[1])
- blue_band = self.options.image.GetRasterBand(self.options.bands[2])
-
- for p in self.options.las:
-
- # compute pixel offset
- xOffset = int((p.x - xOrigin) / pixelWidth)
- yOffset = int((p.y - yOrigin) / pixelHeight)
-
- red = red_band.ReadAsArray(xOffset, yOffset, 1, 1)
- green = green_band.ReadAsArray(xOffset, yOffset, 1, 1)
- blue = blue_band.ReadAsArray(xOffset, yOffset, 1, 1)
-
- red, green, blue = int(red), int(green), int(blue)
-
- if self.options.scale:
- red = red * 256
- green = green * 256
- blue = blue * 256
-
- c = color.Color(red, blue, green)
- p.color = c
- self.options.output.write(p)
-def main():
-
-
- d = Colorizer(sys.argv[1:])
- d.create_output()
- d.process()
-
-if __name__=='__main__':
- main()
-
-
diff -r c2b2bfcd28c6 -r 59f5f131affb python/scripts/laskdtree.py
--- a/python/scripts/laskdtree.py Mon Nov 15 15:24:19 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-#!/usr/bin/env python
-
-from scipy import spatial
-from numpy import array, vstack, empty, float
-
-from liblas import file
-from liblas import header
-from liblas import point
-from liblas import color
-from liblas import srs
-from liblas import guid
-
-
-import sys
-import os
-
-
-class Translator(object):
-
- def construct_parser(self):
- from optparse import OptionParser, OptionGroup
- usage = "usage: %prog --leaf-size 1000 filename.las"
- parser = OptionParser(usage)
- g = OptionGroup(parser, "Base options", "Basic Translation Options")
- g.add_option("-i", "--input", dest="input",
- help="Input LAS file", metavar="INPUT")
- g.add_option("-s", "--leaf-size", dest='leafsize',
- help="Maximum Leaf size", metavar="LEAFSIZE")
- g.add_option("-o", "--output", dest='output',
- help="Column name containing the point cloud object ", metavar="OUTPUT")
-
-
- g.add_option("-w", "--overwrite",
- action="store_true", dest="overwrite",
- help="overwrite the existing file")
-
-
- g.add_option("-q", "--quiet",
- action="store_false", dest="verbose", default=False,
- help="Don't say what we're doing on stdout")
-
- parser.add_option_group(g)
-
- if self.opts:
- g = OptionGroup(parser, "Special Options", "Special options")
- for o in self.opts:
- g.add_option(o)
- parser.add_option_group(g)
-
- parser.set_defaults(verbose=True, overwrite=False)
-
- self.parser = parser
-
- def __init__(self, arguments, options=None):
More information about the Liblas-commits
mailing list