From cvs at intevation.de Mon Aug 8 17:36:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 8 Aug 2005 17:36:11 +0200 (CEST) Subject: jan: thuban/po de.po,1.5.2.1,1.5.2.2 Message-ID: <20050808153611.A634D1005A3@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/po In directory doto:/tmp/cvs-serv906 Modified Files: Tag: thuban-1-0-branch de.po Log Message: String fixes. This fixes Debian bug #313843. Index: de.po =================================================================== RCS file: /thubanrepository/thuban/po/de.po,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- de.po 20 Dec 2004 15:14:23 -0000 1.5.2.1 +++ de.po 8 Aug 2005 15:36:09 -0000 1.5.2.2 @@ -329,7 +329,7 @@ #: ../Thuban/UI/dock.py:371 ../Thuban/UI/join.py:66 #: ../Thuban/UI/projdialog.py:209 ../Thuban/UI/tableview.py:379 msgid "Close" -msgstr "Schliessen" +msgstr "Schließen" #: ../Thuban/UI/application.py:106 ../Thuban/UI/application.py:118 msgid "Cannot import the thubanstart module\n" @@ -420,7 +420,7 @@ #: ../Thuban/UI/classgen.py:53 msgid "Hot-to-Cold Ramp" -msgstr "Heiss-nach-Kalt Verlauf" +msgstr "Heiß-nach-Kalt Verlauf" #: ../Thuban/UI/classgen.py:69 msgid "Generate Classification" @@ -968,11 +968,11 @@ #: ../Thuban/UI/mainwindow.py:759 msgid "Pick the tables to close:" -msgstr "Wähle die Tabellen zum Schliessen:" +msgstr "Wähle die Tabellen zum Schließen:" #: ../Thuban/UI/mainwindow.py:760 msgid "Close Table" -msgstr "Tabelle schliessen" +msgstr "Tabelle schließen" #: ../Thuban/UI/mainwindow.py:780 msgid "Pick the table to show:" @@ -988,11 +988,11 @@ #: ../Thuban/UI/mainwindow.py:815 msgid "Pick the table to rename:" -msgstr "Wähle Tabellen zum Umbennen:" +msgstr "Wähle Tabellen zum Umbenennen:" #: ../Thuban/UI/mainwindow.py:816 ../Thuban/UI/mainwindow.py:828 msgid "Rename Table" -msgstr "Tabelle umbennen" +msgstr "Tabelle umbenennen" #: ../Thuban/UI/mainwindow.py:828 msgid "Table Title:" @@ -1004,7 +1004,7 @@ #: ../Thuban/UI/mainwindow.py:877 msgid "Rename Map" -msgstr "Karte Umbennen" +msgstr "Karte Umbenennen" #: ../Thuban/UI/mainwindow.py:890 msgid "Layer Title:" @@ -1061,11 +1061,11 @@ #: ../Thuban/UI/mainwindow.py:1042 msgid "Toggle on/off the session tree analysis window" -msgstr "Das Analysefenster des Sessionbaums zeigen/schliessen" +msgstr "Das Analysefenster des Sessionbaums zeigen/schließen" #: ../Thuban/UI/mainwindow.py:1045 msgid "Toggle Legend on/off" -msgstr "Legende zeigen/schliessen" +msgstr "Legende zeigen/schließen" #: ../Thuban/UI/mainwindow.py:1046 msgid "&Database Connections..." @@ -1179,7 +1179,7 @@ #: ../Thuban/UI/mainwindow.py:1092 msgid "Rename the map" -msgstr "Karte umbennen" +msgstr "Karte umbenennen" #: ../Thuban/UI/mainwindow.py:1093 msgid "&Add Layer..." @@ -1223,11 +1223,11 @@ #: ../Thuban/UI/mainwindow.py:1112 msgid "Re&name ..." -msgstr "&Umbennen..." +msgstr "&Umbenennen..." #: ../Thuban/UI/mainwindow.py:1113 msgid "Rename selected layer" -msgstr "Ausgewählte Ebene umbennen" +msgstr "Ausgewählte Ebene umbenennen" #: ../Thuban/UI/mainwindow.py:1115 msgid "&Raise" @@ -1295,15 +1295,15 @@ #: ../Thuban/UI/mainwindow.py:1162 msgid "&Close..." -msgstr "&Schliessen..." +msgstr "&Schließen..." #: ../Thuban/UI/mainwindow.py:1164 msgid "Close one or more tables from a list" -msgstr "Schliesse eine oder mehrere Tabellen von der Liste" +msgstr "Schließe eine oder mehrere Tabellen von der Liste" #: ../Thuban/UI/mainwindow.py:1167 msgid "Rename one or more tables" -msgstr "Umbennen von einer oder mehreren Tabellen" +msgstr "Umbenennen von einer oder mehreren Tabellen" #: ../Thuban/UI/mainwindow.py:1168 msgid "&Show..." From cvs at intevation.de Mon Aug 8 17:58:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 8 Aug 2005 17:58:37 +0200 (CEST) Subject: jan: thuban ChangeLog,1.624.2.41,1.624.2.42 Message-ID: <20050808155837.CD81B1005C6@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv1292 Modified Files: Tag: thuban-1-0-branch ChangeLog Log Message: translation fixes for german. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.624.2.41 retrieving revision 1.624.2.42 diff -u -d -r1.624.2.41 -r1.624.2.42 --- ChangeLog 27 Jun 2005 21:58:11 -0000 1.624.2.41 +++ ChangeLog 8 Aug 2005 15:58:35 -0000 1.624.2.42 @@ -1,3 +1,7 @@ +2005-08-08 Jan-Oliver Wagner + + * po/de.po: String fixes. This fixes Debian bug #313843. + 2005-06-28 Jan-Oliver Wagner Backport from HEAD. From cvs at intevation.de Mon Aug 8 20:38:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 8 Aug 2005 20:38:39 +0200 (CEST) Subject: jan: thuban/po de.po,1.6,1.7 Message-ID: <20050808183839.4242E1005CA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/po In directory doto:/tmp/cvs-serv3786 Modified Files: de.po Log Message: String fixes. This fixes Debian bug #313843. Index: de.po =================================================================== RCS file: /thubanrepository/thuban/po/de.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- de.po 5 Jul 2005 20:03:41 -0000 1.6 +++ de.po 8 Aug 2005 18:38:37 -0000 1.7 @@ -365,7 +365,7 @@ #: ../Thuban/UI/join.py:66 ../Thuban/UI/layerproperties.py:82 #: ../Thuban/UI/projdialog.py:209 ../Thuban/UI/tableview.py:379 msgid "Close" -msgstr "Schliessen" +msgstr "Schließen" #: ../Thuban/UI/altpathdialog.py:26 #, python-format @@ -487,7 +487,7 @@ #: ../Thuban/UI/classgen.py:53 msgid "Hot-to-Cold Ramp" -msgstr "Heiss-nach-Kalt Verlauf" +msgstr "Heiß-nach-Kalt Verlauf" #: ../Thuban/UI/classgen.py:69 msgid "Generate Classification" @@ -1051,11 +1051,11 @@ #: ../Thuban/UI/mainwindow.py:876 msgid "Pick the tables to close:" -msgstr "Wähle die Tabellen zum Schliessen:" +msgstr "Wähle die Tabellen zum Schließen:" #: ../Thuban/UI/mainwindow.py:877 msgid "Close Table" -msgstr "Tabelle schliessen" +msgstr "Tabelle schließen" #: ../Thuban/UI/mainwindow.py:897 msgid "Pick the table to show:" @@ -1071,11 +1071,11 @@ #: ../Thuban/UI/mainwindow.py:932 msgid "Pick the table to rename:" -msgstr "Wähle Tabellen zum Umbennen:" +msgstr "Wähle Tabellen zum Umbenennen:" #: ../Thuban/UI/mainwindow.py:933 ../Thuban/UI/mainwindow.py:945 msgid "Rename Table" -msgstr "Tabelle umbennen" +msgstr "Tabelle umbenennen" #: ../Thuban/UI/mainwindow.py:945 msgid "Table Title:" @@ -1087,7 +1087,7 @@ #: ../Thuban/UI/mainwindow.py:994 msgid "Rename Map" -msgstr "Karte Umbennen" +msgstr "Karte Umbenennen" #: ../Thuban/UI/mainwindow.py:1007 msgid "Layer Title:" @@ -1144,11 +1144,11 @@ #: ../Thuban/UI/mainwindow.py:1167 msgid "Toggle on/off the session tree analysis window" -msgstr "Das Analysefenster des Sessionbaums zeigen/schliessen" +msgstr "Das Analysefenster des Sessionbaums zeigen/schließen" #: ../Thuban/UI/mainwindow.py:1170 msgid "Toggle Legend on/off" -msgstr "Legende zeigen/schliessen" +msgstr "Legende zeigen/schließen" #: ../Thuban/UI/mainwindow.py:1171 msgid "&Database Connections..." @@ -1266,7 +1266,7 @@ #: ../Thuban/UI/mainwindow.py:1217 msgid "Rename the map" -msgstr "Karte umbennen" +msgstr "Karte umbenennen" #: ../Thuban/UI/mainwindow.py:1218 msgid "&Add Layer..." @@ -1314,11 +1314,11 @@ #: ../Thuban/UI/mainwindow.py:1237 msgid "Re&name ..." -msgstr "&Umbennen..." +msgstr "&Umbenennen..." #: ../Thuban/UI/mainwindow.py:1238 msgid "Rename selected layer" -msgstr "Ausgewählte Ebene umbennen" +msgstr "Ausgewählte Ebene umbenennen" #: ../Thuban/UI/mainwindow.py:1240 msgid "&Raise" @@ -1418,15 +1418,15 @@ #: ../Thuban/UI/mainwindow.py:1299 msgid "&Close..." -msgstr "&Schliessen..." +msgstr "&Schließen..." #: ../Thuban/UI/mainwindow.py:1301 msgid "Close one or more tables from a list" -msgstr "Schliesse eine oder mehrere Tabellen von der Liste" +msgstr "Schließe eine oder mehrere Tabellen von der Liste" #: ../Thuban/UI/mainwindow.py:1304 msgid "Rename one or more tables" -msgstr "Umbennen von einer oder mehreren Tabellen" +msgstr "Umbenennen von einer oder mehreren Tabellen" #: ../Thuban/UI/mainwindow.py:1305 msgid "&Show..." From cvs at intevation.de Mon Aug 8 20:40:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 8 Aug 2005 20:40:01 +0200 (CEST) Subject: jan: thuban ChangeLog,1.826,1.827 Message-ID: <20050808184001.AF3081005CA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv3817 Modified Files: ChangeLog Log Message: Translation fix for german. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.826 retrieving revision 1.827 diff -u -d -r1.826 -r1.827 --- ChangeLog 27 Jul 2005 21:53:13 -0000 1.826 +++ ChangeLog 8 Aug 2005 18:39:59 -0000 1.827 @@ -1,3 +1,7 @@ +2005-08-08 Jan-Oliver Wagner + + * po/de.po: String fixes. This fixes Debian bug #313843. + 2005-07-27 Jan-Oliver Wagner Remove the attributes from the layer element in From cvs at intevation.de Thu Aug 11 23:29:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 11 Aug 2005 23:29:01 +0200 (CEST) Subject: jan: thuban/Extensions/export_shapefile - New directory Message-ID: <20050811212901.0F9B6101FA7@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/export_shapefile In directory doto:/tmp/cvs-serv10067/export_shapefile Log Message: Directory /thubanrepository/thuban/Extensions/export_shapefile added to the repository From cvs at intevation.de Thu Aug 11 23:32:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 11 Aug 2005 23:32:12 +0200 (CEST) Subject: jan: thuban/Extensions/export_shapefile export_shapefile.py, NONE, 1.1 Message-ID: <20050811213212.9187C101FA7@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/export_shapefile In directory doto:/tmp/cvs-serv10122 Added Files: export_shapefile.py Log Message: Exports a layer as a Shapefile. --- NEW FILE: export_shapefile.py --- # Copyright (C) 2005 by Intevation GmbH # Authors: # Jan-Oliver Wagner (2005) # # This program is free software under the GPL (>=v2) # Read the file COPYING coming with Thuban for details. """ Extend Thuban with a routine to export a layer as a Shapefile. """ __version__ = '$Revision: 1.1 $' # $Source: /thubanrepository/thuban/Extensions/export_shapefile/export_shapefile.py,v $ # $Id: export_shapefile.py,v 1.1 2005/08/11 21:32:10 jan Exp $ from wxPython.wx import wxFileDialog, wxOPEN, wxOVERWRITE_PROMPT, wxID_OK, \ wxProgressDialog from Thuban.Model.data import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \ SHAPETYPE_POINT from Thuban.Model.table import table_to_dbf from Thuban.UI.command import registry, Command from Thuban.UI.mainwindow import main_menu from Thuban import _ import shapelib def ExportLayerAsShapefile(context): """Request filename from user, and create the Shapefile(s) .shp, .dbf and .shx. context -- The Thuban context. """ # First, find the current layer layer = context.mainwindow.canvas.SelectedLayer() if layer is None: context.mainwindow.RunMessageBox(_('Export Shapefile'), _('No layer selected')) return # Second, get the basefilename for the shapefile. dlg = wxFileDialog(context.mainwindow, _('Export Shapefile'), '.', '', _('Shapefile Files (*.shp)|*.shp|'), wxOPEN|wxOVERWRITE_PROMPT) if dlg.ShowModal() == wxID_OK: filename = dlg.GetPath()[:-4] dlg.Destroy() else: return # Third, create the dbf file of the new Shapefile dbf_filename = filename + '.dbf' if hasattr(layer, "ShapeStore"): table = layer.ShapeStore().Table() table_to_dbf(table, dbf_filename) # Fourth, prepare the shp file of the new Shapefile shp_filename = filename + '.shp' shapetypes = { SHAPETYPE_POLYGON: shapelib.SHPT_POLYGON, SHAPETYPE_ARC: shapelib.SHPT_ARC, SHAPETYPE_POINT: shapelib.SHPT_POINT} shp = shapelib.create(shp_filename, shapetypes[layer.ShapeType()]) # Now go through all shapes and store them to the file dlg= wxProgressDialog(_("Export Shapefile"), _("Storing shapes ..."), layer.ShapeStore().NumShapes(), None) cnt = 0 step = int(layer.ShapeStore().NumShapes() / 100.0) if step == 0: step = 1 for s in layer.ShapeStore().AllShapes(): i = s.ShapeID() print s.Points() obj = shapelib.SHPObject(shapetypes[layer.ShapeType()], i, s.Points()) shp.write_object(i, obj) if cnt % step == 0: dlg.Update(cnt) cnt = cnt + 1 del shp dlg.Destroy() # register the new command registry.Add(Command('ExportShapefile', _('Export Layer as Shapefile ...'), ExportLayerAsShapefile, helptext = _('Export the active layer as a Shapefile'))) # find the experimental menu (create it anew if not found) experimental_menu = main_menu.FindOrInsertMenu("experimental", \ _("Experimenta&l")) # finally add the new entry to the extensions menu experimental_menu.InsertItem('ExportShapefile') From cvs at intevation.de Thu Aug 11 23:32:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 11 Aug 2005 23:32:56 +0200 (CEST) Subject: jan: thuban/Extensions/export_shapefile __init__.py,NONE,1.1 Message-ID: <20050811213256.B78CA101FC7@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/export_shapefile In directory doto:/tmp/cvs-serv10162 Added Files: __init__.py Log Message: Initialize the export_shapefile extension. --- NEW FILE: __init__.py --- # Copyright (c) 2005 by Intevation GmbH # Authors: # Jan-Oliver Wagner (2005) # # This program is free software under the GPL (>=v2) # Read the file COPYING coming with Thuban for details. # perform the registration of the extension from Thuban import _ from Thuban.UI.extensionregistry import ExtensionDesc, ext_registry def init(): """Initialize storeshape extension module.""" import export_shapefile return None ext_registry.add(ExtensionDesc( name = 'export_shapefile', version = '0.1.0', authors= [ 'Jan-Oliver Wagner' ], copyright = '2005 Intevation GmbH', desc = _("Exports the selected layer as a Shapefile."), init_callback = init)) From cvs at intevation.de Thu Aug 11 23:34:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 11 Aug 2005 23:34:24 +0200 (CEST) Subject: jan: thuban ChangeLog,1.827,1.828 Message-ID: <20050811213424.22493101FC7@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv10175 Modified Files: ChangeLog Log Message: Added an experimental extension for exporting layers as Shapefiles. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.827 retrieving revision 1.828 diff -u -d -r1.827 -r1.828 --- ChangeLog 8 Aug 2005 18:39:59 -0000 1.827 +++ ChangeLog 11 Aug 2005 21:34:22 -0000 1.828 @@ -1,3 +1,13 @@ +2005-08-11 Jan-Oliver Wagner + + * Extensions/export_shapefile: New. + + * Extensions/export_shapefile/__init__.py: New. Initialize + the export_shapefile extension. + + * Extensions/export_shapefile/export_shapefile.py: New. + Exports a layer as a Shapefile. + 2005-08-08 Jan-Oliver Wagner * po/de.po: String fixes. This fixes Debian bug #313843. From cvs at intevation.de Thu Aug 18 23:54:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 Aug 2005 23:54:27 +0200 (CEST) Subject: jan: thuban/Thuban/UI renderer.py,1.64,1.65 Message-ID: <20050818215427.46BC41006D4@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Thuban/UI In directory doto:/tmp/cvs-serv17387 Modified Files: renderer.py Log Message: (ScreenRenderer.draw_selection_incrementally): Call the right method for the default size. Index: renderer.py =================================================================== RCS file: /thubanrepository/thuban/Thuban/UI/renderer.py,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- renderer.py 30 Jun 2005 16:15:03 -0000 1.64 +++ renderer.py 18 Aug 2005 21:54:25 -0000 1.65 @@ -270,7 +270,7 @@ group = lc.FindGroup(value) size = group.GetProperties().GetSize() else: - size = lc.GetDefaultSize() + size = lc.GetDefaultGroup().GetProperties().GetSize() args = (pen, brush, size) if useraw: From cvs at intevation.de Thu Aug 18 23:55:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 Aug 2005 23:55:24 +0200 (CEST) Subject: jan: thuban ChangeLog,1.828,1.829 Message-ID: <20050818215524.0C0411006D4@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv17420 Modified Files: ChangeLog Log Message: Fix a rendering bug. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.828 retrieving revision 1.829 diff -u -d -r1.828 -r1.829 --- ChangeLog 11 Aug 2005 21:34:22 -0000 1.828 +++ ChangeLog 18 Aug 2005 21:55:21 -0000 1.829 @@ -1,3 +1,8 @@ +2005-08-18 Jan-Oliver Wagner + + * Thuban/UI/renderer.py (ScreenRenderer.draw_selection_incrementally): + Call the right method for the default size. + 2005-08-11 Jan-Oliver Wagner * Extensions/export_shapefile: New.