| 1 |
|
2005-02-18 Jonathan Coles <[email protected]> |
| 2 |
|
|
| 3 |
|
Refactored baserenderer.py and renderer.py to remove baserenderer.py's |
| 4 |
|
dependencies on wxPython. Added a new method projected_raster_layer() |
| 5 |
|
that returns a raster layer image in projected space. This must be |
| 6 |
|
implemented in classes derived from BaseRenderer. This also eliminates |
| 7 |
|
the dependency on gdal in baserenderer.py. |
| 8 |
|
|
| 9 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): Call |
| 10 |
|
new projected_raster_layer() to get projected raster image instead |
| 11 |
|
of directly calling ProjectRasterFile(). |
| 12 |
|
(BaseRenderer.projected_raster_layer): New. This must be implemented |
| 13 |
|
by derived classes. It takes almost the same arguments as ProjectRasterFile |
| 14 |
|
did and returns a projected image with mask and alpha data (if requested). |
| 15 |
|
(BaseRenderer.render_map_incrementally): Remove the check for gdal since |
| 16 |
|
that check will be done in MapRenderer.projected_raster_layer(). This |
| 17 |
|
also allows other implementations to use different projection code. |
| 18 |
|
|
| 19 |
|
* Thuban/UI/renderer.py (MapRenderer.projected_raster_layer): |
| 20 |
|
Implementation of BaseRenderer.projected_raster_layer. Checks for |
| 21 |
|
gdal support and wxPython version. Also handles exceptions from |
| 22 |
|
ProjectRasterFile. |
| 23 |
|
|
| 24 |
|
* libraries/thuban/gdalwarp.cpp: Removed checks for wxPython versions |
| 25 |
|
and added a variable which can be set through the options argument |
| 26 |
|
of ProjectRasterFile. |
| 27 |
|
|
| 28 |
|
* test/test_baserenderer.py (SimpleRenderer.projected_raster_layer): New. |
| 29 |
|
Calls ProjectRasterFile and returns the result. |
| 30 |
|
(TestBaseRenderer.test_projected_raster_layer): New. Tests the results |
| 31 |
|
of calling projected_raster_layer() with different options. |
| 32 |
|
(TestBaseRenderer.test_raster_no_projection): Removed tests based on |
| 33 |
|
wxPython version and all tests of masks and alpha channels. These are |
| 34 |
|
now in test_projected_raster_layer(). |
| 35 |
|
|
| 36 |
|
2005-02-17 Jan-Oliver Wagner <[email protected]> |
| 37 |
|
|
| 38 |
|
* Thuban/Model/map.py, Thuban/Model/label.py: Fixed |
| 39 |
|
doc-strings to comply with coding_guidelines. |
| 40 |
|
|
| 41 |
|
2005-02-17 Jan-Oliver Wagner <[email protected]> |
| 42 |
|
|
| 43 |
|
Docstring improvements and minor fixes for labellayer. |
| 44 |
|
|
| 45 |
|
* Thuban/Model/map.py: |
| 46 |
|
(Map, Map.Destroy, Map.RemoveLayer, Map.ClearLayers, |
| 47 |
|
Map.Layers, Map.HasLayers, Map.MoveLayerToTop, |
| 48 |
|
Map.RaiseLayer, Map.LowerLayer, Map.MoveLayerToBottom, |
| 49 |
|
Map.ProjectedBoundingBox, Map.GetProjection): Improved/added |
| 50 |
|
doc string. |
| 51 |
|
(Map.BoundingBox): Removed superfluous test for label_layer |
| 52 |
|
and improved doc string. |
| 53 |
|
(Map.TreeInfo): Added label_layer and improved sdo string. |
| 54 |
|
|
| 55 |
|
* Thuban/Model/label.py: Added import of _. |
| 56 |
|
(Label, Label.__init__): Improved/added doc string. |
| 57 |
|
(LabelLayer, LabelLayer.__init__, LabelLayer.Labels, |
| 58 |
|
LabelLayer.RemoveLabel, LabelLayer.ClearLabels): |
| 59 |
|
Improved/added doc string. |
| 60 |
|
(LabelLayer.AddLabel): Use already defined names for |
| 61 |
|
align strings and improved doc string. |
| 62 |
|
(LabelLayer.TreeInfo): New. Return the object data for |
| 63 |
|
the tree view. |
| 64 |
|
|
| 65 |
|
2005-02-16 Jonathan Coles <[email protected]> |
| 66 |
|
|
| 67 |
|
Further wxPython 2.5 changes using patches from Daniel Calvelo Aros |
| 68 |
|
so that that wxproj doesn't crash. Added GUI support for selecting |
| 69 |
|
alpha channel (opacity can't be selected yet). |
| 70 |
|
|
| 71 |
|
NOTE: If wxPython.h is including in future distribution packages |
| 72 |
|
then it will not be necessary to have the files swigPtrConvertHack.h |
| 73 |
|
and wxPython_int.h included with Thuban. This is hopefully |
| 74 |
|
a temporary workaround. |
| 75 |
|
|
| 76 |
|
* setup.py (thuban_build_ext.finalize_options): gdalwarp needs |
| 77 |
|
access to the macro wxCHECK_VERSION so that it will properly |
| 78 |
|
generate a bit mask. There was a problem between wx2.4 and wx2.5 |
| 79 |
|
that this works around. |
| 80 |
|
|
| 81 |
|
* Thuban/Model/layer.py (RasterLayer.UseMask): Removed in favor |
| 82 |
|
of RasterLayer.MaskType. |
| 83 |
|
(RasterLayer.SetUseMask): Removed in favor of RasterLayer.SetMaskType |
| 84 |
|
(RasterLayer.MaskType): New. Returns the type of mask to use. Can |
| 85 |
|
specify none, a bitmap, or an alpha channel. |
| 86 |
|
(RasterLayer.SetMaskType): New. Set what kind of mask to use. |
| 87 |
|
|
| 88 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): |
| 89 |
|
Set the raster warping options for the mask based on the value |
| 90 |
|
of RasterLayer.MaskType. |
| 91 |
|
|
| 92 |
|
* Thuban/UI/legend.py (LegendTree.__FillTreeLayer): Remove |
| 93 |
|
deprecated calls to SetItemSelectedImage in favor of SetItemImage |
| 94 |
|
with wxTreeItemIcon_Selected. |
| 95 |
|
|
| 96 |
|
* Thuban/UI/rasterlayerproperties.py: Support selecting to use |
| 97 |
|
an alpha channel for the mask. |
| 98 |
|
|
| 99 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Use alpha |
| 100 |
|
data if it is available and an alpha channel is supported under |
| 101 |
|
the current version of wxPython. |
| 102 |
|
|
| 103 |
|
* libraries/thuban/gdalwarp.cpp (GetImageData): Added compiler define |
| 104 |
|
to select whether 1's or 0's select the desired portion of an image |
| 105 |
|
in the bit mask. wx2.4 has a bug where the documentation is the opposite |
| 106 |
|
from behavior. |
| 107 |
|
(ProjectRasterFile): Only generate an alpha channel if the version |
| 108 |
|
of wxPython is >= 2.5.3. |
| 109 |
|
|
| 110 |
|
* libraries/thuban/wxproj.cpp: Applied patches from Daniel Calvelo Aros. |
| 111 |
|
When wxPython >= 2.5.3 use the special swig functions to decode an |
| 112 |
|
object's address. |
| 113 |
|
|
| 114 |
|
* libraries/thuban/swigPtrConvertHack.h: Includes conditional code |
| 115 |
|
based on the version of wxPython. If >= 2.5.3 use the special swig |
| 116 |
|
functions from wxPython to decode wxPython objects, otherwise use |
| 117 |
|
the old method of retrieving the address from the object __repr__ string. |
| 118 |
|
|
| 119 |
|
* libraries/thuban/wxPython_int.h: Copied from wxPython source. |
| 120 |
|
Unnecessary code was removed to make it smaller. |
| 121 |
|
|
| 122 |
|
* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection): |
| 123 |
|
Add tests for returning an alpha channel. |
| 124 |
|
|
| 125 |
|
* test/test_layer.py (TestLayerModification.test_raster_layer): Fix |
| 126 |
|
tests that used removed functions UseMask and SetUseMask |
| 127 |
|
|
| 128 |
|
|
| 129 |
|
2005-02-08 Bernhard Herzog <[email protected]> |
| 130 |
|
|
| 131 |
|
More wxPython 2.5 changes. This time taken from a patch from |
| 132 |
|
Daniel Calvelo Aros. |
| 133 |
|
|
| 134 |
|
* Thuban/UI/tableview.py (QueryTableFrame.__init__) |
| 135 |
|
(QueryTableFrame.__init__): Pass the size of a spacer as a single |
| 136 |
|
item. |
| 137 |
|
|
| 138 |
|
* Thuban/UI/projdialog.py (ProjFrame.build_dialog) |
| 139 |
|
(ProjFrame.build_dialog): Pass the size of a spacer as a single |
| 140 |
|
item. |
| 141 |
|
|
| 142 |
|
* Thuban/UI/dbdialog.py (ChooseDBTableDialog.__init__): Pass the |
| 143 |
|
size of a spacer as a single item. |
| 144 |
|
|
| 145 |
|
* Thuban/UI/classifier.py (Classifier.dialog_layout): Pass the |
| 146 |
|
size of a spacer as a single item. |
| 147 |
|
|
| 148 |
|
2005-02-08 Bernhard Herzog <[email protected]> |
| 149 |
|
|
| 150 |
|
Compatibility with wxPython 2.5. The changes should make it work |
| 151 |
|
better with 2.5 while still keeping compatibility with 2.4. There |
| 152 |
|
are still problems with 2.5, though. |
| 153 |
|
|
| 154 |
|
* Thuban/UI/dock.py (DockableWindow.__CreateBorder): Pass the size |
| 155 |
|
of a spacer as a single item. |
| 156 |
|
|
| 157 |
|
* Thuban/UI/classifier.py (ClassGroupPropertiesCtrl): Derive only |
| 158 |
|
from wxControl |
| 159 |
|
|
| 160 |
|
* Thuban/UI/legend.py (LegendTree): When running with wxPython < |
| 161 |
|
2.5, add an implementation of the GetFirstChild method that does |
| 162 |
|
not require the second parameter. |
| 163 |
|
(LegendTree.find_layer, LegendTree._OnMsgMapLayersAdded) |
| 164 |
|
(LegendTree._OnMsgMapLayersRemoved, LegendTree.DeleteAllItems) |
| 165 |
|
(LegendTree.DeleteChildren, LegendTree.__ShowHideLayer): Do not |
| 166 |
|
pass the second parameter to GetFirstChild |
| 167 |
|
|
| 168 |
|
2005-02-08 Nina H�ffmeyer <[email protected]> |
| 169 |
|
|
| 170 |
|
* Extensions/ogr/ogrshapes.py: Removed some print commands. |
| 171 |
|
|
| 172 |
|
* Extensions/ogr/ogrstart.py: Changed the GUI. OGR is no longer an |
| 173 |
|
additional menu but appears as a possibility in the menu Map. |
| 174 |
|
|
| 175 |
|
2005-02-07 Jonathan Coles <[email protected]> |
| 176 |
|
* libraries/thuban/gdalwarp.cpp: Removed the macros PYTHON_ERR |
| 177 |
|
and PYTHON_ERRF since they were no longer necessary. |
| 178 |
|
|
| 179 |
2005-02-07 Bernhard Reiter <[email protected]> |
2005-02-07 Bernhard Reiter <[email protected]> |
| 180 |
* Thuban/UI/classifier.py (ClassGrid.DeleteSelectedRows): |
* Thuban/UI/classifier.py (ClassGrid.DeleteSelectedRows): |
| 181 |
Enable translation for message string. |
Enable translation for message string. |
Parent Directory
| 
Revision Log
| 
Patch