From thuban-bugs at intevation.de Thu Jun 9 09:51:16 2005 From: thuban-bugs at intevation.de (Request Tracker) Date: Thu, 9 Jun 2005 09:51:16 +0200 (CEST) Subject: [bug #3336] (thuban) Saving Thuban project file resulted in error below Message-ID: <20050609075116.927B8101F1A@lists.intevation.de> this bug's URL: http://intevation.de/rt/webrt?serial_num=3336 ------------------------------------------------------------------------- Subject: Saving Thuban project file resulted in error below Operating System: MacOS, 10.4.1 Thuban version: 1.0.1, -3 wxPython version: 2.5 Python version: 2.3.0 proj version: 4.4.8 Packaged THUBAN version from the GRASS for MAC OS X site, Enzo Moretti. Trying to save a thuban project file resulted in the following error. File was created but is empty. An unhandled exception occurred: Can't handle container (please report to http://thuban.intevation.org/bugtracker.html) Traceback (most recent call last): File "/Applications/Grass/Thuban 1.0.1/Thuban 1.0.1.app/Contents/Resources/Python/ site-packages/Thuban/UI/mainwindow.py", line 294, in invoke_command File "/Applications/Grass/Thuban 1.0.1.app/Contents/Resources/Python/site-packages/ Thuban/UI/command.py", line 121, in Execute File "/Applications/Grass/Thuban 1.0.1/Thuban 1.0.1.app/Contents/Resources/Python/ site-packages/Thuban/UI/mainwindow.py", line 1068, in call_method File "/Applications/Grass/Thuban 1.0.1/Thuban 1.0.1.app/Contents/Resources/Python/ site-packages/Thuban/UI/mainwindow.py", line 490, in SaveSessionAs File "/Applications/Grass/Thuban 1.0.1.app/Contents/Resources/Python/site-packages/ Thuban/UI/application.py", line 314, in SaveSession File "/Applications/Grass/Thuban 1.0.1.app/Contents/Resources/Python/site-packages/ Thuban/Model/save.py", line 393, in save_session File "/Applications/Grass/Thuban 1.0.1.app/Contents/Resources/Python/site-packages/ Thuban/Model/save.py", line 139, in write File "/Applications/Grass/Thuban 1.0.1.app/Contents/Resources/Python/site-packages/ Thuban/Model/save.py", line 168, in write_session File "/Applications/Grass/Thuban 1.0.1.app/Contents/Resources/Python/site-packages/ Thuban/Model/save.py", line 243, in write_data_containers ValueError: Can't handle container -------------------------------------------- Managed by Request Tracker From cvs at intevation.de Mon Jun 27 17:52:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 17:52:10 +0200 (CEST) Subject: jan: thuban/Doc/manual thuban-manual-de.xml,1.10,1.11 Message-ID: <20050627155210.DF09C1005B0@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Doc/manual In directory doto:/tmp/cvs-serv16547 Modified Files: thuban-manual-de.xml Log Message: More translations. Index: thuban-manual-de.xml =================================================================== RCS file: /thubanrepository/thuban/Doc/manual/thuban-manual-de.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- thuban-manual-de.xml 5 Apr 2005 21:55:15 -0000 1.10 +++ thuban-manual-de.xml 27 Jun 2005 15:52:08 -0000 1.11 @@ -1393,19 +1393,20 @@ vorliegen, so muss jeder Ebene die entsprechende Projektion zugeordnet sein. Ebenso muss eine Projektion für die Karte angegeben werden. - This can be the same as the layers or a different - projection in which case the layers are reprojected into that space. - The map projection can be set using + Dies kann die gleiche wie die der Ebenen sein oder eine + andere Projektion wobei dann die Ebenen entsprechend + umprojeziert werden. + Die Projektion der Karte wird über - Map - Projection - and the layer projection can be set using + Karte + Projektion + und die Projektionen für die Ebenen über - Layer - Projection - . + Ebene + Projektion + gesetzt.
- Projection Window + Projektionsauswahl-Fenster @@ -1413,67 +1414,80 @@
- Thuban is distributed with a sample collection of projections and the - set of coordinate systems as used by the EPSG - (European Petroleum Survey Group). This quite large set is only displayed - if activated by the according checkbox. The set falls into two parts: - deprecated lists all projections which are no longer part of the - EPSG data base. + Thuban kommt mit eine Beispiel-Sammlung von Projektionen sowie + dem von der EPSG (European Petroleum Survey Group) Satz. Dieser + recht umfangreiche Satz wird nur angezeigt wenn er durch das entsprechende + Wahlfeld eingeschaltet wurde. + Der Satz besteht aus zwei Gruppen, die Liste der veralteten Projektionen + enthält diejenigen Projektionen die eine EPSG Nummer haben aber + in der aktuellen EPSG Datenbank nicht mehr enthalten sind. - The - user can create new projections and make them available to all - future Thuban sessions. They may also be exported and imported so - that custom projections can be distributed. + Ein Benutzer kann neue Projektionen definieren und sie für zukünftige + Thuban Sitzungen zugängig machen. Sie können auch exportiert + und importiert werden, so dass spezielle Projektionen + leicht weitergegeben werden können. -
Selecting a Projection +
Eine Projektion auswählen - The available projections are listed on the left. If the layer - or map already has a projection it will initially be highlighted - and will end with (current). Selecting - <None> will cause Thuban to use the data as - it appears in the source file and will not use a projection. + Die verfügbaren Projektionen sind link aufgelistet. + Hat die Ebene oder Karte bereits eine Projektion, + so ist diese zunächst hervorgehoben und trägt den Hinweis + (aktuell). Wird + <Keine> ausgwählt, so wird Thuban die Daten + dirket verwenden wie sie in den Quellen vorkommen und keine + Umprojezierung vornehmen.
-
Editing a Projection +
Eine Projektion bearbeiten - Whenever a projection is selected from the list its properties - are displayed on the right. These properties can be changed - and the changes saved to the selected projection using - Update. Only a projection that comes - from a file can be updated, so if the current layer's projection - is selected, Update will be disabled. - Add to List adds the projection to the - list of available projections as a new entry, and thus makes it - available to future Thuban sessions. Clicking New - will create an entirely new, empty projection. The - Remove button will permanently remove a - projection from the list of available projections. + Immer wenn eine Projektion aus der Liste ausgwählt wird, dann + werden deren konkrete Eigenschaften rechts dargestellt. + Diese Eigenschaften können geändert werden und die Änderungen + in der Projektion über Aktualisieren + gespeichert werden. + Es können ausschliesslich Projektionen aktualisiert + werden, die aus einer Datei kommen. + Wenn also die Projektion der aktuellen Ebene angewählt ist, so + ist die Aktion Aktualisieren deaktiviert. + Hinzufügen zur Liste fügt die Projektion + an die Liste der verfügbaren Projektionen an und macht sie so + auch in zukünftigen Thuban Sitzungen verfügbar. + Mit Neu wird eine neue, leere Projektion + erzeugt. + Die Aktion Entfernen löscht eine + Projektion dauerhaft aus der Liste. - To apply the selected projection to the map the user can click - either Try or OK. - Try will not close the dialog box, allowing - the user to see how the projeciton changes the map. - Revert will undo the last projection applied - to the map. OK will commit the changes and - close the dialog. The user will be unable to undo the changes. - Close simply closes the dialog box. If no - selection has been applied with Try the - selection will not be applied to the map. + Um eine Projektion auf die Karte anzuwenden kann man + Anwenden oder OK + benutzen. + Anwenden schliesst den Dialog nicht + und erlaubt es so, die Änderung auf der Karte zunächst zu begutachten. + Zurücksetzen macht die zuletzt gemachte + Änderung wieder rückgängig. + OK aktiviert die gemachten Änderung und + schliesst den Dialog.Danach kann man diese Änderung nicht mehr + rückgängig machen. + Schliessen beendet den Dialog. + Wurde bis dahin keine Projektion mit + Anwenden ausprobiert, so wird sie auch + nicht auf die Karte übertragen.
-
Importing/Exporting Projections +
Projektionen Importieren/Exportieren - The projections that appear in the list of available projections - can be exported to another file that the user chooses. By selecting - one or more projections and clicking Export - the user will be able to select a file in which to store those - projections. - The file can then be distributed to other Thuban users. To import - a projection file the user can click Import. - The imported projections are added to the list and are then available - to the current session and any future Thuban sessions. + Projektionen die in der Liste verfügbaren Projektionen auftauchen + können in eine Datei exportiert werden. + Nach der Auswahl einer oder mehrerer Projektionen wird nach betätigen von + Export ein entsprechender + Dateiauswahldialog gestartet. + Die Datei kann dann z.B. an andere Thuban-Anwender weitergegeben + werden. + Um eine solche Datei zu importieren verwendet man die Aktion + Import. + Die importierten Projektionen werden zur Liste verfügbarer + Projektionen zur sofortigen oder späteren Verwendung hinzugefügt.
@@ -1687,203 +1701,232 @@
Verbinde Tabelle - Unlike the join described above, the join does not result in a - new table. The attribute table of the currently active layer is the - left table and other tables are joined to this table. The results of - the join are available for classification. + Anders als beim Verbinden wie oben beschrieben + erzeugt dieses Verbinden keine neue Tabelle. + Die Attributtabelle der aktiven Ebene stelllt die linke + Tabelle. Die anderen Tabellen werden an diese angebunden. + Das Ergebnis dieser Verbindung steht z.B. für Klassifizierungen + zur Verfügung. - As a consequence, the join cannot result in fewer - records than the source attribute table. The user is warned if the - right table does not fulfill this constraint. An outer join must be - used in such cases. + Daraus folgt auch, dass die Verbindung niemals weniger + Einträge haben als die ursprüngliche Attributtabelle. + Der Benutzer wird gewarnt, falls die recht Tabelle dies + nicht erfüllen kann. In so einem Fall muss eine + äussere Verbindung durchgeführt werden.
-
Unjoin Table +
Tabellen-Verbindung lösen - As said above, a normal table cannot be closed while it is still - used in a join. While the joined table resulting from a join of - normal tables can be simply closed (and thereby dereferencing - the source tables), this is not possible for attribute tables. + Wie schon erwähnt kann eine Tabelle nicht geschlossen + werden wenn sie noch bei einer Verbindung verwendet wird. + Tabellen die neu aus der Verbindung zweier normaler Tabellen + entstanden sind, können ohne weiteres gelöst werden. + Dies gilt jedoch nicht für Attributtabellen. - Hence joins on attribute tables must be solved explicitly. This is - what the + Also müssen Attributtabellen explizit gelöst werden. + Dazu wird das Kommando - Layer - Unjoin Table + Ebene + Verbindungen lösen - item is used for: The last join for the currently - active layer is solved. + verwendet: Die jeweils zuletzt gemachte Verbindung wird + gelöst.
- Extensions + Erweiterungen - Thuban is designed to be extensible. The term Extension is used as a - general term for anything that extends Thuban. - This chapter introduces into some oppportunities how to add and - handle extra functionality developed by your own or third parties. + Thuban ist so konstruiert, dass es leicht + erwiterbar ist. Der Begriff Erweiterungen wird + als allgemeine Bezeichnung für alles verwendet, was Thuban + erweitert. + Diese Kapitel gibt eine Einführung in verschiedene Möglichkeiten + weitere Funktionalität zu Thuban hinzuzufügen, entweder + eigene Entwicklungen oder die von Dritten. -
Add personal extensions via thubanstart.py +
Eigene Erweiterungen über thubanstart.py - After Thuban has been started for the first time, a directory - .thuban is created within your home directory. - There you can add a file thubanstart.py which will be imported - by Thuban at start-up. It is recommended to add only import-statements - to this file to keep the actual code of extensions separate. + iNachdem Thuban zum ersten mal gestartet wurde, wird + ein Verzeichnis .thuban im Heimatverzeichnis des + Benutzers erzeugt. + Dort kann die Datei thubanstart.py angelegt werden, + die dann beim Start von Thuban importiert wird. + Es ist empfehlenswert ausschliesslich import-Kommandos + in dieser Datei aufzunehmen und den eigentlichen + Programmcode separat zu halten. - The modules to import must either be found through the environment - variable PYTHONPATH or directly be placed into the .thuban-directory. + Die Module die importiert werden müssen entweder + über die Pfade in Umgebungsvariablen + PYTHONPATH gefunden werden oder direkt + im .thuban-Verzeichnis abgelegt sein. - As an example, copy the file examples/simple_extensions/hello_world.py - of the Thuban source code into the .thuban-directory of your home - directory. Now add add the statement import hello_world to the - file thubanstart.py and run Thuban. You will notice an additional - menu Extensions where - the new item for the Hello-World extension is placed - select it - to see the Hello-World message. + Als Beispiel kann man die Datei + examples/simple_extensions/hello_world.py + aus dem Thuban Quelltext in das persönliche .thuban-Verzeichnis + kopieren. + Nun kann das Kommando import hello_world in die Datei + thubanstart.py aufgenommen werden. Nach dem Start von Thuban + wird man dann ein zusätzliches Menü + Extensions vorfinden + in dem der Unterpunkt für die Hello-World Erweiterung + zu sehen ist. Wählt man diesen Punkt aus, so + wird die bekannte Hello-World Mitteilung ausgegeben.
-
Extensions included in Thuban package +
Im Thuban-Paket enthaltene Erweiterungen - The extensions described in this section are part of the - Thuban package, but not activated by default. - You will find them in the Thuban installation directory - under Extensions/. Activate them as personal - extensions via PYTHONPATH as described in the previous section. - Stable extensions will appear under the menu - Extensions and - extensions which are in experimental state and therefore - not fully functional under + Die hier beschriebenen Erweiterungen sind Teil des Thuban-Paketes, + aber nicht automatisch aktiviert. + Sie befinden sich im Thuban Installations-Verzeichnis unter + Extensions/. Man aktiviert sie über + PYTHONPATH und import wie im obigen Abschnitt erklärt. + Stabile Erweiterungen tauchen unter dem Menü + Extensions auf + und solche die sich noch im experimentellen Stadium + befinden und daher unter Umständen nicht komplett + funktional unter Experimental. -
Stable extensions - - These extensions provide extra-functionality to Thuban - that has not (yet) been integrated in the main application. - They are considered to be free of bugs, but may be - further polished with helpful user interactions. - -
gns2shp - - This tool converts data of the Geospatial Names Server - (GNS, see ) - into Shapefile format. - The above web-site offer to download named places - information grouped by countries for all of the world - except USA for which other data are provided. - - - If you download and unpack a package, you will have - a text-file with suffix .txt. - Selecting such a file via gns2shp will create the - corresponding Shapefile with the same basename and - place it in the same direcory. Afterwards it - is automatically loaded into Thuban. - The Shapefile will not automatically be delete afterwards. - - - The gns2shp.py module can also be executed on the - command line for batch processing purposes. - - - A sample (ls.txt for Liechtenstein) - is included in the directory - Extensions/gns2shp/test. - -
-
SVG Export - - Map and legend can be exported separately in the - Thuban-Map-SVG format. - You get files that comply with - the Scalable Vector Graphics (SVG) 1.1 Specification - and can be read by many vector drawing applications. - - - Goal of svgexport is to provide - the start of a printing pipeline for Thuban. - For this purpose the written Thuban-Map-SVG files - contain information that can be used in postprocessing. - Typically a general vector drawing application is - more powerful then a geographic information viewer; - e.g. having much fancier symbols and fonts. - Also users benefit much more when learning to use a - more general application they can also use for other - tasks. So the charming idea is to enable - the drawing application to postprocess a Thuban maps. - So thee xtra information in the format will make it - possible to export from Thuban and if a few geoobjects - change, and keep the general layout and style - of the full map in the vector drawing appplication. - - - Markus Rechtien has developed a prototype of this - printing pipline as his Diplom thetis, showing - the feasability of Bernhard Reiter's concept. - Scripts exist for the drawing application Skencil - (). - - - Technical notes: the names of the layers are used - as base for ids within the SVG format. - If you try to export with two layers having - the same name, you will get a name clash error. - Just change one of the layer names and try again. - -
-
-
Experimental extensions - - All all of these functions have to be handled with care, - since they are neither complete nor well tested. - They are to be seen as a proof-of-concept and may - additionally in some cases of practical help. - - - Any interest on further improvement of these extensions - should be communicated towards the developer and user - community. - +
Stabile Erweiterungen + + Diese Erweiterungen bieten zusätzliche Funktionalität + für Thuban die nicht in Kernanwendung integriert + ist. Es wird angenommen, dass keine bedeutenden + Fehler mehr enthalten sind. + +
gns2shp + + Dieses Werkzeug konvertiert Daten des + Geospatial Names Server + (GNS, siehe ) + in das Shapefile-Format. + Die GNS Webseite bietet den Download die Informationen zu + benannten Orten nach Ländern gruppiert für alle Länder an. + Einzige Ausnahme sind die USA für welche die Daten in anderer + Form angeboten werden. + + + Wenn man einen Datensatz herunterlädt und auspackt so erhält + man eine Textdatei mit dem Anhang .txt. + Wählt man eine solche Textdatei via gns2shp aus, so + wird ein Shapefile mit dem selben Basisnamen + erzeugt und im gleichen Verzeichnis abgelegt. + Danach wird es automatisch in Thuban eingeladen. + Die Shapefile Dateien werden nicht automatisch + wieder gelöscht. + + + Das Modul gns2shp.py kann auch auf der Kommandozeile + verwendet werden, z.B. für Stapelverarbeitung. + + + Ein Beispiel (ls.txt für Liechtenstein) + befindet sich im Verzeichnis + Extensions/gns2shp/test. + +
-
importAPR - - This command offer to load an ESRI® ArcView® project - file (suffix .apr) and convert it for use within Thuban. - After selecting a apr-file to load, a list - will be presented that offers to select one of the views - of the apr-file, provided there is more than one. - Furthermore, the Session Info-Tree is extended with - a complete representation of the parsed apr-file. - - - The legend of Thuban does not yet cover all of the elements as - supported by the legend of ArcView®. Therefore, the Thuban - map will look different. Furthermore, the apr-format is - a proprietary format, not openly documented. - Therefore, the interpretation is - partly based on reverse engeneering and good guessing. - - - The file-paths within the apr-file may not fit and potentially - are subject to fix in the apr-file. You can do this - applying any text editor. The paths are either absolute - or relative from where Thuban has been started. - - - A sample for the Iceland data is included as - Extensions/importAPR/samples/iceland.apr. - The file-paths are relative from the Thuban main directory. - -
-
+
SVG Export + + Karte und Legende können separat in das Thuban-SVG-Format exportiert + werden.Die erzeugten Dateien entsprechen der + Scalable Vector Graphics (SVG) 1.1 Specification + und können von den meisten Vektorzeichenprogrammen gelesen + werden. + + + Ziel des SVG-Export ist es, den Beginn einer + Druck-Kette für Thuban-Karten anzubieten. + Für diesen Zweck enthalten die erzeugten Thuban-Karten-SVG Dateien + zusätzliche Informationen welche in einer Nachbearbeitung + verwendet werden können. + Typischerweise ist ein Vektorzeichenprogramm wesentlich + mächtiger bei der grafischen Ausgestaltung als eine + Geodaten-Betrachter; z.B. stehen viel mehr Symbole + und Fonts zur Verfügung. + Auch unterstützt dies den Anwender darin, aufgabenorientierte + Komponenten jweils sinnvoll auszunutzen. + Die Idee ist also, das Zeichenprogramm für die Druckvorbreitung + zu verwenden und nicht das GIS. Die zusätzlichen Informationen + die im Export-Format gespeichert werden ermöglichen es, + dass wenn sich nur einzelne Geo-Objekte ändern + das Layout und die Stile für die ganze Karte im Zeichenprogramm + beizubehalten. + + + Markus Rechtien hat den Prototyp dieser + Druckkette im Rahmen einer Diplomarbeit + entwickelt und validierte damit ein + Konzept von Bernhard Reiter. + Skripte für entsprechende Weiterverarbeitung + existieren für die Zeichenanwendung Skencil + (). + + + Technische Hinweise: die Namen der Ebenen werden + als Basis für IDs im SVG-Format verwendet. + Wenn man versucht, zwei Ebenen mit gleichem Namen + zu exportieren, dann tritt entsprechend ein Fehler auf. + Ändern Sie einfach den Namen einer Ebene und versuchen + Sie es erneut. + +
+
+ +
Experimentelle Erweiterungen + + Die hier beschriebenen Funktionen sollten mit Vorsicht + verwendet werden, da sie nicht vollständig und/oder nicht + ausreichend getestet sind. + Trotzdem können sie in der Praxis schon recht hilfreich sein. + + + Interesse, diese Erweiterungen zu verbessern sollte + auch der Entwickler- und Benutzergemeinschaft + mitgeteilt werden. + + +
importAPR + + Dieses Kommando gestattet es, eine ESRI® ArcView® Projectdatei + zu laden (endet auf .apr) und für weitere Nutzung in Thuban + zu konvertieren. + Nach Auswahl der zu ladenden apr-Datei erscheint eine + Auswahlliste mit den enthaltenen Ansichten, falls mehr als + eine existiert. + Desweiteren wird der Session Infobaum um eine Repräsentation + der kompletten apr-Datei erweitert. + + + Die Legende von Thuban deckt nicht alle Elemente die von + ArcView® unterstützt werden ab. + Daher wird die Karte in Thuban anders aussehen. + Zudem ist das apr-Format proprietär und nicht offen dokumentiert. + Das bedeutet, dass die Interpretation auf + Reverse Engeneering und intelligentem Raten basiert. + + + Die Dateipfade innherhalb der apr-Datei passen unter + Umständen nicht und müssen ggf. manuell in der apr-Datei + mit einem Texteditor angepasst werden. + Die Pfade m:The paths are either absolute + or relative from where Thuban has been started. + + + A sample for the Iceland data is included as + Extensions/importAPR/samples/iceland.apr. + The file-paths are relative from the Thuban main directory. + +
+
Writing simple extensions From cvs at intevation.de Mon Jun 27 17:52:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 17:52:46 +0200 (CEST) Subject: jan: thuban ChangeLog,1.813,1.814 Message-ID: <20050627155246.DB91B1006DD@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv16578 Modified Files: ChangeLog Log Message: More translations for german manual. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.813 retrieving revision 1.814 diff -u -d -r1.813 -r1.814 --- ChangeLog 12 May 2005 14:54:50 -0000 1.813 +++ ChangeLog 27 Jun 2005 15:52:44 -0000 1.814 @@ -1,3 +1,7 @@ +2005-06-27 Jan-Oliver Wagner + + * Doc/manual/thuban-manual-de.xml: More translations. + 2005-05-12 Jonathan Coles * Thuban/UI/projdialog.py: Add missing import, which led to an From jan at intevation.de Mon Jun 27 18:26:59 2005 From: jan at intevation.de (Jan-Oliver Wagner) Date: Mon, 27 Jun 2005 18:26:59 +0200 Subject: Remove symbol properties from layer element in .thuban files Message-ID: <20050627162659.GA22761@intevation.de> Hi, I have come to the conclusion that it makes sense to remove symbol properties from layer element in .thuban files: (these are used for the default values) Actually, it seems to be better to have always a classification for a layer and then have a clnull element describing the defaults. Else the situation is a bit redundant. Also, the more complex the description of a symbol becomes the more the layer element is overloaded. The introduction of the size element showed this. Using always a classification would also fix the bug that labels for default (if there is only just a default and no classification) are not stored in the .thuban file. Opinions? Jan -- Jan-Oliver Wagner http://intevation.de/~jan/ Intevation GmbH http://intevation.de/ Kolab Konsortium http://kolab-konsortium.de/ FreeGIS http://freegis.org/ From cvs at intevation.de Mon Jun 27 23:36:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 23:36:36 +0200 (CEST) Subject: jan: thuban/Extensions/importAPR apr.py,1.4,1.5 Message-ID: <20050627213636.237511006DA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/importAPR In directory doto:/tmp/cvs-serv29012 Modified Files: apr.py Log Message: (APR_BShSym): Extend by 'Stripple'. APR_TClr.GetThubanColor): Fix bug in color interpretation. Thanks to Frank Koormann who identified this problem. Index: apr.py =================================================================== RCS file: /thubanrepository/thuban/Extensions/importAPR/apr.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- apr.py 3 Oct 2004 22:00:35 -0000 1.4 +++ apr.py 27 Jun 2005 21:36:34 -0000 1.5 @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004 by Intevation GmbH +# Copyright (C) 2003-2005 by Intevation GmbH # Authors: # Jan-Oliver Wagner # @@ -87,19 +87,23 @@ return prop class APR_BShSym(ODBBaseObject): - """Polygon symbol object. + """Polygon symbol object, either filled with a single color or + with a pattern. + . Always references TClr objects via 'Color', 'OutlineColor' and 'BgColor'. Always has attributes 'OutlineWidth' and 'Outline'. OutlineColor is interpreted to be the Thuban line color, OutlineWidth as the Thuban line width. 'Color' is interpreted to be the Thuban fill color. - 'BgColor' is not interpreted and it is not clear what this color - defines. + 'BgColor' is not interpreted and probably has something to do with + patterns (Stripple). + 'Stripple' ist not interpreted in Thuban. It is a pattern definition + based on a bitpattern. Thuban has no Patterns yet. It is unclear what 'Outline' defines and thus is not used for Tuban. """ - _obj_refs = [ 'Color', 'OutlineColor', 'BgColor' ] + _obj_refs = [ 'Color', 'OutlineColor', 'BgColor', 'Stripple' ] _values = [ 'OutlineWidth', 'Outline' ] def GetThubanProp(self): @@ -202,8 +206,14 @@ for color in [ 'Red', 'Green', 'Blue' ]: if hasattr(self, color): s = getattr(self, color) - while len(s) < 6: - s = s + '0' + # It seems that ArcView sometimes uses only + # 2 bytes for a color definition, eg. 0xff. + # It is assumed that this is the same as + # 0x00ff (and not the same as 0xff00). At + # least color comparison shows this. + # Thus we do not need to append "00" if length + # of s is < 6. The following conversion does is + # right even for the short strings. rgb[color] = int(s, 16)/float(int('0xffff', 16)) return Color(rgb['Red'], rgb['Green'], rgb['Blue']) elif hasattr(self, 'Name'): From cvs at intevation.de Mon Jun 27 23:37:41 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 23:37:41 +0200 (CEST) Subject: jan: thuban/Extensions/importAPR importAPR.py,1.7,1.8 Message-ID: <20050627213741.34DC31006DA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/importAPR In directory doto:/tmp/cvs-serv29049 Modified Files: importAPR.py Log Message: (APR_VShSym): New. Just another symbol identified. Index: importAPR.py =================================================================== RCS file: /thubanrepository/thuban/Extensions/importAPR/importAPR.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- importAPR.py 20 Nov 2004 12:55:01 -0000 1.7 +++ importAPR.py 27 Jun 2005 21:37:39 -0000 1.8 @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004 by Intevation GmbH +# Copyright (C) 2003-2005 by Intevation GmbH # Authors: # Jan-Oliver Wagner (2003, 2004) # @@ -46,6 +46,13 @@ """ _obj_refs = [ 'FieldNames', 'Symbols', 'Class', 'NullSym', 'NullValues', 'StatValues' ] + +class APR_VShSym(ODBBaseObject): + """Pattern Object(Symbol). + """ + _obj_refs = [ 'Color', 'OutlineColor', 'BgColor' ] + _values = [ 'Outline', 'Outlinewidth', 'Angle', 'YSeparation', + 'PenSize' ] class APR_Project(ODBBaseObject): _obj_refs = [ 'Doc' ] From cvs at intevation.de Mon Jun 27 23:38:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 23:38:37 +0200 (CEST) Subject: jan: thuban ChangeLog,1.814,1.815 Message-ID: <20050627213837.C8E6A1006DA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv29161 Modified Files: ChangeLog Log Message: Fixes in importAPR extension. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.814 retrieving revision 1.815 diff -u -d -r1.814 -r1.815 --- ChangeLog 27 Jun 2005 15:52:44 -0000 1.814 +++ ChangeLog 27 Jun 2005 21:38:35 -0000 1.815 @@ -1,3 +1,12 @@ +2005-06-28 Jan-Oliver Wagner + + * Extensions/importAPR/apr.py (APR_BShSym): Extend by 'Stripple'. + (APR_TClr.GetThubanColor): Fix bug in color interpretation. + Thanks to Frank Koormann who identified this problem. + + * Extensions/importAPR/importAPR.py (APR_VShSym): New. Just + another symbol identified. + 2005-06-27 Jan-Oliver Wagner * Doc/manual/thuban-manual-de.xml: More translations. From cvs at intevation.de Mon Jun 27 23:56:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 23:56:32 +0200 (CEST) Subject: jan: thuban/Extensions/importAPR apr.py,1.3,1.3.2.1 Message-ID: <20050627215632.BAF791005AA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/importAPR In directory doto:/tmp/cvs-serv30411 Modified Files: Tag: thuban-1-0-branch apr.py Log Message: (APR_BShSym): Extend by 'Stripple'. (APR_TClr.GetThubanColor): Fix bug in color interpretation. Thanks to Frank Koormann who identified this problem. Index: apr.py =================================================================== RCS file: /thubanrepository/thuban/Extensions/importAPR/apr.py,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- apr.py 30 Oct 2003 09:14:52 -0000 1.3 +++ apr.py 27 Jun 2005 21:56:30 -0000 1.3.2.1 @@ -88,19 +88,22 @@ return prop class APR_BShSym(ODBBaseObject): - """Polygon symbol object. + """Polygon symbol object, either filled with a single color or + with a pattern. Always references TClr objects via 'Color', 'OutlineColor' and 'BgColor'. Always has attributes 'OutlineWidth' and 'Outline'. OutlineColor is interpreted to be the Thuban line color, OutlineWidth as the Thuban line width. 'Color' is interpreted to be the Thuban fill color. - 'BgColor' is not interpreted and it is not clear what this color - defines. + 'BgColor' is not interpreted and probably has something to do with + patterns (Stripple). + 'Stripple' ist not interpreted in Thuban. It is a pattern definition + based on a bitpattern. Thuban has no Patterns yet. It is unclear what 'Outline' defines and thus is not used for Tuban. """ - _obj_refs = [ 'Color', 'OutlineColor', 'BgColor' ] + _obj_refs = [ 'Color', 'OutlineColor', 'BgColor', 'Stripple' ] _values = [ 'OutlineWidth', 'Outline' ] def GetThubanProp(self): @@ -203,8 +206,14 @@ for color in [ 'Red', 'Green', 'Blue' ]: if hasattr(self, color): s = getattr(self, color) - while len(s) < 6: - s = s + '0' + # It seems that ArcView sometimes uses only + # 2 bytes for a color definition, eg. 0xff. + # It is assumed that this is the same as + # 0x00ff (and not the same as 0xff00). At + # least color comparison shows this. + # Thus we do not need to append "00" if length + # of s is < 6. The following conversion does is + # right even for the short strings. rgb[color] = int(s, 16)/float(int('0xffff', 16)) return Color(rgb['Red'], rgb['Green'], rgb['Blue']) elif hasattr(self, 'Name'): From cvs at intevation.de Mon Jun 27 23:57:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 23:57:39 +0200 (CEST) Subject: jan: thuban/Extensions/importAPR importAPR.py,1.3,1.3.2.1 Message-ID: <20050627215739.905C31005AA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Extensions/importAPR In directory doto:/tmp/cvs-serv30444 Modified Files: Tag: thuban-1-0-branch importAPR.py Log Message: (APR_VShSym): New. Just another symbol identified. Index: importAPR.py =================================================================== RCS file: /thubanrepository/thuban/Extensions/importAPR/importAPR.py,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- importAPR.py 30 Oct 2003 09:16:46 -0000 1.3 +++ importAPR.py 27 Jun 2005 21:57:37 -0000 1.3.2.1 @@ -1,4 +1,4 @@ -# Copyright (C) 2003 by Intevation GmbH +# Copyright (C) 2003, 2005 by Intevation GmbH # Authors: # Jan-Oliver Wagner # @@ -44,6 +44,13 @@ """ _obj_refs = [ 'FieldNames', 'Symbols', 'Class', 'NullSym', 'NullValues', 'StatValues' ] + +class APR_VShSym(ODBBaseObject): + """Pattern Object(Symbol). + """ + _obj_refs = [ 'Color', 'OutlineColor', 'BgColor' ] + _values = [ 'Outline', 'Outlinewidth', 'Angle', 'YSeparation', + 'PenSize' ] class APR_Project(ODBBaseObject): _obj_refs = [ 'Doc' ] From cvs at intevation.de Mon Jun 27 23:58:13 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 27 Jun 2005 23:58:13 +0200 (CEST) Subject: jan: thuban ChangeLog,1.624.2.40,1.624.2.41 Message-ID: <20050627215813.A8DBE1005AA@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv30476 Modified Files: Tag: thuban-1-0-branch ChangeLog Log Message: backport from head Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.624.2.40 retrieving revision 1.624.2.41 diff -u -d -r1.624.2.40 -r1.624.2.41 --- ChangeLog 5 Apr 2005 21:25:26 -0000 1.624.2.40 +++ ChangeLog 27 Jun 2005 21:58:11 -0000 1.624.2.41 @@ -1,3 +1,14 @@ +2005-06-28 Jan-Oliver Wagner + + Backport from HEAD. + + * Extensions/importAPR/ apr.py (APR_BShSym): Extend by 'Stripple'. + APR_TClr.GetThubanColor): Fix bug in color interpretation. + Thanks to Frank Koormann who identified this problem. + + * Extensions/importAPR/importAPR.py (APR_VShSym): New. Just + another symbol identified. + 2005-04-05 Jan-Oliver Wagner Backport from HEAD. From cvs at intevation.de Tue Jun 28 08:48:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 28 Jun 2005 08:48:47 +0200 (CEST) Subject: jan: thuban/Thuban/UI renderer.py,1.62,1.63 Message-ID: <20050628064847.A9155101EE7@lists.intevation.de> Author: jan Update of /thubanrepository/thuban/Thuban/UI In directory doto:/tmp/cvs-serv20035 Modified Files: renderer.py Log Message: (ScreenRenderer.draw_selection_incrementally): Use the default size for rendering selected items of default type. Fixes part 2 of https://intevation.de/rt/webrt?serial_num=3149 Index: renderer.py =================================================================== RCS file: /thubanrepository/thuban/Thuban/UI/renderer.py,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- renderer.py 6 May 2005 14:18:31 -0000 1.62 +++ renderer.py 28 Jun 2005 06:48:45 -0000 1.63 @@ -1,9 +1,9 @@ -# Copyright (c) 2001-2004 by Intevation GmbH +# Copyright (c) 2001-2005 by Intevation GmbH # Authors: # Bernhard Herzog (2001-2003) # Jonathan Coles (2003) # Frank Koormann (2003) -# Jan-Oliver Wagner (2003, 2004) +# Jan-Oliver Wagner (2003-2005) # # This program is free software under the GPL (>=v2) # Read the file COPYING coming with Thuban for details. @@ -264,10 +264,13 @@ # Get the size of the specific property for this # point - if shapetype == SHAPETYPE_POINT and field is not None: - value = table.ReadValue(shape.ShapeID(), field) - group = lc.FindGroup(value) - size = group.GetProperties().GetSize() + if shapetype == SHAPETYPE_POINT: + if field is not None: + value = table.ReadValue(shape.ShapeID(), field) + group = lc.FindGroup(value) + size = group.GetProperties().GetSize() + else: + size = lc.GetDefaultSize() args = (pen, brush, size) if useraw: From cvs at intevation.de Tue Jun 28 08:50:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 28 Jun 2005 08:50:01 +0200 (CEST) Subject: jan: thuban ChangeLog,1.815,1.816 Message-ID: <20050628065001.C0121101EE7@lists.intevation.de> Author: jan Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv20079 Modified Files: ChangeLog Log Message: fix part 2 of RT#3149 Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.815 retrieving revision 1.816 diff -u -d -r1.815 -r1.816 --- ChangeLog 27 Jun 2005 21:38:35 -0000 1.815 +++ ChangeLog 28 Jun 2005 06:49:59 -0000 1.816 @@ -1,5 +1,11 @@ 2005-06-28 Jan-Oliver Wagner + * Thuban/UI/renderer.py (ScreenRenderer.draw_selection_incrementally): + Use the default size for rendering selected items of default type. + Fixes part 2 of https://intevation.de/rt/webrt?serial_num=3149 + +2005-06-28 Jan-Oliver Wagner + * Extensions/importAPR/apr.py (APR_BShSym): Extend by 'Stripple'. (APR_TClr.GetThubanColor): Fix bug in color interpretation. Thanks to Frank Koormann who identified this problem. From thubandevel at mendez.org.uk Wed Jun 29 12:19:07 2005 From: thubandevel at mendez.org.uk (George) Date: Wed, 29 Jun 2005 11:19:07 +0100 Subject: PyShapeLib and Boolean Fields Message-ID: <42C2759B.8040306@mendez.org.uk> Apologies if this isn't the right place for this question but the pyshapelib manual does mention the Thuban mailing lists as a point of contact. I've been using pyshapelib for a while now and had no problems but now I'm getting an invalid type error when I tried to load a DBF. I think that this is because the shape file contains boolean fields and I've found... http://xserve.flids.com/pipermail/gdal-dev/2003-June/003694.html which seems to suggest that the boolean type was added relatively late to shapelib & dbflib.py doesn't have it listed as one of the types at the bottom so I'm guessing this might be to blame? If so does anyone have a version where support for the boolean field type has been added? I should add that I'm using the "packaged for windows" version, but that I've had a look at the original source version and that appears not to have it in either. George From jan at intevation.de Wed Jun 29 23:53:45 2005 From: jan at intevation.de (Jan-Oliver Wagner) Date: Wed, 29 Jun 2005 23:53:45 +0200 Subject: Remove symbol properties from layer element in .thuban files In-Reply-To: <20050627162659.GA22761@intevation.de> References: <20050627162659.GA22761@intevation.de> Message-ID: <20050629215345.GD31586@intevation.de> On Mon, Jun 27, 2005 at 06:26:59PM +0200, Jan-Oliver Wagner wrote: > I have come to the conclusion that it makes sense > to remove symbol properties from layer element in .thuban files: > (these are used for the default values) > > Actually, it seems to be better to have always a > classification for a layer and then have > a clnull element describing the defaults. > Else the situation is a bit redundant. Also, the more > complex the description of a symbol becomes the more > the layer element is overloaded. The introduction of the > size element showed this. > > Using always a classification would also fix the bug > that labels for default (if there is only just a default > and no classification) are not stored in the .thuban > file. > > Opinions? Apparently not. So I will prepare a patch that removes the default symbol attributes from layer element in .thuban files ... Best Jan -- Jan-Oliver Wagner http://intevation.de/~jan/ Intevation GmbH http://intevation.de/ Kolab Konsortium http://kolab-konsortium.de/ FreeGIS http://freegis.org/ From cvs at intevation.de Thu Jun 30 16:20:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 30 Jun 2005 16:20:48 +0200 (CEST) Subject: bh: thuban/libraries/pyshapelib shapelib_wrap.c, 1.1, 1.2 shapelib.i, 1.1, 1.2 pytest.py, 1.1, 1.2 ChangeLog, 1.8, 1.9 Message-ID: <20050630142048.96D23101EE7@lists.intevation.de> Author: bh Update of /thubanrepository/thuban/libraries/pyshapelib In directory doto:/tmp/cvs-serv7211/libraries/pyshapelib Modified Files: shapelib_wrap.c shapelib.i pytest.py ChangeLog Log Message: * shapelib.i (new_SHPObject): Fix the test for the length of the part types. It used the wrong variable. * shapelib_wrap.c: Regenerated from shapelib.i * pytest.py (make_shapefile): Add some more comments and add an example with a polygon with a hole. Index: shapelib_wrap.c =================================================================== RCS file: /thubanrepository/thuban/libraries/pyshapelib/shapelib_wrap.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- shapelib_wrap.c 19 Aug 2003 21:24:20 -0000 1.1 +++ shapelib_wrap.c 30 Jun 2005 14:20:46 -0000 1.2 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3u-20020503-1857 (Alpha 5) + * Version 1.3u-20050630-1524 (Alpha 5) * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -669,7 +669,7 @@ /* parts and part_types have to have the same lengths */ if (part_type_list - && PySequence_Length(part) != PySequence_Length(part_type_list)) + && PySequence_Length(parts) != PySequence_Length(part_type_list)) { PyErr_SetString(PyExc_TypeError, "parts and part_types have to have the same lengths"); Index: shapelib.i =================================================================== RCS file: /thubanrepository/thuban/libraries/pyshapelib/shapelib.i,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- shapelib.i 19 Aug 2003 21:24:20 -0000 1.1 +++ shapelib.i 30 Jun 2005 14:20:46 -0000 1.2 @@ -192,7 +192,7 @@ /* parts and part_types have to have the same lengths */ if (part_type_list - && PySequence_Length(part) != PySequence_Length(part_type_list)) + && PySequence_Length(parts) != PySequence_Length(part_type_list)) { PyErr_SetString(PyExc_TypeError, "parts and part_types have to have the same lengths"); Index: pytest.py =================================================================== RCS file: /thubanrepository/thuban/libraries/pyshapelib/pytest.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pytest.py 19 Aug 2003 21:24:20 -0000 1.1 +++ pytest.py 30 Jun 2005 14:20:46 -0000 1.2 @@ -5,13 +5,37 @@ # def make_shapefile(filename): + # Create a shapefile with polygons + outfile = shapelib.create(filename, shapelib.SHPT_POLYGON) + + # Create one very simple polygon and write it to the shapefile. The + # vertices should be given in clockwise order to comply with the + # shapefile specification. obj = shapelib.SHPObject(shapelib.SHPT_POLYGON, 1, - [[(10, 10), (20, 10), (20, 20), (10, 10)]]) + [[(10, 10), (10, 20), (20, 20), (10, 10)]]) print obj.extents() print obj.vertices() - outfile = shapelib.create(filename, shapelib.SHPT_POLYGON) outfile.write_object(-1, obj) - del outfile + + # Create a polygon with a hole. Note that according to the + # shapefile specification, the vertices of the outer ring have to be + # in clockwise order and the inner rings have to be in counter + # clockwise order. + # + # There's an optional fourth parameter which when given must be a + # list of part types, one for each part of the shape. For polygons, + # the part type is always shapelib.SHPP_RING, though. The part + # types are only relevant for SHPT_MULTIPATCH shapefiles. + obj = shapelib.SHPObject(shapelib.SHPT_POLYGON, 1, + [[(0, 0), (0, 40), (40, 40), (40, 0), (0, 0)], + [(10, 10), (20, 10), (20, 20), (10, 20),(10, 10)], + ]) + print obj.extents() + print obj.vertices() + outfile.write_object(-1, obj) + + # close the file. + outfile.close() def read_shapefile(filename): # open the shapefile Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/libraries/pyshapelib/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChangeLog 27 Dec 2004 14:27:53 -0000 1.8 +++ ChangeLog 30 Jun 2005 14:20:46 -0000 1.9 @@ -1,3 +1,13 @@ +2005-06-30 Bernhard Herzog + + * shapelib.i (new_SHPObject): Fix the test for the length of the + part types. It used the wrong variable. + + * shapelib_wrap.c: Regenerated from shapelib.i + + * pytest.py (make_shapefile): Add some more comments and add an + example with a polygon with a hole. + 2004-12-27 Bernhard Reiter * README: Refering to the new homepage shapelib.maptools.org now. From cvs at intevation.de Thu Jun 30 16:55:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 30 Jun 2005 16:55:10 +0200 (CEST) Subject: bh: thuban/Extensions/ogr/test __init__.py,1.1,1.2 Message-ID: <20050630145510.E00621005D4@lists.intevation.de> Author: bh Update of /thubanrepository/thuban/Extensions/ogr/test In directory doto:/tmp/cvs-serv7628/Extensions/ogr/test Modified Files: __init__.py Log Message: Add missing coding directive Index: __init__.py =================================================================== RCS file: /thubanrepository/thuban/Extensions/ogr/test/__init__.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- __init__.py 7 Dec 2004 16:44:51 -0000 1.1 +++ __init__.py 30 Jun 2005 14:55:08 -0000 1.2 @@ -1,3 +1,4 @@ +# -*- coding: iso-8859-1 -*- # Copyright (C) 2004 by Intevation GmbH # Authors: # Nina Hüffmeyer From cvs at intevation.de Thu Jun 30 16:55:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 30 Jun 2005 16:55:10 +0200 (CEST) Subject: bh: thuban ChangeLog,1.816,1.817 Message-ID: <20050630145510.ED9B41005DC@lists.intevation.de> Author: bh Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv7628 Modified Files: ChangeLog Log Message: Add missing coding directive Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.816 retrieving revision 1.817 diff -u -d -r1.816 -r1.817 --- ChangeLog 28 Jun 2005 06:49:59 -0000 1.816 +++ ChangeLog 30 Jun 2005 14:55:08 -0000 1.817 @@ -1,3 +1,7 @@ +2005-06-30 Bernhard Herzog + + * Extensions/ogr/test/__init__.py: Add missing coding directive + 2005-06-28 Jan-Oliver Wagner * Thuban/UI/renderer.py (ScreenRenderer.draw_selection_incrementally): From cvs at intevation.de Thu Jun 30 18:15:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 30 Jun 2005 18:15:05 +0200 (CEST) Subject: bh: thuban/Thuban/UI renderer.py,1.63,1.64 Message-ID: <20050630161505.EA58C1005D3@lists.intevation.de> Author: bh Update of /thubanrepository/thuban/Thuban/UI In directory doto:/tmp/cvs-serv9508/Thuban/UI Modified Files: renderer.py Log Message: (ScreenRenderer.draw_selection_incrementally): untabify. Index: renderer.py =================================================================== RCS file: /thubanrepository/thuban/Thuban/UI/renderer.py,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- renderer.py 28 Jun 2005 06:48:45 -0000 1.63 +++ renderer.py 30 Jun 2005 16:15:03 -0000 1.64 @@ -265,7 +265,7 @@ # Get the size of the specific property for this # point if shapetype == SHAPETYPE_POINT: - if field is not None: + if field is not None: value = table.ReadValue(shape.ShapeID(), field) group = lc.FindGroup(value) size = group.GetProperties().GetSize() From cvs at intevation.de Thu Jun 30 18:15:06 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 30 Jun 2005 18:15:06 +0200 (CEST) Subject: bh: thuban ChangeLog,1.817,1.818 Message-ID: <20050630161506.1B9EE1006DB@lists.intevation.de> Author: bh Update of /thubanrepository/thuban In directory doto:/tmp/cvs-serv9508 Modified Files: ChangeLog Log Message: (ScreenRenderer.draw_selection_incrementally): untabify. Index: ChangeLog =================================================================== RCS file: /thubanrepository/thuban/ChangeLog,v retrieving revision 1.817 retrieving revision 1.818 diff -u -d -r1.817 -r1.818 --- ChangeLog 30 Jun 2005 14:55:08 -0000 1.817 +++ ChangeLog 30 Jun 2005 16:15:03 -0000 1.818 @@ -1,5 +1,10 @@ 2005-06-30 Bernhard Herzog + * Thuban/UI/renderer.py (ScreenRenderer.draw_selection_incrementally): + untabify. + +2005-06-30 Bernhard Herzog + * Extensions/ogr/test/__init__.py: Add missing coding directive 2005-06-28 Jan-Oliver Wagner From cvs at intevation.de Thu Jun 30 21:24:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 30 Jun 2005 21:24:47 +0200 (CEST) Subject: bh: thuban/test runtests.py,1.15,1.16 Message-ID: <20050630192447.245DE100160@lists.intevation.de> Author: bh Update of /thubanrepository/thuban/test In directory doto:/tmp/cvs-serv13183/test Modified Files: runtests.py Log Message: Untabify. Index: runtests.py =================================================================== RCS file: /thubanrepository/thuban/test/runtests.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- runtests.py 7 Dec 2004 16:44:51 -0000 1.15 +++ runtests.py 30 Jun 2005 19:24:45 -0000 1.16 @@ -1,4 +1,4 @@ -# Copyright (c) 2002, 2003, 2004 by Intevation GmbH +# Copyright (c) 2002, 2003, 2004, 2005 by Intevation GmbH # Authors: # Bernhard Herzog # @@ -94,8 +94,8 @@ names = find_test_modules(".") names += find_test_modules("../Extensions/svgexport/test", "Extensions.svgexport.test") - names += find_test_modules("../Extensions/ogr/test", - "Extensions.ogr.test") + names += find_test_modules("../Extensions/ogr/test", + "Extensions.ogr.test") suite = unittest.defaultTestLoader.loadTestsFromNames(names) runner = support.ThubanTestRunner(verbosity = verbosity) result = support.execute_as_testsuite(runner.run, suite)