/[thuban]/branches/WIP-pyshapelib-bramz/ChangeLog

Diff of /branches/WIP-pyshapelib-bramz/ChangeLog

Parent Directory | Revision Log | View Patch Patch

-revision 1272 by jonathan,
Fri Jun 20 16:43:13 2003 UTC
+revision 1651 by bh,
Mon Aug 25 15:05:56 2003 UTC
 Line 1
+-08-25  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/application.py (ThubanApplication.OpenSession): Catch
+         LoadCancelled exceptions and handle them by returning immediately.
+-08-25  Bernhard Herzog  <[email protected]>
+         GUI part of loading sessions with postgis connections which may
+         require user interaction to get passwords or updated parameters
+         * Thuban/UI/dbdialog.py (DBDialog): Reimplement to make it look a
+         bit nucer and be more generic.
+         (DBFrame.OnAdd): Adapt to new DBDialog interface
+         * Thuban/UI/application.py (ThubanApplication.OpenSession): New
+         optional parameter db_connection_callback which is passed to
+         load_session.
+         * Thuban/UI/mainwindow.py (MainWindow.run_db_param_dialog): New.
+         Suitable as a db_connection_callback
+         (MainWindow.OpenSession): Use self.run_db_param_dialog as the
+         db_connection_callback of the application's OpenSession method
+-08-25  Bernhard Herzog  <[email protected]>
+         Basic loading of sessions containing postgis connections:
+         * Thuban/Model/load.py (LoadError): Add doc-string
+         (LoadCancelled): New exception class to indicate a cancelled load
+         (SessionLoader.__init__): Add the db_connection_callback parameter
+         which will be used by the loader to get updated parameters and a
+         password for a database connection
+         (SessionLoader.__init__): Add the new XML elements to the
+         dispatchers dictionary
+         (SessionLoader.check_attrs): Two new conversions, ascii to convert
+         to a byte-string object and idref as a generic id reference
+         (SessionLoader.start_dbconnection)
+         (SessionLoader.start_dbshapesource): New. Handlers for the new XML
+         elements
+         (load_session): Add the db_connection_callback to pass through the
+         SessionLoader
+         * test/test_load.py (TestPostGISLayer, TestPostGISLayerPassword):
+         New classes to test loading of sessions with postgis database
+         connections.
+-08-25  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/mainwindow.py (__ThubanVersion__): Remove this and
+         replace it and the comment with __BuildDate__ by the Source: and
+         Id: cvs keywords as used in the other files.
+-08-25  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/load.py (SessionLoader.check_attrs): Raise a
+         LoadError when a required attribute is missing. The code used to
+         be commented out for some reason, but probably should have been
+         active.
+         * test/test_load.py (TestLoadError.test): Test the message in the
+         LoadError too to make sure it really is about the missing
+         attribute
+-08-22  Bernhard Herzog  <[email protected]>
+         * test/test_save.py (SaveSessionTest.test_dbf_table)
+         (SaveSessionTest.test_joined_table): Add XML validation tests.
+-08-22  Bernhard Herzog  <[email protected]>
+         Implement saving a session with a postgis connection
+         * Resources/XML/thuban-0.9.dtd (dbconnection, dbshapesource) New
+         elements for database connections and shapestores using db
+         connections
+         (session): Add the dbconnections to the content model
+         * Thuban/Model/save.py (SessionSaver.write_db_connections): New.
+         Write the db connections
+         (SessionSaver.write_session): Call write_db_connections to write
+         the connection before the data sources
+         (SessionSaver.write_data_containers): Handle postgis shapestores
+         * test/test_save.py (SaveSessionTest.thubanids)
+         (SaveSessionTest.thubanidrefs): Update for new DTD
+         (SaveSessionTest.test_save_postgis): New. Test saving a session
+         with postgis connections
+         * Thuban/Model/postgisdb.py (PostGISTable.DBConnection)
+         (PostGISTable.TableName): New accessor methods for the connection
+         and table name
+         * test/test_postgis_db.py (TestPostGISTable.test_dbconn)
+         (TestPostGISTable.test_dbname): New methods to test the new
+         PostGISConnection methods
+-08-22  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/postgisdb.py (ConnectionError): New exception class
+         for exceptions occurring when establishing a Database connection
+         (PostGISConnection.connect): Catch psycopg.OperationalError during
+         connects and raise ConnectionError.
+         * test/test_postgis_db.py (TestPostgisDBExceptions): New class for
+         tests for database exceptions
+-08-22  Bernhard Herzog  <[email protected]>
+         Prepare the test suite for tests with required authentication
+         * test/postgissupport.py (PostgreSQLServer.__init__): Add instance
+         variables with two predefined users/passwords, one for the admin
+         and one for a non-privileged user.
+         (PostgreSQLServer.createdb): Pass the admin name to initdb and add
+         the non-privileged user to the database and set the admin password
+         (PostgreSQLServer.wait_for_postmaster): Use the admin user name.
+         Better error reporting
+         (PostgreSQLServer.connection_params)
+         (PostgreSQLServer.connection_string): New methods to return
+         information about how to connect to the server
+         (PostgreSQLServer.execute_sql): New. Convenience method to execute
+         SQL statements
+         (PostgreSQLServer.require_authentication): Toggle whether the
+         server requires authentication
+         (PostgreSQLServer.create_user, PostgreSQLServer.alter_user): New.
+         Add or alter users
+         (PostGISDatabase.initdb): Pass the admin name one the
+         subprocesses' command lines. Grant select rights on
+         geometry_columns to everybody.
+         (upload_shapefile): Use the admin name and password when
+         connecting. Grant select rights on the new table to everybody.
+         * test/test_viewport.py (TestViewportWithPostGIS.setUp): Use the
+         server's new methods to get the connection parameters.
+         * test/test_postgis_session.py (TestSessionWithPostGIS.setUp)
+         (TestSessionWithPostGIS.test_remove_dbconn_exception): Use the
+         server's new methods to get the connection parameters.
+         * test/test_postgis_db.py
+         (TestPostGISConnection.test_gis_tables_empty)
+         (TestPostGISConnection.test_gis_tables_non_empty)
+         (PostGISStaticTests.setUp): Use the server's new methods to get
+         the connection parameters.
+-08-22  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/about.py (About.__init__): Add the psycopg version.
+         * Thuban/version.py: Add psycopg version
+         * Thuban/Model/postgisdb.py (psycopg_version): New. Return the
+         version of the psycopg module
+-08-22  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/dbdialog.py (DBPwdDlg): Removed because it's not used.
+         (DBFrame.OnEdit): Removed because it's not used and wouldn't work
+         at the moment. The functionality should probably be implemented
+         some time, though.
+         (DBFrame.OnRemove): Display a message if the connection can't be
+         removed because it's still in use.
+-08-22  Jan-Oliver Wagner <[email protected]>
+         * Thuban/UI/about.py (About.__init__): split up the huge about
+         text into elements/lists for easier translation. This fixes bug
+         https://intevation.de/rt/webrt?serial_num=2058
+         Also, made some forgotten string available for the i18n.
+-08-21  Bernhard Herzog  <[email protected]>
+         Make postgis support really optional including insensitive menu
+         items.
+         * Thuban/Model/postgisdb.py (has_postgis_support): New. Return
+         whether the postgis is supported.
+         * Thuban/UI/dbdialog.py: Put the psycopg import into try..except
+         to make postgis support optional
+         * Thuban/UI/mainwindow.py (_has_postgis_support): New. Context
+         version of Thuban.Model.postgisdb.has_postgis_support
+         (database_management command): Make it only sensitive if postgis
+         is supported.
+-08-21  Jan-Oliver Wagner <[email protected]>
+         * Doc/manual/thuban-manual.xml: Added CVS revision for rev-history.
+         (section Adding and Removing Layers): Added text and described
+         multi-selection.
+         (chapter Extensions): New.
+-08-21  Jan-Oliver Wagner <[email protected]>
+         * Thuban/UI/mainwindow.py (MainWindow.AddLayer): Changed dialog
+         settings to allow multiple files to load into the map.
+         Also reduced selection to *.shp as a default.
+-08-20  Bernhard Herzog  <[email protected]>
+         Add dialogs and commands to open database connections and add
+         database layers.
+         * Thuban/UI/mainwindow.py (MainWindow.DatabaseManagement): New
+         method to open the database connection management dialog
+         (MainWindow.AddDBLayer): New method to add a layer from a database
+         (_has_dbconnections): New helper function to use for sensitivity
+         (database_management command, layer_add_db command): New commands
+         that call the above new methods.
+         (main_menu): Add the new commands to the menu.
+         * Thuban/Model/postgisdb.py (PostGISConnection.__init__)
+         (PostGISConnection.connect): Establish the actual connection in a
+         separate method and call it in __init__. This makes it easier to
+         override the behavior in test cases
+         (PostGISConnection.BriefDescription): New method to return a brief
+         description for use in dialogs.
+         * test/test_postgis_db.py (NonConnection): DB connection that
+         doesn't actually connect
+         (TestBriefDescription): New class with tests for the new
+         BriefDescription method
+-08-19  Jan-Oliver Wagner <[email protected]>
+         Moved anything from extensions to libraries.
+         * libraries: New.
+         * libraries/ pyprojection, pyshapelib, shapelib, thuban: New.
+         * libraries/pyprojection/ LICENSE, MANIFEST.in, Projection.i,
+         Projection.py, Projection_wrap.c, setup.py, swighelp.txt: These files have
+         been moved here from thuban/extensions/pyprojection/
+         See there in the Attic for the older history.
+         * libraries/pyshapelib/ COPYING, ChangeLog, NEWS, README, dbflib.i,
+         dbflib.py, dbflib_wrap.c, pyshapelib_api.h, pytest.py, setup.py,
+         shapelib.i, shapelib.py, shapelib_wrap.c, shptreemodule.c: These files
+         have been moved here from thuban/extensions/pyshapelib/
+         See there in the Attic for the older history.
+         * libraries/shapelib/ dbfopen.c, shapefil.h, shpopen.c, shptree.c: These
+         files have been moved here from thuban/extensions/shapelib/
+         See there in the Attic for the older history.
+         * libraries/thuban/ bmpdataset.cpp, cpl_mfile.cpp, cpl_mfile.h,
+         gdalwarp.cpp, wxproj.cpp: These files have been moved here from
+         thuban/extensions/thuban/
+         See there in the Attic for the older history.
+         * MANIFEST.in, setup.cfg, setup.py: renamed extensions to libraries.
+         * extensions/thuban/ bmpdataset.cpp, cpl_mfile.cpp, cpl_mfile.h,
+         gdalwarp.cpp, wxproj.cpp: Moved to libraries/thuban.
+         * extensions/shapelib/ dbfopen.c, shapefil.h, shpopen.c, shptree.c:
+         Moved to libraries/shapelib.
+         * extensions/pyshapelib/ COPYING, NEWS, dbflib.py, pytest.py,
+         shapelib.py, README, dbflib_wrap.c, setup.py, shapelib_wrap.c,
+         ChangeLog, dbflib.i, pyshapelib_api.h, shapelib.i, shptreemodule.c:
+         Moved to libraries/pyshapelib.
+         * extensions/pyprojection/ MANIFEST.in, Projection.py, setup.py,
+         LICENSE, Projection.i, Projection_wrap.c, swighelp.txt:
+         Moved to libraries/pyprojection.
+         * extensions/ pyprojection, pyshapelib, shapelib, thuban: Removed.
+         * extensions: Removed.
+-08-19  Bernhard Herzog  <[email protected]>
+         * test/test_viewport.py (ViewPortTest): We don't use the
+         facilities of FileTestMixin so don't derive from it.
+         (TestViewportWithPostGIS): New class with tests for using a
+         viewport on a map with postgis layers.
+-08-19  Bernhard Herzog  <[email protected]>
+         Add the db connection management to the session.
+         * Thuban/Model/session.py (Session.__init__): New instance
+         variable db_connections
+         (Session.AddDBConnection, Session.DBConnections)
+         (Session.HasDBConnections, Session.CanRemoveDBConnection)
+         (Session.RemoveDBConnection): New methods to manage and query the
+         db connections managed by the session
+         (Session.OpenDBShapeStore): New method to open a shapestore from a
+         db connection
+         * Thuban/Model/messages.py (DBCONN_REMOVED, DBCONN_ADDED): New
+         messages for the db connection handling in the session
+         * test/test_postgis_session.py: New. test cases for the session's
+         db connection handling with postgis connections
+-08-19  Bernhard Herzog  <[email protected]>
+         Add very basic postgis database support and the corresponding test
+         cases. The test cases require a PostgreSQL + postgis installation
+         but no existing database. The database will be created
+         automatically by the test cases
+         * test/README: Add note about skipped tests and the requirements
+         of the postgis tests.
+         * Thuban/Model/postgisdb.py: New. Basic postgis database support.
+         * test/test_postgis_db.py: New. Test cases for the postgis
+         support.
+         * Thuban/Model/wellknowntext.py: New. Parser for well-known-text
+         format
+         * test/test_wellknowntext.py: New. Test cases for the
+         wellknowntext parser
+         * test/postgissupport.py: New. Support module for tests involving
+         a postgis database.
+         * test/support.py (execute_as_testsuite): Shut down the postmaster
+         if it's still running after the tests
+         * Thuban/Model/data.py (RAW_WKT): New constant for raw data in
+         well known text format
+-08-19  Jan-Oliver Wagner <[email protected]>
+         * Examples/simple_extensions/hello_world.py: New. Raises a Hello World
+         message dialog.
+-08-18  Bernhard Herzog  <[email protected]>
+         * test/support.py (ThubanTestResult.printErrors): Indent the
+         reason for the skips in the output to make it a bit more readable.
+         (execute_as_testsuite): New helper function to run a test suite
+         and print some more information.
+         (run_tests): Use execute_as_testsuite to run the tests
+         * test/runtests.py (main): Use execute_as_testsuite to run the
+         tests
+-08-18  Bernhard Herzog  <[email protected]>
+         Fix some bugs in Thuban and the test suite that were uncovered by
+         changes introduced in Python 2.3:
+         * Thuban/Model/table.py (DBFTable.__init__): Make sure the
+         filename is an absolute name
+         * Thuban/Model/layer.py (RasterLayer.__init__): Make sure the
+         filename is an absolute name
+         * test/test_save.py (SaveSessionTest.testRasterLayer): Use a
+         unique filename to save to and use the correct relative filename
+         in the expected output.
+         (SaveSessionTest.test_dbf_table): Use the correct relative
+         filename in the expected output.
+         * test/test_layer.py (TestLayer.test_raster_layer): Update the
+         test to check whether the filename is absolute.
+-08-18  Jan-Oliver Wagner <[email protected]>
+         * Thuban/UI/about.py (About.__init__): Added Silke Reimer.
+-08-15  Bernhard Herzog  <[email protected]>
+         Change the way shapes are returned by a shape store. The
+         ShapesInRegion method returns an iterator over actual shape
+         objects instead of a list of shape ids.
+         * Thuban/Model/data.py (ShapefileShape.ShapeID): New. Return shape
+         id.
+         (ShapefileStore.ShapesInRegion): Return an iterator over the
+         shapes which yields shape objects instead of returning a list of
+         shape ids
+         (ShapefileStore.AllShapes): New. Return an iterator over all
+         shapes in the shape store
+         (DerivedShapeStore.AllShapes): New. Like in ShapefileStore
+         * Thuban/Model/layer.py (Layer.ShapesInRegion): Update
+         doc-string.
+         * Thuban/UI/baserenderer.py
+         (BaseRenderer.layer_ids, BaseRenderer.layer_shapes): Rename to
+         layer_shapes and make it return an iterator containg shapes
+         instead of a list of ids.
+         (BaseRenderer.draw_shape_layer): Update doc-string; Adapt to
+         layer_shapes() change
+         * Thuban/UI/renderer.py (ScreenRenderer.layer_ids)
+         (ScreenRenderer.layer_shapes): Rename as in BaseRenderer
+         * Thuban/UI/viewport.py (ViewPort._find_shape_in_layer): Adapt to
+         changes in the ShapesInRegion return value.
+         (ViewPort._get_hit_tester): Remove commented out code
+         * test/mockgeo.py (SimpleShapeStore.ShapesInRegion): Adapt to the
+         new return value.
+         (SimpleShapeStore.AllShapes): New. Implement this method too.
+         * test/test_layer.py (TestLayer.test_arc_layer)
+         (TestLayer.test_polygon_layer, TestLayer.test_point_layer)
+         (TestLayer.test_point_layer_with_projection)
+         (TestLayer.test_derived_store): Adapt to changes in the
+         ShapesInRegion return value.
+         * test/test_shapefilestore.py
+         (TestShapefileStoreArc.test_shapes_in_region)
+         (TestShapefileStorePolygon.test_shapes_in_region)
+         (TestShapefileStorePoint.test_shapes_in_region): Adapt to changes
+         in the ShapesInRegion return value.
+         (TestShapefileStorePoint.test_all_shapes)
+         (TestShapefileStoreArc.test_shape_shapeid): New tests for the new
+         methods
+         * test/test_derivedshapestore.py
+         (TestDerivedShapeStore.test_shapes_in_region): Adapt to changes in
+         the ShapesInRegion return value.
+         (TestDerivedShapeStore.test_all_shapes)
+         (TestDerivedShapeStore.test_shape_shapeid): New tests for the new
+         methods
+-08-15  Bernhard Herzog  <[email protected]>
+         Make the renderers deal correctly with raw vs. python level
+         representation of shape geometries
+         * Thuban/UI/baserenderer.py (BaseRenderer.low_level_renderer):
+         Return a flag useraw in addition to the callable and the parameter
+         to indicate whether the callable can deal with the raw shape data
+         or uses the higher level python lists of coordinates. The callable
+         now should accept either the raw data or the return value of the
+         shape's Points() method.
+         (BaseRenderer.draw_shape_layer): Adapt to the low_level_renderer
+         change
+         (BaseRenderer.projected_points): Instead of the shape id use the
+         points list as parameter.
+         (BaseRenderer.draw_polygon_shape, BaseRenderer.draw_arc_shape)
+         (BaseRenderer.draw_point_shape): Adapt to projected_points()
+         change and accept the points list as parameter instead of the
+         shape id.
+         * Thuban/UI/renderer.py (MapRenderer.low_level_renderer): Return
+         the useraw flag as required by the BaseRenderer
+         (ScreenRenderer.draw_shape_layer): Adapt to low-level renderer
+         changes.
+         * test/test_baserenderer.py
+         (TestBaseRenderer.test_point_with_classification): New test for
+         rendering a map with classifications.
+-08-15  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/viewport.py (ViewPort.find_shape_at)
+         (ViewPort._find_shape_in_layer, ViewPort._find_shape_in_layer)
+         (ViewPort._get_hit_tester, ViewPort.projected_points)
+         (ViewPort._hit_point, ViewPort._hit_arc, ViewPort._hit_polygon)
+         (ViewPort._find_label_at): Split the find_shape_at method into
+         several new methods and use the functions in the hit-test module.
+         * Thuban/UI/hittest.py: New module with Python-level hit-testing
+         functions
+         * test/test_hittest.py: New. Test for the new hittest module
+-08-15  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/layer.py (Layer.ShapesInRegion): Apply the layer
+         projection to all corners of the bounding box to get a better
+         approximation of the projected bounding box
+         * test/test_layer.py (TestLayer.test_point_layer_with_projection):
+         New. Test coordinate handling of a layer with a projection.
+         Catches the bug fixed in Layer.ShapesInRegion
+-08-15  Bernhard Herzog  <[email protected]>
+         Move some of the mock objects in test_baserenderer into their own
+         module so they can easily be used from other tests
+         * test/mockgeo.py: New test helper module with some mock objects
+         for geometry related things like shapes, shapestores and
+         projections.
+         * test/test_mockgeo.py: New. Tests for the new helper module
+         * test/test_baserenderer.py: Some of the mock-objects are in
+         mockgeo now.
+-08-12  Jan-Oliver Wagner <[email protected]>
+         * Thuban/UI/about.py (About.__init__): Added Bj�rn Broscheit.
+-08-12  Bernhard Herzog  <[email protected]>
+         * po/de.po: New. German translations by Bjoern Broscheit
+-08-12  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/projdialog.py (UnknownProjPanel._DoLayout): Translated
+         strings have to be one string literal.
+-08-11  Bernhard Herzog  <[email protected]>
+         * test/support.py (FloatComparisonMixin.assertPointListEquals):
+         New. This method was used in various derived classes, but it's
+         better to have it here.
+         * test/test_shapefilestore.py
+         (ShapefileStoreTests.assertPointListEquals): Removed. It's now in
+         FloatComparisonMixin
+         * test/test_layer.py (TestLayer.assertPointListEquals): Removed.
+         It's now in FloatComparisonMixin
+         * test/test_derivedshapestore.py
+         (TestDerivedShapeStore.assertPointListEquals): Removed. It's now
+         in FloatComparisonMixin
+-08-11  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/join.py (JoinDialog.OnJoin): Add missing space to
+         error message
+-08-08  Jan-Oliver Wagner <[email protected]>
+         * Doc/manual/thuban-manual.xml: Now use authorgroup. Added revhistory
+         with version number.
+         Changed title to reflect version number of Thuban.
+-08-08  Jan-Oliver Wagner <[email protected]>
+         * Thuban/UI/about.py (About.__init__): Reworked the hall of fame. Now
+         the list corresponds to the "About" web page.
+-08-08  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/projdialog.py (UTMProposeZoneDialog.dialogLayout):
+         Make sure translated strings are recognized as one string literal.
+         * Thuban/UI/proj4dialog.py (UTMProposeZoneDialog.dialogLayout):
+         Make sure translated strings are recognized as one string literal.
+         * Thuban/UI/classgen.py (ClassGenDialog.OnOK): Make sure
+         translated strings are recognized as one string literal.
+         * Thuban/UI/application.py (ThubanApplication.OpenSession): Make
+         sure translated strings are recognized as one string literal.
+-08-07  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/data.py (DerivedShapeStore.RawShapeFormat): New.
+         Simply delegates to the original shapestore.
+         * test/test_derivedshapestore.py
+         (TestDerivedShapeStore.test_raw_format): New. Test case for
+         DerivedShapeStore.RawShapeFormat
+-08-07  Bernhard Herzog  <[email protected]>
+         Add raw data interface to shape objects.
+         * Thuban/Model/data.py (ShapefileShape, Shape): Rname the shape
+         class to ShapefileShape which now holds shapefile specific
+         information.
+         (ShapefileShape.compute_bbox): Simplified to not cache any
+         information. The way this method is used that shouldn't matter
+         performance wise.
+         (ShapefileShape.RawData): New. Return the shapeid which is the raw
+         data format for shapes from shapefiles.
+         (ShapefileStore.RawShapeFormat): New. Return the raw datatype used
+         in the shape objects returned by a shapestore. For a
+         ShapefileStore this is always RAW_SHAPEFILE.
+         (RAW_PYTHON, RAW_SHAPEFILE): Constants for the RawShapeFormat
+         method.
+         * test/test_shapefilestore.py
+         (TestShapefileStore.test_raw_format): New test to test the raw
+         format feature of shapes.
+         * Thuban/Model/layer.py: Remove the unused import of Shape from
+         data. It was only there for interface compatibility but it's not
+         used inside of Thuban and the generic Shape class has gone away.
+         * Thuban/UI/renderer.py (MapRenderer.low_level_renderer): Check
+         the raw data format and only use an optimized version of its a
+         shapefile.
+-08-07  Bernhard Herzog  <[email protected]>
+         * test/test_baserenderer.py (SimpleShape): Shape class for the
+         tests.
+         (SimpleShapeStore.Shape): Use SimpleShape instead of
+         Thuban.Model.data.Shape to make the tests independed of the coming
+         changes.
+-08-07  Bernhard Herzog  <[email protected]>
+         * test/support.py (SkipTest, ThubanTestResult, ThubanTestRunner)
+         (ThubanTestProgram): New classes that extend the respective
+         classes from unittest. These new version support skipping tests
+         under certain expected conditions. In the Thuban test suite we
+         uses this for tests that require the optional gdal support.
+         (run_tests): Use ThubanTestProgram instead of the unittest.main()
+         * test/runtests.py (main): Use the new ThubanTestRunner instead of
+         the normal one from unittest
+         * test/test_layer.py (TestLayer.test_raster_layer): If this test
+         is not run because gdal support isn't available report this to the
+         runner.
+         * test/test_baserenderer.py
+         (TestBaseRenderer.test_raster_no_projection): Do not run this test
+         if gdal support isn't available and report this to the runner.
+-08-06  Bernhard Herzog  <[email protected]>
+         Rearrange the renderers a bit, partly in preparation for changes
+         required for the postgis merge, partly to make it more testable.
+         Also make the representation of coordinates in Shapes more
+         consistent.
+         * Thuban/UI/renderer.py (MapRenderer): Most of the code/methods in
+         this class is now in BaseRenderer. This class is now practically
+         only a specialization of BaseRenderer for rendering to an actual
+         wx DC.
+         (ScreenRenderer.draw_shape_layer): Use self.low_level_renderer()
+         to get the shapetype specific rendering functions.
+         * Thuban/UI/baserenderer.py: New file with the basic rendering
+         logic. The code in this file is completely independend of wx.
+         (BaseRenderer): Class with the basic rendering logic
+         * test/test_baserenderer.py: New. Test cases for BaseRenderer
+         * Thuban/UI/view.py (MapCanvas.__init__): New instance variable
+         error_on_redraw to guard agains endless loops and stack overflows
+         when there's a bug in the rendering code that raises exceptions.
+         (MapCanvas.OnIdle, MapCanvas._do_redraw): Split the actual
+         rendering into a separate method _do_redraw so that error handling
+         is a bit easier. When an exception occurs, set error_on_redraw to
+         true. When it's true on entry to OnIdle do nothing and return
+         immediately.
+         * Thuban/Model/data.py (ShapefileStore.Shape): For consistency, a
+         Shape object will always have the coordinates as a list of list of
+         coordinate pairs (tuples).
+         (Shape.compute_bbox): Adapt to new representation.
+         * Thuban/UI/viewport.py (ViewPort.find_shape_at)
+         (ViewPort.LabelShapeAt): Adapt to new coordinate representation in
+         Shape objects.
+         * test/test_shapefilestore.py
+         (ShapefileStoreTests.assertFloatTuplesEqual)
+         (ShapefileStoreTests.assertPointListEquals): Rename to
+         assertPointListEquals and change purpose to checking equality of
+         the lists returned by Shape.Points().
+         (TestShapefileStoreArc.test_shape)
+         (TestShapefileStorePolygon.test_shape)
+         (TestShapefileStorePoint.test_shape): Use the new
+         assertPointListEquals instead of assertFloatTuplesEqual
+         * test/test_layer.py (TestLayer.assertFloatTuplesEqual)
+         (TestLayer.assertPointListEquals): Rename to assertPointListEquals
+         and change purpose to checking equality of the lists returned by
+         Shape.Points().
+         (TestLayer.test_arc_layer, TestLayer.test_arc_layer)
+         (TestLayer.test_polygon_layer, TestLayer.test_point_layer)
+         (TestLayer.test_derived_store): Use the new assertPointListEquals
+         instead of assertFloatTuplesEqual
+         * test/test_derivedshapestore.py
+         (TestDerivedShapeStore.assertFloatTuplesEqual)
+         (TestDerivedShapeStore.assertPointListEquals): Rename to
+         assertPointListEquals and change purpose to checking equality of
+         the lists returned by Shape.Points().
+         (TestDerivedShapeStore.test_shape): Use the new
+         assertPointListEquals instead of assertFloatTuplesEqual
+-08-06  Jan-Oliver Wagner <[email protected]>
+         * Thuban/UI/projdialog.py (UTMPanel._OnPropose): Added test for
+         a bounding box. A dialog is raised in case, no bounding box
+         is found. This fixes bug #2043:
+         https://intevation.de/rt/webrt?serial_num=2043
+-08-05  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/color.py (Color.__repr__): Make the repr of a color
+         object look like a Color instantiation. Formerly it looked like a
+         tuple.
+         * test/test_color.py (TestColor.test_repr)
+         (TestColor.test_equality, TestColor.test_inequality): New. test
+         some more apects of the Color class
+         (TestTransparent.test_repr, TestTransparent.test_hex)
+         (TestTransparent.test_equality): New. Test cases for the
+         Transparent object.
+-08-04  Jan-Oliver Wagner <[email protected]>
+         * Doc/manual/thuban-manual.xml: a number of small improvements.
+         The resulting file is the version submitted for GREAT-ER II.
+-08-01  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/resource.py, Thuban/UI/projdialog.py,
+         Thuban/UI/join.py, Thuban/UI/classgen.py, Thuban/UI/about.py,
+         Thuban/Model/resource.py: Insert cvs keywords and doc-strings.
+         * Thuban/UI/common.py: Insert cvs keywords and doc-strings.
+         (Color2wxColour, wxColour2Color, ThubanBeginBusyCursor)
+         (ThubanEndBusyCursor): Add doc-strings
+-08-01  Bernhard Herzog  <[email protected]>
+         First step towards PostGIS integration. More abstraction by movin
+         more code from the layer to the shapestore. More methods of the
+         layer are now simply delegated to the equivalent method of the
+         shapestore. The SHAPETYPE_* constants are now in data not in
+         layer.
+         * Thuban/Model/data.py (SHAPETYPE_POLYGON, SHAPETYPE_ARC)
+         (SHAPETYPE_POINT, Shape): Move these constants and classes from
+         layer.py to data.py
+         (ShapefileStore.__init__): More Initialization for the new methods
+         and functionality.
+         (ShapefileStore.ShapeType, ShapefileStore.NumShapes)
+         (ShapefileStore.BoundingBox, ShapefileStore.ShapesInRegion)
+         (ShapefileStore.Shape): New methods that were formerly implemented
+         in the layer.
+         (DerivedShapeStore.Shape, DerivedShapeStore.ShapesInRegion)
+         (DerivedShapeStore.ShapeType, DerivedShapeStore.NumShapes)
+         (DerivedShapeStore.BoundingBox): New. DerivedShapeStore
+         equivalents of the new shape methods. These versions are simply
+         delegated to the original shapstore.
+         * Thuban/Model/layer.py (SHAPETYPE_POLYGON, SHAPETYPE_ARC)
+         (SHAPETYPE_POINT, Shape): Removed. They're now in data.py
+         (Layer.SetShapeStore): Removed the initializatin of instance
+         variables that were needed for the stuff that's now in
+         ShapefileStore
+         (Layer.BoundingBox, Layer.NumShapes, Layer.ShapeType)
+         (Layer.Shape, Layer.ShapesInRegion): Simply delegate to the
+         shapestore.
+         * Thuban/UI/classifier.py, Thuban/UI/renderer.py,
+         Thuban/UI/viewport.py: Import the SHAPETYPE_* constants from data
+         instead of layer.
+         * test/test_shapefilestore.py: New. Tests for ShapefileStore.
+         * test/test_derivedshapestore.py: New. Tests for DerivedShapeStore.
+         * test/test_layer.py: Import the SHAPETYPE_* constants from data
+         instead of layer.
+         (TestLayer.test_derived_store): Remove the test for the exception
+         when instantiating the DerivedShapeStore with an incompatible
+         table which is now in test_derivedshapestore.py. Add some more
+         tests of the layer methods to determine whether they work for a
+         DerivedShapeStore as well.
+-07-31  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Fix the list of required packages
+         by just listing the name and where they can be found.
+-07-31  Frank Koormann   <[email protected]>
+         * Doc/manual/thuban-manual.xml:
+         Changed the screenshot elements to figure.
+         Changed some variablelist elements to itemizedlist.
+         Added section on GDAL formats.
+-07-31  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Added a few sentences about
+         the Fix Border Color option when generating classes.
+-07-30  Jonathan Coles   <[email protected]>
+         * Thuban/Model/classgen.py: Add docstrings. Rename specific
+         Ramp instances to use lower_case_style.
+         * Thuban/UI/classgen.py: Use renamed Ramp instances.
+         * Thuban/UI/classifier.py: Add docstrings.
+         * Thuban/UI/dock.py: Add docstrings.
+         * test/test_classgen.py: Use renamed Ramp instances.
+-07-30  Bernhard Herzog  <[email protected]>
+         * Thuban/Lib/connector.py (QueueingPublisher): Removed. This class
+         was never used in Thuban.
+-07-30  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/join.py (JoinDialog.__init__): Use the table's Title()
+         method directly instead of going through the transient_table
+         method. This faster because transient_table may force the copy of
+         a DBF file into the transient database and setting a table's title
+         doesnm't affect the title of the associated transient table, so
+         this fixes RT #2042
+         * Thuban/UI/main.py (__version__): Don't import the already
+         removed show_exception_dialog.
+-07-29  Jonathan Coles   <[email protected]>
+         * Thuban/UI/application.py (ThubanApplication.ShowExceptionDialog):
+         Put back this method and remove the equivalent function since we
+         are setting the exception hook from within this class (OnInit).
+-07-29  Jonathan Coles   <[email protected]>
+         * Doc/manual/images/5_2_custom_ramp.png,
+         Doc/manual/images/5_2_quantiles.png,
+         Doc/manual/images/5_2_uniform_dist.png,
+         Doc/manual/images/5_2_unique_values.png,
+         Doc/manual/images/8_int_error.png: New screen shots.
+         * Doc/manual/thuban-manual.xml: Fixed typos and wording, clarified
+         some points, and added more screen shots.
+-07-29  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/data.py: Remove the now unused import of warnings
+-07-29  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/data.py (SimpleStore): Removed. This class has been
+         deprecated since before the 0.8 release and isn't used in Thuban
+         itself anymore.
+         * Thuban/Model/transientdb.py: Remove some unnecessary imports
+-07-29  Jonathan Coles   <[email protected]>
+         * Thuban/UI/application.py (ThubanApplication.OnInit): set the
+         python exception hook here so that we are sure to catch any
+         Thuban exception that happen during initialization.
+         * Thuban/UI/main.py (main): Don't set the exception hook here,
+         it will get set in ThubanApplication.OnInit.
+-07-29  Jonathan Coles   <[email protected]>
+         * Thuban/UI/application.py (ThubanApplication.ShowExceptionDialog):
+         Removed and called it show_exception_dialog() so that the exception
+         handler can be set before the class is created.
+         * Thuban/UI/main.py (main): Install the exception handler before
+         a ThubanApplication is created.
+-07-29  Bernhard Herzog  <[email protected]>
+         * po/it.po: New. Italian translation by Maurizio Napolitano
+         * po/ru.po: New. Russian translation by Alex Shevlakov
+-07-29  Frank Koormann   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Extended section on supported
+         projections.
+-07-29  Frank Koormann   <[email protected]>
+         * Doc/manual/thuban-manual.xml: gaspell-checked.
+-07-29  Jonathan Coles   <[email protected]>
+         * Doc/manual/images/3_5_legend.png: Added border to improve look
+         on white background.
+-07-29  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Fixed grammar and typos. Added
+         descriptions for the legend toolbar.
+         * Doc/manual/images/4_2_raster_layer_properties.png: Removed
+         cursor from dialog box.
+-07-28  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: More screenshots and more chapters.
+         * Doc/manual/images/2_4_session_tree.png,
+         Doc/manual/images/3_5_legend.png, Doc/manual/images/3_rename_map.png,
+         Doc/manual/images/4_2_layer_properties.png,
+         Doc/manual/images/4_2_raster_layer_properties.png,
+         Doc/manual/images/5_3_genclass.png,
+         Doc/manual/images/5_classification.png,
+         Doc/manual/images/6_projection.png,
+         Doc/manual/images/7_1_table_view.png,
+         Doc/manual/images/7_2_5_join.png: New screenshots.
+-07-24  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Chapter on Projection Management.
+-07-24  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Added EPS images and wrote
+         chapter on Layer Management.
+         * Doc/manual/Makefile: New. Makefile to generate all formats for the
+         manual and images.
+-07-24  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/range.py, Thuban/version.py: Remove the #! line as
+         it annoys lintian which warns about these files not being
+         executable. The #1 isn't necessary here since if you absolutely
+         must execute them you can always say "python <filename>".
+         * Thuban/UI/renderer.py (ScreenRenderer.draw_shape_layer): Remove
+         superfluous code to set brush and pen for point shapes
+         * Thuban/UI/viewport.py: Remove commented out code that wouldn't
+         belong in viewport anyway
+-07-24  Frank Koormann   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Added section on table management.
+-07-24  Bernhard Herzog  <[email protected]>
+         * test/runtests.py (main): Recognize the long "verbose" option
+         correctly.
+-07-22  Jonathan Coles   <[email protected]>
+         * Doc/manual/thuban-manual.xml: Continue to write first revision
+         of the manual.
+         * Thuban/UI/renderer.py (MapRenderer.render_map): Wrap method
+         with Begin/EndDrawing() calls to ensure we aren't doing to
+         many updates to the dc during rendering.
+         (ScreenRenderer.draw_shape_layer): self.draw_point_shape takes
+         a pen and brush argument so they need to be passed to the function.
+         * Thuban/UI/viewport.py (ViewPort.calc_min_max_scales): New.
+         Calculates the minimum and maximum scale values. Factored out
+         of set_view_transform so that it could be used to zoom all the
+         way into a single point.
+         (ViewPort.set_view_transform): Call calc_min_max_scales().
+         (ViewPort.FitSelectedToWindow): Zoom to the maximum scale
+         if only a single point is selected.
+         * Doc/manual/images/1_2_legend_close.png,
+         Doc/manual/images/1_2_legend_dock.png,
+         Doc/manual/images/1_2_mainwindow.png,
+         Doc/manual/images/1_2_mainwindow.ps,
+         Doc/manual/images/1_2_mainwindow.sk,
+         Doc/manual/images/3_2_fullextent.png,
+         Doc/manual/images/3_2_fulllayerextent.png,
+         Doc/manual/images/3_2_fullshapeextent.png,
+         Doc/manual/images/3_2_pan.png,
+         Doc/manual/images/3_2_zoomin.png,
+         Doc/manual/images/3_2_zoomout.png,
+         Doc/manual/images/3_3_identify.png,
+         Doc/manual/images/3_3_label.png,
+         Doc/manual/images/3_5_invisible.png,
+         Doc/manual/images/3_5_movedown.png,
+         Doc/manual/images/3_5_moveup.png,
+         Doc/manual/images/3_5_props.png,
+         Doc/manual/images/3_5_tobottom.png,
+         Doc/manual/images/3_5_totop.png,
+         Doc/manual/images/3_5_visible.png: New. Images for the documentation.
+-07-18  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/messages.py (MAP_REPLACED): New message.
+         * Thuban/UI/viewport.py (ViewPort.SetMap): Issue MAP_REPLACED
+         after the new map has been assigned
+         * Thuban/UI/mainwindow.py (MainWindow.delegated_messages):
+         Delegate MAP_REPLACED to the canvas too
+         (MainWindow.prepare_new_session): Removed. Thanks to the new
+         MAP_REPLACED message it's no longer needed
+         (MainWindow.OpenSession, MainWindow.NewSession):
+         prepare_new_session has been removed.
+         * Thuban/UI/classifier.py (Classifier.__init__): Subscribe to
+         MAP_REPLACED so that we can close the dialog if a new map is set.
+         (Classifier.unsubscribe_messages): Unsubscribe from MAP_REPLACED
+         (Classifier.map_replaced): Handle MAP_REPLACED by closing the
+         dialog
+         * test/test_viewport.py (SimpleViewPortTest)
+         (SimpleViewPortTest.test_default_size): Add doc-strings
+         (ViewPortTest.setUp): Bind map to self.map so we can use it in
+         tests. Subscribe to MAP_REPLACED messages too.
+         (ViewPortTest.tearDown): No need to explicitly unsubscribe
+         (ViewPortTest.test_set_map): New test for the SetMap method.
+-07-18  Bernhard Herzog  <[email protected]>
+         * test/test_viewport.py (SimpleViewPortTest.test_default_size):
+         Move this test from ViewPortTest.setUp to this new separate test
+         case. setUp is not the place for the actual tests.
+         (ViewPortTest.test_inital_settings, ViewPortTest.setUp): Move some
+         more of the test from setUp to the new test test_inital_settings.
+         (ViewPortTest.test_win_to_proj, ViewPortTest.test_proj_to_win)
+         (ViewPortTest.test_proj_conv): Split test_proj_conv into
+         test_win_to_proj and test_proj_to_win and make the tests easier to
+         understand
+         (ViewPortTest.testFitRectToWindow, ViewPortTest.testZoomFactor)
+         (ViewPortTest.testZoomOutToRect, ViewPortTest.testTranslate)
+         (ViewPortTest.test_unprojected_rect_around_point)
+         (ViewPortTest.test_find_shape_at, ViewPortTest.testTools):
+         Reformat to increase readability.
+-07-18  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/view.py (MapCanvas.OnLeftDown): Capture the mouse.
+-07-18  Bernhard Herzog  <[email protected]>
+         * test/runtests.py: The test suite can now be run without an X
+         connection. To make sure this remains true, remove the DISPLAY
+         environment variable so that an error occurs if the wxGTK is
+         imported accidentally
+-07-18  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/viewport.py: Remove unused imports
+         * Thuban/UI/view.py: Remove unused imports
+-07-18  Bernhard Herzog  <[email protected]>
+         * test/test_export.py Remove unused imports. The OutputTransform
+         function is now in viewport.py and is called output_transform
+         (TestScalebar.test_output_transform)
+         (TestScalebar.test_OutputTransform): Renamed to
+         test_output_transform and updated to use output_transform instead
+         of OutputTransform
+         * Thuban/UI/view.py (OutputTransform): Moved to viewport.py and
+         renamed.
+         (MapCanvas.Export, MapPrintout.draw_on_dc): OutputTransform was
+         renamed to output_transform
+         * Thuban/UI/viewport.py (OutputTransform, output_transform):
+         Rename to output_transform
+-07-18  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/layer.py (Layer.__init__): Rename
+         classificationField to classificatin_column and init it here so
+         that it can be used in SetClassificationColumn
+         (Layer.GetClassificationColumn, Layer.GetClassificationField):
+         Rename to GetClassificationColumn.
+         (Layer.SetClassificationColumn, Layer.SetClassificationField):
+         Rename to SetClassificationColumn and issue a LAYER_CHANGED
+         message if the column changes.
+         (Layer._classification_changed, Layer.ClassChanged): Rename to
+         _classification_changed. Update the callers.
+         (Layer.SetShapeStore): Further field->column renames.
+         * Thuban/Model/load.py (SessionLoader.start_classification)
+         (SessionLoader.start_clpoint): Updates because of
+         field->column method name changes in the Layer class
+         * Thuban/Model/save.py (SessionSaver.write_classification): Updates
+         because of field->column method name changes in the Layer class
+         * Thuban/UI/classifier.py (Classifier.__init__)
+         (Classifier._OnTry, Classifier._OnRevert): Updates because of
+         field->column method name changes in the Layer class
+         * Thuban/UI/renderer.py (MapRenderer.draw_shape_layer): Updates
+         because of field->column method name changes in the Layer class
+         * Thuban/UI/viewport.py (ViewPort.find_shape_at): Updates because
+         of field->column method name changes in the Layer class
+         * test/test_save.py (SaveSessionTest.testClassifiedLayer)
+         (SaveSessionTest.testClassifiedLayer): Update because of
+         field->column method name changes in the Layer class
+         * test/test_layer.py (SetShapeStoreTests.setUp)
+         (SetShapeStoreTests.test_sanity): Update because of field->column
+         method name changes in the Layer class
+         (TestLayerModification.setUp): Subscribe to LAYER_CHANGED as well
+         (TestLayerModification.test_sanity)
+         (TestLayerModification.test_initial_settings): remove unsued code
+         and rename to test_sanity.
+         (TestLayerModification.test_set_classification): New test for
+         SetClassification and SetClassificationField.
+-07-18  Bernhard Herzog  <[email protected]>
+         * test/test_classgen.py (TestFixedRamp.test): Extend test to check
+         the non-fixed values as well. The old test would have accepted a
+         fixed ramp that only returnes the fixed properties
+-07-17  Jonathan Coles   <[email protected]>
+         * Doc/manual/mainwindow.png, Doc/manual/mainwindow.xcf: Screen
+         shots for the manual. The XCF file is the source image and
+         has additional layers to support changes.
+         * Doc/manual/thuban-manual.xml: Wrote an initial Introduction.
+         * Thuban/UI/classifier.py (Classifier.__BuildClassification):
+         Return both the new class and the field name.
+         * Thuban/UI/mainwindow.py (MainWindow.ToggleLegend): Don't
+         fit the map to the window as this changes any zoom level that
+         the user may have set.
+-07-16  Jonathan Coles   <[email protected]>
+         * Thuban/Model/classgen.py (generate_singletons,
+         generate_uniform_distribution, generate_quantiles): Remove
+         fixes parameter, but maintain the same functionality by having
+         the calling function pass a FixedRamp object for the ramp.
+         (FixedRamp): New. Adapts a ramp to have fixed property values.
+         * Thuban/Model/classification.py: Use new CLASS_CHANGED message.
+         (Classification): Inherit from Publisher.
+         (Classification.__init__): Remove the layer parameter.
+         Classifications no longer need to have a parent layer.
+         (Classification.GetField, Classification.GetFieldType,
+         Classification.SetFieldInfo): Removed. The field name is stored
+         in the layer, and the type can be retreived by calling
+         Layer.GetFieldType().
+         (Classification._set_layer, Classification.GetLayer): Removed.
+         Classifications no longer have a parent layer.
+         * Thuban/Model/layer.py (Layer.Destroy): Unsubscribe from the
+         classification.
+         (Layer.SetShapeStore): Reset the classification first while
+         we still have the old shape store to work with.
+         (Layer.GetClassificationField, Layer.SetClassificationField):
+         New. Method for getting/setting the field to classify on.
+         (Layer.SetClassification): Simplified now that the layer
+         simply has to hold a reference to the classification and not
+         tell the classification who owns it.
+         Fixes RTbug #2023.
+         * Thuban/Model/load.py (SessionLoader.start_classification):
+         Set the field name on the layer, not the classification.
+         * Thuban/Model/messages.py: Add CLASS_CHANGED for when a
+         classification is modified.
+         * Thuban/Model/save.py (SessionSaver.write_classification):
+         Get the field name and type from the layer.
+         * Thuban/Model/table.py (table_to_dbf, table_to_csv): Renamed
+         parameter records to rows and add docstring. Fixes RTbug #1997.
+         * Thuban/UI/classgen.py (ClassGenDialog.OnOK): Use a fixed
+         ramp when we need to fix certain values of a ramp rather than
+         using the old fixes parameter. Fixes RTbug #2024.
+         * Thuban/UI/classifier.py (ClassGrid.CreateTable): Add fieldType
+         parameter.
+         (ClassTable.Reset): Add fieldType parameter and use it, rather
+         than asking the classification.
+         (Classifier.__init__): Remember the original class's field
+         and ask the layer for the field type, rather than the classification.
+         (Classifier.__SetGridTable): Retrieve the field and field type
+         for the table because they are not in the classification.
+         (Classifier._OnTry, Classifier._OnRevert): Set the classification
+         field on the layer in addition to the classification itself.
+         * Thuban/UI/renderer.py (MapRenderer.draw_shape_layer): Get the
+         classification field from layer.
+         * Thuban/UI/viewport.py (ViewPort.find_shape_at): Get the
+         classification field from layer. Split up tests and remove
+         *-imports. Fixes RTbug #1992.
+         * test/test_classgen.py (TestFixedRamp): Test for the FixedRamp class.
+         * test/test_classification.py
+         (TestClassification.test_classification): Remove tests for methods
+         that no longer exist.
+         * test/test_layer.py (SetShapeStoreTests.setUp): Classification
+         __init__ no longer has a field parameter, use SetClassificationField.
+         (SetShapeStoreTests.test_sanity): Use layer object to get class
+         field info.
+         * test/test_save.py (SaveSessionTest.testClassifiedLayer): Use
+         SetClassificationField on layer to set class field info.
+         * test/test_viewport.py: Renamed from test/test_view.py.
+-07-16  Jan-Oliver Wagner <[email protected]>
+         * Doc/manual/thuban-manual.xml: Added authors and an initial
+         coarse structure.
+-07-15  Bernhard Herzog  <[email protected]>
+         * test/support.py (FloatComparisonMixin): This is a mix-in class
+         and therefore should not be derived from any other class.
+         * test/test_range.py (RangeTest): FloatComparisonMixin is a
+         mix-in, so derive from TestCase as well.
+-07-15  Bernhard Herzog  <[email protected]>
+         * Thuban/UI/renderer.py (MapRenderer.draw_shape_layer): Rework the
+         draw_func handling a bit to remove one layer of indirection. This
+         makes the renderer about 10% faster in the non-classifying case
+         and the code a bit cleaner
+         (MapRenderer.draw_point_shape): Add the pen and brush parameters
+         and set them in the dc. Now the draw_point_shape method and
+         wxproj's draw_polygon_shape function have basically the same
+         signature so that both can be directly used as draw_func
+-07-15  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/save.py (SessionSaver.write_classification): Encode
+         string values (in addition to the labels) as UTF 8
+         * Thuban/Model/load.py (SessionLoader.start_clpoint): Decode the
+         values if the field type is string
+         * test/test_save.py (SaveSessionTest.testClassifiedLayer): Test
+         saving a session with non-ascii string classification values.
+         * test/test_load.py (TestClassification.file_contents)
+         (TestClassification.test): Check for non-ascii values in string
+         classifications
+-07-14  Jonathan Coles   <[email protected]>
+         * test/test_view.py: New. Tests for ViewPort.
+-07-14  Frank Koormann   <[email protected]>
+         * Thuban/Model/load.py (SessionLoader.start_map): Encode map
+         title to latin1.  Fixes https://intevation.de/rt/webrt?serial_num=2013
+         * test/test_load_0_8.py (TestUnicodeStrings): New, test load of
+         unicode strings from session file: session title, map title and
+         projection name.
+-07-10  Jonathan Coles   <[email protected]>
+         * Thuban/UI/viewport.py (Tool.MouseUp): Should have called
+         drag_stop, not drag_move when the mouse is released.
+-07-10  Jonathan Coles   <[email protected]>
+         The most important part of this is the seperation of view.py into
+         two pieces. viewport.py now has a class called ViewPort which
+         contains all the non-wx parts of view.py and can therefore be
+         tested. view.py contains only the wx-specific parts and is fairly
+         simple.
+         * Thuban/UI/view.py: Stripped out all non-wx functionality. Fixes
+         RTTbug #1992.
+         * Thuban/UI/viewport.py: New. Contains non-wx view functionality.
+         RTTbug #1992.
+         * Thuban/Model/classgen.py (generate_singletons,
+         generate_uniform_distribution, generate_quantiles):
+         Added 'fixes' parameter so that property attributes can
+         be held constant over the generated classification groups.
+         (CustomRamp.GetProperties): Remove unused variables.
+         * Thuban/Model/map.py (Map.SetProjection): Send the old
+         projection as an argument to listeners of the MAP_PROJECTION_CHANGED
+         event.
+         * Thuban/Model/table.py (table_to_dbf, table_to_csv): Added 'records'
+         parameter which is a list of records that restricts which
+         records are saved. Fixes RTbug #1997.
+         * Thuban/UI/application.py (ThubanApplication.ShowExceptionDialog):
+         Port exception dialog from GREAT-ER. Fixes RTbug #1993.
+         * Thuban/UI/classgen.py (ClassGenDialog.__init__): Add controls
+         to allow the user to fix line color/width on generated groups.
+         (ClassGenDialog.OnOK): Use new 'fixes' parameter of the generate_*
+         functions to optionally fix group properties.
+         * Thuban/UI/main.py (main): Set exception hook to the
+         ShowExceptionDialog. Fixes RTbug #1993.
+         * Thuban/UI/mainwindow.py (MainWindow.ShowTableView): Raise
+         the table window when it is selectd to be shown.
+         * Thuban/UI/tableview.py (QueryTableFrame.__init__): Add an
+         Export Selection button and move the export buttons underneath
+         the table.
+         (QueryTableFrame.UpdateStatusText): Added event argument so
+         that it can respond to grid selection events. The status text
+         is now updated even when the table is not associated with a
+         layer as was previously assumed.
+         (QueryTableFrame.OnGridSelectRange, OnGridSelectCell): Removed.
+         UpdateStatusText responds to these events.
+         (QueryTableFrame.OnSaveAs): Renamed to doExport.
+         (QueryTableFrame.doExport): Helper function that saves the
+         entire table, or selected rows, to a file.
+         (QueryTableFrame.OnExport, QueryTableFrame.OnExportSel): New.
+         Respond to export button events and call doExport.
+         * extensions/thuban/gdalwarp.cpp (ProjectRasterFile): Make sure
+         the function doesn't return NULL without first setting a Python
+         Error.
+         * test/runtests.py (main): Only print "Unknown option" for
+         unsupported options.
+         * test/support.py (FloatComparisonMixin.assertFloatEqual): Take
+         optional epsilon argument to specify floating point accuracy.
+         (FloatComparisonMixin.assertFloatSeqEqual): Call assertFloatEqual
+         for each item test.
+         * test/test_csv_table.py (TestCSVTable.test_table_to_cvs): Add
+         tests for saving selected records.
+         * test/test_dbf_table.py (TestTableToDBF.test_table_to_dbf): Add
+         tests for saving selected records.
+         * test/test_map.py (TestMapWithContents.test_set_projection):
+         MAP_PROJECTION_CHANGED events send the old projection.
+         * test/test_session.py
+         (TestSessionWithContent.test_forward_map_projection):
+         MAP_PROJECTION_CHANGED events send the old projection.
+         * test/test_table.py (TableTest): Update tests to use non-deprecated
+         functions.
+-07-08  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/transientdb.py (TransientTableBase.Width): The type
+         constants in the column objects are the standard ones defined in
+         the table module.
+         * test/test_transientdb.py
+         (TestTransientTable.test_transienttable_to_dbf): New. Test whether
+         exporting transient tables as DBF works. This should catch the bug
+         just fixed in TransientTableBase.Width.
+-07-08  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/classgen.py (CustomRamp.GetProperties): Compute the
+         interpolated colors correctly.
+         * test/test_classgen.py (TestCustomRamp.test_color_interpolation):
+         New. Test case for the fix in classgen.py
+-07-08  Bernhard Herzog  <[email protected]>
+         * test/runtests.py (main): Make the default output less verbose
+         and add a verbosity option (-v) to get the old output
+-07-08  Bernhard Herzog  <[email protected]>
+         * Resources/XML/thuban-0.9.dtd: New. This will become the DTD for
+.9.
+         * Thuban/Model/transientdb.py (TransientJoinedTable.JoinType):
+         New. Return the join type
+         * Thuban/Model/save.py (SessionSaver.write_session): Use new 0.9
+         DTD
+         (SessionSaver.write_data_containers): Save the join type for
+         joined tables
+         * Thuban/Model/load.py (SessionLoader.__init__): Add the new 0.9
+         namespace
+         (SessionLoader.start_jointable): Handle the jointype attribute
+         * test/test_load_0_8.py: New. Effectively a copy of test_load.py
+         as of Thuban 0.8. These are now tests to determine whether Thuban
+         can still read files generated by Thuban 0.8
+         * test/test_load.py (LoadSessionTest.dtd)
+         (TestSingleLayer.file_contents)
+         (TestLayerVisibility.file_contents, TestLabels.file_contents)
+         (TestLayerProjection.file_contents)
+         (TestRasterLayer.file_contents, TestJoinedTable.file_contents)
+         (TestJoinedTable.file_contents)
+         (TestLoadError.file_contents): Update for new DTD
+         (TestJoinedTable.file_contents, TestJoinedTable.setUp): Add test
+         for new join type attribute
+         * test/test_save.py (SaveSessionTest.dtd)
+         (SaveSessionTest.testEmptySession)
+         (SaveSessionTest.testSingleLayer)
+         (SaveSessionTest.testLayerProjection)
+         (SaveSessionTest.testRasterLayer)
+         (SaveSessionTest.testClassifiedLayer)
+         (SaveSessionTest.test_dbf_table)
+         (SaveSessionTest.test_joined_table): Update for new DTD
+         (SaveSessionTest.test_joined_table): Add test for new join type
+         attribute
+-07-04  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/table.py (_find_dbf_column_names): New. Helper
+         function for table_to_dbf
+         (table_to_dbf): Deal with names longer than the 10 character limit
+         * test/test_dbf_table.py (TestTableToDBF.test_table_to_dbf): Add
+         doc-string
+         (TestTableToDBF.test_table_to_dbf_long_col_names): New test for
+         long column names
+-07-03  Bernhard Herzog  <[email protected]>
+         * Doc/manual/thuban-manual.xml: Fix the CVS Revision Tag syntax
+-07-03  Bernhard Herzog  <[email protected]>
+         * Doc/manual/thuban-manual.xml, Doc/manual/README: New. Skeleton
+         for the Thuban manual and README with some basic information about
+         the manual
+-07-03  Bernhard Herzog  <[email protected]>
+         * Thuban/Model/transientdb.py (TransientJoinedTable.__init__):
+         Update doc-string
+         (TransientJoinedTable.create): Do not modify the column objects of
+         the input tables in place and copy all columns of the input tables
+         into the joined table after all.
+         * test/test_transientdb.py
+         (TestTransientTable.test_transient_joined_table_same_column_name):
+         Update to reflect the new behavior
+         (TestTransientTable.test_transient_joined_table_with_equal_column_names):
+         Update to reflect the new behavior
+         (TestTransientTable.test_transient_joined_table_name_collisions_dont_modify_in_place):
+         New test case for a bug which modified the column objects in place
+-07-02  Jonathan Coles   <[email protected]>
+         * Thuban/Model/classgen.py (generate_singletons,
+         generate_uniform_distribution, generate_quantiles,
+         GenQuantiles0): Make sure maxValue isn't less than
+         one, otherwise we could divide by zero.
+         * test/test_classgen.py (ClassGenTest.doClassRangeTest,
+         ClassGenTest.doClassSingleTest): Call doBoundsTest to
+         check the end classification groups against the
+         proper property values.
+         (ClassGenTest.doBoundsTest): New. Checks the first and
+         last classification groups to make sure their properties
+         are the correct upper and lower bounds for a color ramp.
+-07-02  Jonathan Coles   <[email protected]>
+         * Thuban/Model/classgen.py (generate_singletons,
+         generate_uniform_distribution, generate_quantiles,
+         GenQuantiles0): The denominator was one to high when
+         calculating the index for the ramp causing the index
+         to never to reach one.
+-07-02  Jonathan Coles   <[email protected]>
+         Changed the singature of ClassGroupRange.__init__ and
+         ClassGroupRange.SetRange() so that the min/max values are
+         passed as a tuple. This makes a better calling scheme for
+         when a Range object is passed instead.
+         * Thuban/Model/classgen.py: Fixed parameters to
+         ClassGroupRange constructor.
+         * Thuban/Model/classification.py (ClassGroupRange.__init__):
+         Consolidate the min/max parameters into a single _range which
+         can either be a tuple or a Range object.
+         (ClassGroupRange.SetRange): Consolidate the min/max parameters
+         into a single _range which can either be a tuple or a Range object.
+         * Thuban/Model/load.py (SessionLoader.start_clrange): Fix
+         call to ClassGroupRange constructor to use a tuple.
+         * Thuban/Model/layer.py (Layer.SetClassification): Switch
+         the classification instance variable to the new class
+         before calling _set_layer otherwise subscribers to a
+         LAYER_CHANGED event will not see any difference.
+         * test/test_classification.py: Fix tests of ClassGroupRange
+         so that they use the new signature.
+         * test/test_load.py: Fix use of ClassGroupRange so that it
+         uses the new signature.
+         * test/test_load_0_2.py: Fix use of ClassGroupRange so that it
+         uses the new signature.
+         * test/test_save.py: Fix use of ClassGroupRange so that it
+         uses the new signature.
+-07-01  Jonathan Coles   <[email protected]>
+         * Thuban/Model/classgen.py: Fixes RTbug #1972, 1971.
+         Import used objects/class from color.
+         (generate_singletons): We don't
+         need the numGroups parameter anymore because we are using
+         the new ramps with GetProperties().
+         (generate_uniform_distribution): Use new ramp method
+         GetProperties().
+         (generate_quantiles, GenQuantiles0): Use new ramp method
+         GetProperties().
+         (CustomRamp.SetNumGroups): Removed. The ramps now map
+         a value from 0 to 1 to class properties so the number
+         of groups is not needed ahead of time.
+         (CustomRamp.next): Removed. CustomRamp does not support
+         interation anymore.
+         (CustomRamp.GetProperties): Returns a ClassGroupProperties
+         object based on the index value from 0 to 1 that is
+         passed to it.
+         (GreyRamp, RedRamp, GreenRamp, BlueRamp, GreenToRedRamp):
+         Made into instances of Monochromatic class instread of
+         deriving from it.
+         (HotToCold.SetNumGroups): Removed. See CustomRamp.
+         (HotToCold.next): Removed. See CustomRamp.
+         * Thuban/Model/classification.py: Fixes RTbug #1973, 1971.
+         (Classification.SetField, Classification.SetFieldType):
+         Replaced with SetFieldInfo.
+         (Classification.SetFieldInfo): New. Does a better job of
+         what SetField and SetFieldType used to do by combining
+         their function since they should really always be done
+         at the same time.
+         (Classification.SetLayer): Renamed to _set_layer.
+         (Classification._set_layer): Should only be called from
+         Layer's SetClassification. This does not cause a recursive
+         call as SetLayer did because we know that Layer knows about
+         the classification.
+         * Thuban/Model/color.py: Fixes RTbug #1971.
+         (_Transparent): Renamed from Transparent so it doesn't
+         conflict with the module variable.
+         (Transparent, Black): Renamed from Color.Transparent,
+         Color.Black so they are not class variables.
+         * Thuban/Model/layer.py: Fixes RTbug #1971, 1973.
+         (Layer.Destroy): We don't need to call SetClassification
+         anymore to clear out the back reference in the classifcation
+         to the layer. It's better to set it to None using _set_layer,
+         and we won't be creating another clas object too.
+         (Layer.SetClassification): Classification._set_layer is not
+         recursive so remove all the locking variables. Also clean
+         up the code so that it remains unchanged if something fails.
+         * Thuban/Model/load.py: Fixes RTbug #1971.
+         (SessionLoader.start_classification): Call
+         Classification.SetFieldInfo().
+         * Thuban/Model/save.py: Removed import of Color which wasn't
+         being used.
+         * Thuban/UI/classgen.py: Fixes RTbug #1972.
+         (ClassGenDialog.__init__): Color ramps are now instances
+         already so we don't need to create any new objects.
+         (ClassGenDialog.OnOK): Check for numGroups is no longer
+         necessary because we never use it.
+         * Thuban/UI/classifier.py: Fixes RTbug #1971.
+         (Classifier.__BuildClassification, Classifier.__SetGridTable):
+         Call Classification.SetFieldInfo() instead of SetFieldType.
+         * Thuban/UI/renderer.py: Fixes RTbug #1971.
+         * Thuban/UI/view.py: Fixes RTbug #1974, 1971.
+         (MapCanvas.__init__): Subscribe to the idle time event. Set
+         background color to white.
+         (MapCanvas.OnPaint): Set a flag indicating that we should
+         render the map during idle time. If we already have a bitmap
+         just draw it now.
+         (MapCanvas.OnIdle): New. Render the map only during idle time.
+         This also fixes a problem with the busy cursor under gtk.
+         * test/test_classgen.py (ClassGenTest.test_generate_singletons):
+         Fix calls to generate_singletons because the signature changed.
+         * test/test_classification.py: Fix color references and
+         change calls to Classification.[SetField|SetFieldType] to
+         SetFieldInfo.
+         * test/test_load.py: Fix color references.
+         * test/test_load_0_2.py: Fix color references.
+         * test/test_save.py (SaveSessionTest.testClassifiedLayer):
+         Change calls to Classification.[SetField|SetFieldType] to
+         SetFieldInfo.
+-07-01  Frank Koormann   <[email protected]>
+         MERGE from the greater-ms3 branch.
+         * test/test_transientdb.py
+         (TestTransientTable.test_transient_joined_table_with_equal_column_names):
+         New. Test join of two tables with partly equal column names.
+         * Thuban/Model/transientdb.py (TransientJoinedTable.create):
+         If duplicates in left and right tables column names are found,
+         append '_' (underscores) to the name until it is unique.
+         Create always new internal names for the resulting table and reference
+         columns in the join statement with <table>.<column>
+-07-01  Bernhard Herzog  <[email protected]>
+         * test/test_transientdb.py
+         (TestTransientTable.test_transient_joined_table_same_column_name):
+         New. Test whether joining on columns with the same names in both
+         tables works.
+         * Thuban/Model/transientdb.py (TransientJoinedTable.create): Make
+         sure to use the right internal names even when joining on field
+         with the same names in both tables. Also, detect duplicate names
+         in the joined table correctly.
+-07-01  Frank Koormann   <[email protected]>
+         * Thuban/UI/renderer.py (ExportRenderer.render_legend):
+         Reverse List of layers to render in same order as in desktop legend.
+-06-30  Jonathan Coles   <[email protected]>
+         * Thuban/version.py (make_tuple): Takes a version string
+         and splits it into a tuple of at most three integers.
+         Used make_tuple() to make tuple versions of the version
+         numbers.
+         * Thuban/UI/about.py: Add Thuban email addresses.
+-06-30  Jonathan Coles   <[email protected]>
+         * Thuban/version.py: SQLite/PySQLite version dependencies
+         were too high.
+-06-30  Jonathan Coles   <[email protected]>
+         * Thuban/version.py: Update version to 0.8.1
+         * MANIFEST.in: Added Projections so that default.proj is
+         included.
+-06-26  Jonathan Coles   <[email protected]>
+         New About box with lots more information including library
+         versions and credits. More/better version checking before
+         Thuban starts.
+         * Thuban/UI/about.py: New. New About box that displays
+         library version information and credits.
+         * Thuban/version.py: Added new 'versions' dictionary which
+         contains the verions of various libraries which are checked
+         when the module loads.
+         (verify_versions): Check all version numbers and returns
+         a list of errors.
+         * Thuban/UI/classifier.py (Classifier.__EnableButtons):
+         Reset the status of the buttons as the situation warrants,
+         but in a better more reliable way by not relying on the
+         current status to determine what needs to change.
+         * Thuban/UI/main.py (wxCHECK_VERSION): Removed. Not needed.
+         (verify_versions): Remove most of the code since it is
+         now in Thuban.version.verify_versions.o
+         * Thuban/UI/mainwindow.py (MainWindow.About): Call new
+         About box in Thuban.UI.about.
+         * extensions/thuban/gdalwarp.cpp (get_gdal_version): New.
+         Returns the version of gdal library being used as a string.
+         * extensions/thuban/wxproj.cpp (check_version, check_version_gtk):
+         Removed.
+         (get_proj_version): Return the version of PROJ that the file
+         was compiled with.
+         (get_gtk_version): Return th version of GTK that the file
+         was compiled with.
+-06-25  Jonathan Coles   <[email protected]>
+         * Thuban/UI/classifier.py (Classifier.EditSymbol): The parent
+         of the SelectPropertiesDialog should be self so the window
+         appears on top.
+         (ClassGroupPropertiesCtrl.DoEdit): The parent
+         of the SelectPropertiesDialog should be self so the window
+         appears on top.
+         * Thuban/UI/resource.py: Cleaned up how we determine file
+         extensions.
+         (GetImageResource): Return an wxImage from our Resources.
+-06-24  Jonathan Coles   <[email protected]>
+         * Thuban/UI/renderer.py (ExportRenderer.render_legend):
+         Check that a layer has a classification before trying
+         to get it. Raster layers don't have classifications.
+-06-23  Jonathan Coles   <[email protected]>
+         * setup.py: Add Resources/XML to resource list.
+-06-23  Jonathan Coles   <[email protected]>
+         * setup.cfg: Fix copyright dates
+-06-23  Jonathan Coles   <[email protected]>
+         * MANIFEST.in: Update with Resources/XML
+         * setup.py: Don't include Locale resources yet as we don't
+         have any and it causes problems building the distribution
+         for Windows. Update version to 0.8.0.
+         * Doc/thuban.dtd: Removed since it is now in Resources/XML.
+         * Thuban/UI/mainwindow.py: Add blank line at the end because
+         file was not being read correctly building the Windows
+         distribution.
+-06-23  Jonathan Coles   <[email protected]>
+         * Thuban/UI/mainwindow.py (MainWindow.About): Fix text.
+         * Thuban/version.py: Temporarily update longversion for
+         the 0.8 release so that it doesn't have the cvs revision.
+-06-23  Jonathan Coles   <[email protected]>
+         * Thuban/UI/common.py (ThubanBeginBusyCursor): Call wxSafeYield
+         to make sure that we don't create reentrant possibilities with
+         wxYield.
+         * Thuban/UI/view.py (MapCanvas.OnPaint): Call wxBeginBusyCursor()
+         directly to avoid the wxSafeYield() call which generates an
+         OnPaint event causing infinite recursion. Don't try to catch
+         exception anymore. This was for before there were limits on map
+         scaling.
+-06-23  Bernhard Herzog  <[email protected]>
+         Bug fix for RT #1961:
+         * Thuban/Model/load.py (SessionLoader.start_derivedshapesource):
+         Register DerivedShapestores with the session
+         * Thuban/Model/session.py (Session.Tables): Make sure each table
+         is only listed once.
+         * test/test_load.py (TestJoinedTable.test): Add check_format call.
+         Update file contents to match the one written out.
+-06-20  Bernhard Herzog  <[email protected]>
+         * test/xmlsupport.py (SaxEventLister.startElementNS)
+         (SaxEventLister.endElementNS): Do not include the qname. Python
+.2.1 and 2.2.2 and 2.2.3 differ in this regard. In 2.2.1 qname it
+         is (presumably incorrectly) None, whereas it's a string with the
+         element name in the later versions.
+         * test/test_xmlsupport.py (TestEventList.test_even_list_simple)
+         (TestEventList.test_even_list_namespace): Update tests to reflect
+         the new behaviour
+         (TestEventList.test_even_list_id_normalization): Fix doc-string
+-06-20  Jonathan Coles   <[email protected]>
+         * Thuban/Model/layer.py (BaseLayer.HasShapes): New. Overridden
+         by deriving classes to determine if that layer supports shapes.
+         (Layer): Override HasShapes and return true.
+         * Thuban/UI/classgen.py: Use Thuban[Begin|End]BusyCursor()
+         instead of a direct call to wx[Begin|End]CusyCursor().
+         (GenUniquePanel._OnRetrieve): Set busy cursor while retrieving
+         table data.
+         * Thuban/UI/common.py (ThubanBeginBusyCursor, ThubanEndBusyCursor):
+         New. Wrappers around the wxWindows functions that allow us to
+         make additional calls such as wxYield which gives the native
+         system a chance to update the cursor correctly.
+         * Thuban/UI/tableview.py: Use Thuban[Begin|End]BusyCursor()
+         instead of a direct call to wx[Begin|End]CusyCursor().
+         * Thuban/UI/view.py: Use Thuban[Begin|End]BusyCursor()
+         instead of a direct call to wx[Begin|End]CusyCursor().
+         (MapCanvas.find_shape_at): Check if the current search layer
+         support shapes, otherwise go on to the next layer.
+         * test/test_layer.py: Add tests in each type of layer for
+         HasClassification() and HasShapes()
 -06-20  Jonathan Coles   <[email protected]>
          * Thuban/UI/view.py (MapCanvas.OnPaint): Call wxYield after

 Legend:



Removed from v.1272
 


changed lines


 
Added in v.1651
 Legend:



Removed from v.1272
 


changed lines


 
Added in v.1651
-Removed from v.1272
+Added in v.1651

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26