@@ -200,20 +203,20 @@
- -degree_thresh - algorithm selects only the lines which share a point -with at least degree_thresh different lines. +degree_thresh - algorithm selects only the lines which share a point +with at least degree_thresh different lines.
- -closeness_thresh - is always in the range (0, 1]. Only the lines with -the closeness centrality measure at least closeness_thresh are selcted. +closeness_thresh - is always in the range (0, 1]. Only the lines with +the closeness centrality measure at least closeness_thresh are selcted. The lines in the centre of a network have greater values of this measure then the lines near the border of a network. This means, that this parameters can be used for selecting the centre(s) of a network. Note that if closeness_thresh=0 then everything is selected.
-
-betweeness_thresh - Again, only the lines with betweeness centrality
-measure at least betweeness_thresh are selected. This value is always
+betweeness_thresh - Again, only the lines with betweeness centrality
+measure at least betweeness_thresh are selected. This value is always
positive and is larger for large networks. It denotes to what extent a line
is in between the other lines in the network. This value is great for the lines
which lie between other lines and lie on the paths between two parts of a network.
@@ -225,12 +228,12 @@
the algorithm selects only the lines which meet each criterion.
-Also, the outputed network may not be connected if the value of betweeness_thresh +Also, the outputed network may not be connected if the value of betweeness_thresh is too large.
SEE ALSO
- +v.generalize Tutorial
v.clean
v.dissolve
Added: trunk/grassaddons/v.generalize/tutorial/grass_logo.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/grass_logo.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/grassdocs.css =================================================================== --- trunk/grassaddons/v.generalize/tutorial/grassdocs.css (rev 0) +++ trunk/grassaddons/v.generalize/tutorial/grassdocs.css 2007-08-20 16:36:06 UTC (rev 1042) @@ -0,0 +1,52 @@ +/* GRASS documentation site style sheet + * (copyied by 'tools/build_html_index.sh') + * + * send improvements to weblist@grass.itc.it + * + * (eg how to reach the same result on netscape, mozilla konqueror?) + * + * Fonts: + * http://www.w3.org/TR/REC-CSS2/fonts.html + * Tables: + * http://www.w3.org/TR/REC-CSS2/tables.html + */ + +BODY{ background: white; + color: black; +} + +H1{ background-color: white; + color: #409940; + font-family: sans-serif; + font-weight: bold; + font-size: x-large; +} + +H2{ background-color: white; + color: #409940; + font-family: sans-serif; + font-weight: bold; + font-size: large; +} + +H3{ background-color: white; + color: #409940; + font-family: sans-serif; + font-weight: bold; + font-size: large; +} + +H4{ background-color: white; + color: #409940; + font-family: sans-serif; + font-weight: bold; + font-size: medium; +} + +DIV.code{ width: 95%; + color : black; + background-color: #E5E5E5; + padding-left: 1em; + padding-right: 1em; +} + Property changes on: trunk/grassaddons/v.generalize/tutorial/grassdocs.css ___________________________________________________________________ Name: svn:executable + * Added: trunk/grassaddons/v.generalize/tutorial/tutorial.html =================================================================== --- trunk/grassaddons/v.generalize/tutorial/tutorial.html (rev 0) +++ trunk/grassaddons/v.generalize/tutorial/tutorial.html 2007-08-20 16:36:06 UTC (rev 1042) @@ -0,0 +1,369 @@ + + + +v.generalize + + + + + +
+ +MODULE
+v.generalize + +TUTORIAL
+ +Introduction
+ +This tutorial presents and explains the functionality of GRASS vector module v.generalize. +This module implements generalization operators for GRASS vector maps. The topics +covered in this tutorial are: simplification, smoothing, network generalization and +displacement. For the basic introduction to these operators chech the module's man pages +or for the exhausting introduction check McMaster and Shea (TODO: add reference). +
++It is recommended to read the official man page before reading this document, or read +these two documents at the same time since this tutorial does not contain the +(detail) descriptions of input parameters whereas the man page has very few examples +and no pictures at all. (Even the author of module and both of the documents must have consult the man page several times....) +This document is also meant to be a "report" showing the work done during the Google Summer of Code 2007. +
++Most of the examples in this text work with Spearfish dataset, which can +be downloaded here. Also, this +tutorial assumes that the user is already running GRASS session with the Spearfish +location and a monitor loaded. Also, if you click on any picture, it is shown in the full size. +
++All the algorithms presented in this document (try to) preserve the topology +of the input maps. This means, for example, that the smoothing and simplification methods +never remove the first and last points of lines and that displacement preserves the junctions. +
+ +Simplification
++v.generalize implements many simplification algorithms. The most widely used +is Douglas-Peucker algorithm (TODO: reference). We can apply this algorithm to +any vector map in the following way: + +
+ +The explanation of the line above is following: Run v.generalize, apply Douglas-Peucker +algorithm with threshold equals to 50 to the map roads and store the output in vector +map output_douglas. The last output line produced by this module: + ++v.generalize input=roads output=roads_douglas method=douglas threshold=50 +
+ +means that the input file (roads) has 5468 vertices in total and the new map (roads_douglas) +has only 2107 vertices which is only 38% of original. On the other hand, if we run the +commands: + ++Number of vertices was reduced from 5468 to 2107[38%] +
+We can see that there are no significant differencies between the input and output maps. +"Only the details were removed". ++d.vect roads +d.vect roads_douglas col=blue +
+The amount of the details removed can be specified by parameter: threshold. It is the +case that the output map has fewer vertices and details for greater values of threshold. +For example, if we run +
+we obtain a map with only 1726 vertices. A disadvantage of the command above is that +it never removes the lines. If we also want to remove the small lines, we need to run +the command above with the -r flag. If the -r flag is presented, lines shorter than +threshold and areas with areas less than threshold are removed: + ++v.generalize input=roads output=roads_douglas method=douglas threshold=200 --overwrite +
+In this case, roads_douglas has only 850 vertices and it contains 387 lines whereas +the original map (roads) contains 825 lines. In this case, the output map has very few details, +but the basic shapes and topology are preserved: ++v.generalize -r input=roads output=roads_douglas method=douglas threshold=200 --overwrite +
+It is also possible remove small lines/areas only (without any simplification). This is achieved +by method=remove_small: +
+produces following map with 399 lines. (Note removed lines in the upper left corner) ++v.generalize input=roads output=roads_remove_small method=remove_small threshold=200 +
+Douglas-Peucker Algorithm has very reasonable results, but it is very hard to find(guess) the +right value of threshold. Moreover, it is also impossible to simplify each line to (for example) 40%. +Exactly for such cases, v.generalize provides method=douglas_reduction. This algorithm +is a modification of Douglas-Peucker Algorithm which takes another paratemer reduction +which denotes (approximate) simplification of lines. For example, +
+produces following map with 3018 vertices (55%). (Note that there are almost no differencies between the original and the new map) ++v.generalize input=roads output=roads_douglas_reduction method=douglas_reduction threshold=0 reduction=50 --overwrite +d.erase +d.vect roads_douglas_reduction +
+ ++v.generalize input=in output=out method=douglas threshold=eps +v.generalize input=in output=out method=douglas_reduction threshold=eps reduction=100 +
+Another algorithm implemented in this modules is "Vertex Reduction". This algorithm removes +the consecutive poins (on the same line) which are closer to each other than threshold. For example, +
+removes duplicate points. More precisely, if two consecutive points have the same +coordinates then the second point is removed and the first is preserved. The last two algorithm +implemented by this module are "Lang" and "Reumann-Witkam" algorithm. For more information +about these two algorithms, please go to the man pag. + + ++v.generalize input=in output=out method=reduction threshold=0 +
Results
++The following four pictures show the results obtained by Reumann, Douglas, Lang +and Vertex Reduction algorithm resp. The algorithms were run with threshold set to 50 +and Lang algorithm with look_ahead=7. The map produced by Reumann-Witkam algorithm contains 2522[46%] points, +Douglas: 2107[38%] points, Lang: 2160[39%] and Vertex Reduction: 4296[78%].
+
Smoothing
++v.generalize also supports many smoothing algorithm. For basic descriptions, please +consult the man page. +
++Probably, the best results are produced by "Chaiken", "Hermite" and "Snakes" algorithms/methods. +However, the remaining algorithms may also produce very reasonable results. Although +the Chaiken and Hermite methods may produce the maps with a lot of new points, the methods +presented above (simplification) provide a good tool for tackling this problem. +
++If we run the following command +
+we get a new map with 33364[640%] vertices. ++v.generalize input=roads output=roads_chaiken method=chaiken threshold=1 +
++d.erase +d.vect roads +d.vect roads_chaiken col=blue +
++v.generalize input=roads output=roads_hermite method=hermite threshold=1 +
+The algorithms mentioned above are suitable for smooth approximation of given lines. +On the other hand, if the aim of smoothing is to "straighten" the lines then the better +results are achieved by the other methods. For example, +
+At first sight, we can see that roads_sa contains smooth and straight lines which +preserve the original shape of the lines. This difference is obvious if we zoom to a small +region of a map (see below. Again, original line is black, new line is blue) ++v.generalize input=roads output=roads_sa method=sliding_averaging look_ahead=7 slide=1 +
+Very similar results can be obtained by Distance Weighting Algorithm (method=distance_weighting). +This is not very surprising since these algorithms are almost the same. For example, +the image below shows the outputs of "Distance Weighting Algorithm". The image was generated +by the following sequence of commands +
++v.generalize input=roads output=roads_dw1 method=distance_weighting look_ahead=7 slide=1 +v.generalize input=roads output=roads_dw2 method=distance_weighting look_ahead=7 slide=0.3 +d.erase +d.vect roads +d.vect roads_dw1 col=red +d.vect roads_dw2 col=blue +
+produces a map containing following region (original line is black) ++v.generalize input=roads output=roads_snakes method=snakes alpha=1 beta=1 +
+Last smoothing algorithm implemented in this module is "Boyle's Forward-Looking Algorithm" which +is another "straightening" algorithm. +
+produces a map containing following region (original line is black) ++v.generalize input=roads output=roads_boyle method=boyle look_ahead=5 +
Displacement
++If we render entire Spearfish location, we can see in the upper half of the map two interstates which +overlap. This is not logically correct (I hope, they do not evarlap in real) and it is also +considered as an (presentation) error. For solving such problems, v.generalize provides +"dislplacement" method. As the name suggests, this method displaces linear features which are +close to each other so that they do not overlap/collide. Method implemented in this modules (based on Snakes) +has very good results but not very good perfomance. Therefore the calculations may take few(several) minutes. +For this reason, displacement is applied to the simplified lines in this document. +
+First command produces simplified lines and then the second command applied displacement operator +to the simplified line. Parameters alpha and beta specifies the rigidity of the lines. This means +that displacement is bigger for small values of alpha and beta. Also, the displacement is +not very significant for higher(>=1.0) values of alpha, beta. Threshold parameter +denotes the critical distance. Only the points (and their neighbours) which are closer +than threshold apart are displaced by v.generalize. Module tries to move these +points such that they are at least threshold apart. However, the displaced points are never +threshold (or more) apart for positive values of alpha and beta. Displacement as implemented +in v.generalize is an iterative process. Parameter "iterarions" specifies the number +of iterations the collisions between the points are resolved. In general, the quality of displacement +increases with the number of iterations. However, quality converges quite rapidly and +for all maps I tried, the sufficient value of iterations was between 20 and 50. +Two command above produce the picture below. Note that it is now possible to distinguish +between two "interastate lines" and also observe the free space between interstate and the lines +directly below it. ++v.generalize input=roads output=roads_dr method=douglas_reduction threshold=0 reduction=50 +v.generalize input=roads_dr output=roads_dr_disp method=displacement alpha=0.01 beta=0.01 threshold=100 iterations=35 +
Network Generalization
++Network generalization is suitable for selecting "the most important" subnetwork +of a network. For example, to select highways, interstates from a road network. Examples +in this section work with new GRASS default dataset, which can be downloaded +here. +
++If we render map "streets_wake" we really cannot see the streets, but the only +thing we can see is a big black rhombus. We will try to improve this. Firstly, network +generalization requites quite a lot of time and memory. Therefore, we begin with +simplification of "streets_wake": +
+Then we can begin with network generalization. If we execute the folllowing command: ++v.generalize input=streets_wake output=streets_rs method=remove_small threshold=50 +
+we obtain the following map containing "only" 14128. Original map has 49746 ++v.generalize input=streets_rs output=streets_rs_network method=network betweeness_thresh=50 +
Gereneral Parameters
++v.generalize has some parameters and flags which affect the general behaviour +of module. +
++The simplest one is -c flag. "C" stands for copy and if this flag is on then the attributes +are copied from the old map to the new map. Note that the attributes of removed features are +dropped. +
++Default behaviour of this module is that the selected algorithm/method is applied to the all +lines/areas. It is possible to apply the most of the algorithms only to the selected features. +This is achieved by "type", "layer", "cats" and "where" parameters. This works for all algorithms +except "Network Generalization" which is always applied to the all features. +For example, the following command applies "Douglas Reduction" algorithm to interstates and highways (cat<3) +and leaves the other lines unaltered. It also copies the attributes +
+And the following command removes the small areas ++v.generalize -c input=roads output=roads_douglas_reduction2 method=douglas_reduction threshold=0 reduction=50 type=line where="cat<3" +
+Similarly, the following command displaces only the interstates (cats=1) and the lines with a different +category number are not taken into the account. ++v.generalize input=soils output=soils_remove_small method=remove_small threshold=200 type=area +
++v.generalize input=roads output=roads_displacement2 method=displacement threshold=75 alpha=0.01 beta=0.01 iterations=20 cats=1 +
+We end up with a complex example of a generalization of "roads" in Spearfish location. +
+The result "step7" has 655 lines and 3545 vertices and the commands above have the following effect: ++#straighten the lines +v.generalize input=roads output=step1 method=snakes alpha=1 beta=1 +#simplification +v.generalize input=step1 output=step2 method=douglas_reduction threshold=0 reduction=55 +#displacement +v.generalize input=step2 output=step3 method=displacement alpha=0.01 beta=0.01 threshold=100 iterations=50 +#remove small areas +v.generalize input=step3 output=step4 method=remove_small threshold=75 +#network generalization +v.generalize input=step4 output=step5 method=network betweeness_thresh=5 closeness_thresh=0.0425 +#smoothing +v.generalize input=step5 output=step6 method=chaiken threshold=1 +#simplification +v.generalize input=step6 output=step7 method=douglas threshold=1 +#remove temporary maps +g.remove vect=step1,step2,step3,step4,step5,step6 +
References
++TODO +
+ + +AUTHORS
+ +Daniel Bundala, Google Summer of Code 2007, Student
+Wolf Bergenheim, Mentor + +Last changed: $Date: 2007/08/20 18:21:12 $ + + + Property changes on: trunk/grassaddons/v.generalize/tutorial/tutorial.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.anim.gif =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.anim.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.douglas.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.douglas.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.lang.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.lang.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.net200.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.net200.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.net50.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.net50.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic1.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic1.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic10.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic10.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic11.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic11.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic12.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic12.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic13.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic13.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic14.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic14.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic15.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic15.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic16.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic16.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic2.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic2.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic3.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic3.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic4.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic4.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic5.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic5.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic6.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic6.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic7.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic7.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic8.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic8.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic9.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.pic9.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.douglas.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.douglas.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.lang.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.lang.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.net200.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.net200.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.net50.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.net50.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic1.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic1.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic10.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic10.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic11.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic11.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic12.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic12.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic13.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic13.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic14.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic14.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic15.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic15.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic16.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic16.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic2.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic2.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic3.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic3.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic4.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic4.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic5.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic5.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic6.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic6.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic7.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic7.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic8.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic8.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic9.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.pic9.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.reduction.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.reduction.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.reumann.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.prev.reumann.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.reduction.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.reduction.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/grassaddons/v.generalize/tutorial/v.generalize.reumann.png =================================================================== (Binary files differ) Property changes on: trunk/grassaddons/v.generalize/tutorial/v.generalize.reumann.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream From neteler at grass.itc.it Mon Aug 20 21:46:18 2007 From: neteler at grass.itc.it (neteler@grass.itc.it) Date: Mon Aug 20 21:46:20 2007 Subject: [grass-addons] r1043 - trunk/grassaddons/i.pr/PRLIB Message-ID: <200708201946.l7KJkIIL023361@grass.itc.it> Author: neteler Date: 2007-08-20 21:46:17 +0200 (Mon, 20 Aug 2007) New Revision: 1043 Modified: trunk/grassaddons/i.pr/PRLIB/training.c Log: don't crash on empty file Modified: trunk/grassaddons/i.pr/PRLIB/training.c =================================================================== --- trunk/grassaddons/i.pr/PRLIB/training.c 2007-08-20 16:36:06 UTC (rev 1042) +++ trunk/grassaddons/i.pr/PRLIB/training.c 2007-08-20 19:46:17 UTC (rev 1043) @@ -6,11 +6,11 @@ structure Training management */ -#include
From bergenheim at grass.itc.it Fri Aug 31 22:29:48 2007 From: bergenheim at grass.itc.it (bergenheim@grass.itc.it) Date: Fri Aug 31 22:29:49 2007 Subject: [grass-addons] r1062 - trunk/grassaddons/v.path.obstacles Message-ID: <200708312029.l7VKTmHP020797@grass.itc.it> Author: bergenheim Date: 2007-08-31 22:29:45 +0200 (Fri, 31 Aug 2007) New Revision: 1062 Modified: trunk/grassaddons/v.path.obstacles/description.html Log: Updated last modified date. Modified: trunk/grassaddons/v.path.obstacles/description.html =================================================================== --- trunk/grassaddons/v.path.obstacles/description.html 2007-08-31 20:20:37 UTC (rev 1061) +++ trunk/grassaddons/v.path.obstacles/description.html 2007-08-31 20:29:45 UTC (rev 1062) @@ -92,4 +92,4 @@ Maximilian Maldacker Mentor : Wolf Bergenheim --#include "global.h" #include #include #include +#include +#include "global.h" void inizialize_training(training) /* @@ -56,7 +56,10 @@ sprintf(tempbuf, "read_training-> Can't open file %s for reading", file); G_fatal_error(tempbuf); } - + if(G_getl2(tempbuf, sizeof(tempbuf)-1, fp) == 0) { + G_fatal_error("read_training-> File %s is empty", file); + fclose(fp); + } training->file=file; From neteler at grass.itc.it Mon Aug 20 21:50:00 2007 From: neteler at grass.itc.it (neteler@grass.itc.it) Date: Mon Aug 20 21:50:02 2007 Subject: [grass-addons] r1044 - in trunk/grassaddons/i.pr: i.pr_statistics i.pr_training Message-ID: <200708201950.l7KJo07f023381@grass.itc.it> Author: neteler Date: 2007-08-20 21:49:58 +0200 (Mon, 20 Aug 2007) New Revision: 1044 Modified: trunk/grassaddons/i.pr/i.pr_statistics/main.c trunk/grassaddons/i.pr/i.pr_training/main.c Log: error check R_open_driver Modified: trunk/grassaddons/i.pr/i.pr_statistics/main.c =================================================================== --- trunk/grassaddons/i.pr/i.pr_statistics/main.c 2007-08-20 19:46:17 UTC (rev 1043) +++ trunk/grassaddons/i.pr/i.pr_statistics/main.c 2007-08-20 19:49:58 UTC (rev 1044) @@ -252,9 +252,10 @@ if(features.training.rows > 1 && features.training.cols > 1){ - /*make sure avalilability of monitir*/ - R_open_driver(); - R_close_driver(); + /*make sure avalability of monitor*/ + if (R_open_driver() != 0) + G_fatal_error (_("No graphics device selected.")); + R_close_driver(); /*number of rows and cols on the virtual screen*/ @@ -373,7 +374,8 @@ } sprintf(tempbuf,"d.frame -e"); system(tempbuf); - R_open_driver(); + if (R_open_driver() != 0) + G_fatal_error (_("No graphics device selected.")); Dcell(outputmap_name, G_mapset(), 0) ; R_close_driver(); if(G_put_window(&cellhd_orig) == -1){ Modified: trunk/grassaddons/i.pr/i.pr_training/main.c =================================================================== --- trunk/grassaddons/i.pr/i.pr_training/main.c 2007-08-20 19:46:17 UTC (rev 1043) +++ trunk/grassaddons/i.pr/i.pr_training/main.c 2007-08-20 19:49:58 UTC (rev 1044) @@ -3,6 +3,7 @@ #include #include #include +#include #include "global.h" #include "globals.h" #include "func.h" @@ -103,7 +104,7 @@ opt5->description= "Numerical label to be attached to the training examples.\n\t\tOption not required with the vector option."; if (G_parser(argc, argv)) - exit(1); + exit(EXIT_FAILURE); /* informations from command line */ nmaps=0; @@ -178,7 +179,9 @@ } if(!opt6->answer){ - R_open_driver(); + /* must have a graphics terminal selected */ + if (R_open_driver() != 0) + G_fatal_error (_("No graphics device selected.")); /*inizialize monitor*/ Init_graphics(); @@ -304,7 +307,8 @@ } }else{ G_get_window (&cellhd); - R_open_driver(); + if (R_open_driver() != 0) + G_fatal_error (_("No graphics device selected.")); Init_graphics2(); display_map(&cellhd, VIEW_MAP1, vis_map, vis_mapset); From landa at grass.itc.it Wed Aug 22 10:52:06 2007 From: landa at grass.itc.it (landa@grass.itc.it) Date: Wed Aug 22 10:52:09 2007 Subject: [grass-addons] r1045 - in trunk/grassaddons/gui: display_driver gui_modules Message-ID: <200708220852.l7M8q639021541@grass.itc.it> Author: landa Date: 2007-08-22 10:52:05 +0200 (Wed, 22 Aug 2007) New Revision: 1045 Modified: trunk/grassaddons/gui/display_driver/driver.cc trunk/grassaddons/gui/display_driver/driver.h trunk/grassaddons/gui/display_driver/driver.i trunk/grassaddons/gui/gui_modules/dbm.py trunk/grassaddons/gui/gui_modules/digit.py trunk/grassaddons/gui/gui_modules/mapdisp.py Log: Minor updates for digitization tool. Still disabled. Modified: trunk/grassaddons/gui/display_driver/driver.cc =================================================================== --- trunk/grassaddons/gui/display_driver/driver.cc 2007-08-20 19:49:58 UTC (rev 1044) +++ trunk/grassaddons/gui/display_driver/driver.cc 2007-08-22 08:52:05 UTC (rev 1045) @@ -168,7 +168,8 @@ } if (settings.vertex.enabled) { - dc->SetPen(wxPen(settings.vertex.color, settings.lineWidth, wxSOLID)); + if (!IsSelected(line)) + dc->SetPen(wxPen(settings.vertex.color, settings.lineWidth, wxSOLID)); DrawLineVerteces(line); } DrawLineNodes(line); @@ -198,7 +199,6 @@ if (draw) { // highlight feature? if (IsSelected(line)) { - std::cout << line << " " << IsSelected(line) << std::endl; dc->SetPen(wxPen(settings.highlight, settings.lineWidth, wxSOLID)); } @@ -251,10 +251,17 @@ Cell2Pixel(east, north, depth, &x, &y, &z); - if (Vect_get_node_n_lines(mapInfo, node) == 1) - dc->SetPen(wxPen(settings.nodeOne.color, settings.lineWidth, wxSOLID)); - else - dc->SetPen(wxPen(settings.nodeTwo.color, settings.lineWidth, wxSOLID)); + + // highlight feature? + if (IsSelected(line)) { + dc->SetPen(wxPen(settings.highlight, settings.lineWidth, wxSOLID)); + } + else { + if (Vect_get_node_n_lines(mapInfo, node) == 1) + dc->SetPen(wxPen(settings.nodeOne.color, settings.lineWidth, wxSOLID)); + else + dc->SetPen(wxPen(settings.nodeTwo.color, settings.lineWidth, wxSOLID)); + } wxPoint point(x, y); DrawCross(line, &point); @@ -307,15 +314,15 @@ } /** - \brief Close and open vector map layer + \brief Reload vector map layer - Need for modification using v.edit + Close and open again. Needed for modification using v.edit. \param \return */ -void DisplayDriver::ReOpenMap() +void DisplayDriver::ReloadMap() { // char* name = G_store(Vect_get_map_name(mapInfo)); ??? char* name = G_store(mapInfo->name); @@ -472,6 +479,12 @@ } std::cout << std::endl; } + + for (std::vector ::const_iterator i = selected.begin(), e = selected.end(); + i != e; ++i) + std::cout << "selected: " << *i << " "; + std::cout << std::endl; + return; } @@ -482,7 +495,7 @@ Number of selected features can be decreased by 'onlyType' ('NULL' for all types) - \param + \param[in] x1,y1,x2,y2 corners coordinates of bounding box \return number of selected features \return -1 on error @@ -528,17 +541,40 @@ Vect_destroy_line_struct(bbox); Vect_destroy_list(list); -#ifdef DEBUG - for (std::vector ::const_iterator i = selected.begin(), e = selected.end(); - i != e; ++i) - std::cout << "selected:" << *i << " "; - std::cout << std::endl; -#endif - return selected.size(); } /** + \brief Select vector feature by given point in given + threshold + + Only one vector feature can be selected. + + \param[in] x,y point of searching + \param[in] thresh threshold value where to search + \param[in] onlyType select vector feature of given + type + + \return 1 if vector feature found + \return 0 if no vector feature found +*/ +int DisplayDriver::SelectLinesByPoint(double x, double y, double thresh, + int onlyType) +{ + int line; + + line = Vect_find_line(mapInfo, x, y, 0.0, + -1, thresh, 0, 0); + + if (line > 0) { + selected.push_back(line); + return 1; + } + + return 0; +} + +/** \brief Is vector feature selected? \param[in] line vector feature id @@ -576,12 +612,99 @@ /** \brief Return grass ids of selected vector features - \param + \param[in] grassId If true method returns GRASS ids of + vector features, if false returns ids of objects + drawn in PseudoDC \return list of ids of selected vector features */ -std::vector DisplayDriver::GetSelected() +std::vector DisplayDriver::GetSelected(bool grassId) { - return selected; + if (grassId) + return selected; + + std::vector dc_ids; + + for(std::vector ::const_iterator i = selected.begin(), e = selected.end(); + i != e; ++i) { + // TODO ids[*i] ... + for(ids_map::const_iterator ii = ids.begin(), ee = ids.end(); + ii != ee; ++ii) { + if (*i == ii->first) { + for(std::vector ::const_iterator iii = ii->second.begin(), + eee = ii->second.end(); iii != eee; ++iii) { + dc_ids.push_back(*iii); + } + break; + } + } + } + return dc_ids; } +/** + \brief Set ids of selected vector features + + \param[in] list of ids to be set + + \return 1 +*/ +int DisplayDriver::SetSelected(std::vector id) +{ + selected = id; + + return 1; +} + +/** + \brief Get PseudoDC id of selected line of given coordinates + + \param[in] x,y coordinates of vertex on line + + \return number of line + \return 0 no line found + \return -1 on error +*/ +long int DisplayDriver::GetSelectedVertex(double x, double y) +{ + int line, type, minIdx; + long int dcId; + double dist, minDist; + + std::vector * dcIds; + + if (selected.size() != 1) + return -1; + + line = selected[0]; + + type = Vect_read_line (mapInfo, points, cats, line); + + for(int idx = 0; idx < points->n_points; idx++) { + dist = Vect_points_distance(x, y, 0.0, + points->x[idx], points->y[idx], points->z[idx], 0); + + if (idx == 0) { + minDist = dist; + minIdx = idx; + } + else { + if (minDist > dist) { + minDist = dist; + minIdx = idx; + } + } + } + + // [line, vertex1, ..., node1, node2] + dcIds = &(ids[line]); + + if (minIdx == 0) + dcId = (*dcIds)[dcIds->size()-2]; // first node + else if (minIdx == points->n_points - 1) + dcId = (*dcIds)[dcIds->size()-1]; // last node + else + dcId = (*dcIds)[minIdx]; // vertex + + return dcId; +} Modified: trunk/grassaddons/gui/display_driver/driver.h =================================================================== --- trunk/grassaddons/gui/display_driver/driver.h 2007-08-20 19:49:58 UTC (rev 1044) +++ trunk/grassaddons/gui/display_driver/driver.h 2007-08-22 08:52:05 UTC (rev 1045) @@ -19,7 +19,8 @@ #include #include -#include +//#include +#include "pseudodc.h" extern "C" { #include @@ -108,13 +109,18 @@ /* select */ int SelectLinesByBox(double x1, double y1, double x2, double y2); + int SelectLinesByPoint(double x, double y, double thresh, + int onlyType); + void Unselect(); - std::vector GetSelected(); + std::vector GetSelected(bool grassId); + int SetSelected(std::vector id); + long int GetSelectedVertex(double x, double y); /* general */ void CloseMap(); void OpenMap(const char *mapname, const char *mapset); - void ReOpenMap(); + void ReloadMap(); /* set */ void SetRegion(double north, double south, double east, double west, Modified: trunk/grassaddons/gui/display_driver/driver.i =================================================================== --- trunk/grassaddons/gui/display_driver/driver.i 2007-08-20 19:49:58 UTC (rev 1044) +++ trunk/grassaddons/gui/display_driver/driver.i 2007-08-22 08:52:05 UTC (rev 1045) @@ -12,4 +12,4 @@ %include "std_vector.i" namespace std { %template(IntVector) vector ; -} \ No newline at end of file +} Modified: trunk/grassaddons/gui/gui_modules/dbm.py =================================================================== --- trunk/grassaddons/gui/gui_modules/dbm.py 2007-08-20 19:49:58 UTC (rev 1044) +++ trunk/grassaddons/gui/gui_modules/dbm.py 2007-08-22 08:52:05 UTC (rev 1045) @@ -650,9 +650,11 @@ else: self.SetTitle(_("Display attributes")) - if not line or \ - (self.action != "add" and selected == 0): - continue + if self.action == "add": + pass + else: + if not line and selected == 0: + continue if line: self.selectedLines.append(line) @@ -729,7 +731,7 @@ mainSizer.Fit(self) if notebook.GetPageCount() == 0: - Debug.msg(4, "DisplayAttributesDialog(): Nothing found!") + Debug.msg(2, "DisplayAttributesDialog(): Nothing found!") self.mapInfo = None def __SelectAttributes(self, layer): Modified: trunk/grassaddons/gui/gui_modules/digit.py =================================================================== --- trunk/grassaddons/gui/gui_modules/digit.py 2007-08-20 19:49:58 UTC (rev 1044) +++ trunk/grassaddons/gui/gui_modules/digit.py 2007-08-22 08:52:05 UTC (rev 1045) @@ -182,10 +182,16 @@ cat = self.SetCategory() addstring="""%s 1 1 - %f %f\n%d %d""" % (key, x, y, layer, cat) + %f %f""" % (key, x, y) - Debug.msg (3, "VEdit.AddPoint(): map=%s, type=%s, layer=%d, cat=%d, x=%f, y=%f" % \ - (map, type, layer, cat, x, y)) + if layer > 0 and cat != "None": + addstring += "\n%d %d" % (layer, cat) + Debug.msg (3, "VEdit.AddPoint(): map=%s, type=%s, layer=%d, cat=%d, x=%f, y=%f" % \ + (map, type, layer, cat, x, y)) + else: + Debug.msg (3, "VEdit.AddPoint(): map=%s, type=%s, x=%f, y=%f" % \ + (map, type, x, y)) + Debug.msg (4, "Vline.AddPoint(): input=%s" % addstring) self._AddFeature (map=map, input=addstring, flags=['-s']) @@ -212,10 +218,14 @@ addstring += """%f %f\n""" % \ (float(point[0]), float(point [1])) - addstring += "%d %d" % (layer, cat) + if layer > 0 and cat != "None": + addstring += "\n%d %d" % (layer, cat) + Debug.msg (3, "Vline.AddLine(): type=%s, layer=%d, cat=%d coords=%s" % \ + (key, layer, cat, coords)) + else: + Debug.msg (3, "Vline.AddLine(): type=%s, layer=%d, cat=%d coords=%s" % \ + (key, coords)) - Debug.msg (3, "Vline.AddLine(): type=%s, layer=%d, cat=%d coords=%s" % \ - (key, layer, cat, coords)) Debug.msg (4, "Vline.AddLine(): input=%s" % addstring) self._AddFeature (map=map, input=addstring, flags=flags) @@ -237,21 +247,22 @@ # run the command vedit = cmd.Command(cmd=command, stdin=input) - # redraw map - #self.driver.ReDrawMap(map) + # reload map (needed for v.edit) + self.driver.ReloadMap() def DeleteSelectedLines(self): """Delete selected vector features from the vector map""" - selected = self.driver.GetSelected() + selected = self.driver.GetSelected() # grassId if len(selected) <= 0: return False + ids = ",".join(["%d" % v for v in selected]) + Debug.msg(4, "Digit.DeleteSelectedLines(): ids=%s" % \ - selected) + ids) - ids = ",".join(["%d" % v for v in selected]) command = [ "v.edit", "--q", "map=%s" % self.map, "tool=delete", @@ -260,8 +271,8 @@ # run the command vedit = cmd.Command(cmd=command) - # redraw map - self.driver.display.ReOpenMap() + # reload map (needed for v.edit) + self.driver.ReloadMap() return True @@ -276,13 +287,16 @@ def __MoveFeature(self, tool, coords, move): """Move selected vector feature or vertex""" - if not self.driver.selected: + selected = self.driver.GetSelected() + + if len(selected) <= 0: return False + ids = ",".join(["%d" % v for v in selected]) + Debug.msg(4, "Digit.MoveSelectedLines(): ids=%s, move=%s" % \ - (self.driver.selected, move)) + (ids, move)) - ids = ",".join(["%d" % v for v in self.driver.selected]) command = ["v.edit", "--q", "-s", # snap "map=%s" % self.map, "tool=%s" % tool, @@ -296,15 +310,16 @@ # run the command vedit = cmd.Command(cmd=command) - # redraw map - #self.driver.ReDrawMap(self.map) + # reload map (needed for v.edit) + self.driver.ReloadMap() return True def SplitLine(self, coords): """Split selected line on position 'coords'""" + try: - line = self.driver.selected[0] + line = self.driver.GetSelected()[0] except: return False @@ -319,7 +334,7 @@ vedit = cmd.Command(cmd=command) # redraw map - #self.driver.ReDrawMap(self.map) + self.driver.ReloadMap() return True @@ -334,7 +349,7 @@ def __ModifyVertex(self, coords, action): try: - line = self.driver.selected[0] + line = self.driver.GetSelected()[0] except: return False @@ -348,8 +363,8 @@ # run the command vedit = cmd.Command(cmd=command) - # redraw map - #self.driver.ReDrawMap(self.map) + # reload map (needed for v.edit) + self.driver.ReloadMap() return True @@ -397,27 +412,33 @@ # initialize wx display driver try: - self.display = DisplayDriver() + self.__display = DisplayDriver() except: - self.display = None + self.__display = None settings = self.parent.settings self.UpdateSettings() def Reset(self, map): + """Close map and open new one""" if map: name, mapset = map.split('@') - self.display.OpenMap(str(name), str(mapset)) + self.__display.OpenMap(str(name), str(mapset)) else: - self.display.CloseMap() + self.__display.CloseMap() + def ReloadMap(self): + """Reload map (close and re-open). Needed for v.edit.""" + + self.__display.ReloadMap() + def DrawMap(self, pdc): """Draw vector map layer content Return wx.Image """ - nlines = self.display.DrawMap(pdc) + nlines = self.__display.DrawMap(pdc) Debug.msg(3, "CDisplayDriver.DrawMap(): nlines=%d" % nlines) return nlines @@ -432,22 +453,67 @@ x1, y1 = rect[0] x2, y2 = rect[1] - nselected = self.display.SelectLinesByBox(x1, y1, x2, y2) + nselected = self.__display.SelectLinesByBox(x1, y1, x2, y2) Debug.msg(4, "CDisplayDriver.SelectLinesByBox(): selected=%d" % \ nselected) return nselected - def GetSelected(self): - """Get ids (grass) of selected vector features""" + def SelectLinesByPoint(self, point, onlyType=None): + """Select vector features by coordinates of click point. + Number of selected features can be decreased by 'onlyType' + ('None' for all types)""" + + nselected = self.__display.SelectLinesByPoint(point[0], point[1], + float(self.parent.threshold), + -1); + + Debug.msg(4, "CDisplayDriver.SelectLinesByPoint(): selected=%d" % \ + nselected) + + return nselected + + def GetSelected(self, grassId=True): + """Return ids of selected vector features - return self.display.GetSelected() + If grassId is True returns GRASS ids, otherwise + internal ids of objects drawn in PseudoDC""" + if grassId: + selected = self.__display.GetSelected(True) + else: + selected = self.__display.GetSelected(False) + + #Debug.msg(4, "CDisplayDriver.GetSelected(): grassId=%d, ids=%s" % \ + #grassId, ids) + + return selected + + def GetSelectedVertex(self, coords): + """Get PseudoDC id(s) of vertex (of selected line) + on position 'coords'""" + + x, y = coords + + id = self.__display.GetSelectedVertex(x, y) + + Debug.msg(4, "CDisplayDriver.GetSelectedVertex(): id=%d" % \ + id) + + return (id,) # return tuple + def Unselect(self): - """Unselect selected vector features""" - - self.display.Unselect() + """Delesect selected vector features""" + self.__display.Unselect() + + def SetSelected(self, id): + """Set selected vector features""" + + Debug.msg(4, "CDisplayDriver.SetSelected(): id=%s" % id) + + self.__display.SetSelected(id) + def SetRegion(self, reg): """Set geographical region @@ -455,7 +521,7 @@ Debug.msg(3, "CDisplayDriver.SetRegion(): %s" % reg) - self.display.SetRegion(reg['n'], + self.__display.SetRegion(reg['n'], reg['s'], reg['e'], reg['w'], @@ -467,10 +533,10 @@ settings = self.parent.settings # TODO map units - if not self.display: + if not self.__display: return - self.display.SetSettings (wx.Color(settings['symbolHighlight'][1][0], + self.__display.SetSettings (wx.Color(settings['symbolHighlight'][1][0], settings['symbolHighlight'][1][1], settings['symbolHighlight'][1][2], 255).GetRGB(), Modified: trunk/grassaddons/gui/gui_modules/mapdisp.py =================================================================== --- trunk/grassaddons/gui/gui_modules/mapdisp.py 2007-08-20 19:49:58 UTC (rev 1044) +++ trunk/grassaddons/gui/gui_modules/mapdisp.py 2007-08-22 08:52:05 UTC (rev 1045) @@ -832,7 +832,7 @@ if updateRecordDlg.mapInfo: # highlight feature & re-draw map self.parent.digit.driver.SetSelected(updateRecordDlg.selectedLines) - self.UpdateMap() + self.UpdateMap(render=False) if updateRecordDlg.ShowModal() == wx.ID_OK: sqlfile = tempfile.NamedTemporaryFile(mode="w") @@ -842,8 +842,9 @@ "--q", "input=%s" % sqlfile.name]) # unselect & re-draw - Digit.driver.SetSelected([]) - self.UpdateMap() + # PyDisplayDriver: Digit.driver.SetSelected([]) + self.parent.digit.driver.Unselect() + self.UpdateMap(render=False) else: # get decoration id self.lastpos = self.mouse['begin'] @@ -921,8 +922,10 @@ # -> move vertex self.moveIds = driver.GetSelectedVertex(self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1])) + print "#", self.moveIds elif digitToolbar.action in ["splitLine", "addVertex", "removeVertex"]: - self.parent.digit.driver.SelectLinesByPoint(self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1]), onlyType="line") + east, north = self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1]) + self.parent.digit.driver.SelectLinesByPoint((east, north), onlyType="line") self.UpdateMap(render=False) elif self.dragid != None: # end drag of overlay decoration @@ -1050,7 +1053,7 @@ layer=self.parent.digit.settings["layer"], cat=self.parent.digit.settings["category"], pos=posWindow, - action="addLine") + action="add") if addRecordDlg.mapInfo and \ addRecordDlg.ShowModal() == wx.ID_OK: sqlfile = tempfile.NamedTemporaryFile(mode="w") @@ -1066,7 +1069,7 @@ # -> delete selected vector features self.parent.digit.DeleteSelectedLines() elif digit.action in ["moveLine", "moveVertex"] and hasattr(self, "moveBegin"): - # pixel -> cell + # move vector feature move = [self.Distance((0,0), (self.moveBegin[0], 0))[0], self.Distance((0,0), (0, self.moveBegin[1]))[0]] # TODO d.measure # ES -> EN @@ -1076,21 +1079,31 @@ move[1] *= -1.0 if digit.action == "moveLine": + # move line self.parent.digit.MoveSelectedLines(move) - else: # moveVertex - self.parent.digit.MoveSelectedVertex(self.Pixel2Cell (self.moveCoords[0], self.moveCoords[1]),move) + else: + # move vertex + self.parent.digit.MoveSelectedVertex(self.Pixel2Cell (self.moveCoords[0], + self.moveCoords[1]), + move) del self.moveBegin del self.moveCoords del self.moveIds elif digit.action == "splitLine": - self.parent.digit.SplitLine(self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1])) + # split line + self.parent.digit.SplitLine(self.Pixel2Cell(self.mouse['begin'][0], + self.mouse['begin'][1])) elif digit.action == "addVertex": - self.parent.digit.AddVertex(self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1])) + # add vertex + self.parent.digit.AddVertex(self.Pixel2Cell(self.mouse['begin'][0], + self.mouse['begin'][1])) elif digit.action == "removeVertex": - self.parent.digit.RemoveVertex(self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1])) + # remove vertex + self.parent.digit.RemoveVertex(self.Pixel2Cell(self.mouse['begin'][0], + self.mouse['begin'][1])) - #self.parent.digit.driver.SetSelected([]) + # PyDisplayDriver: self.parent.digit.driver.SetSelected([]) self.parent.digit.driver.Unselect() self.UpdateMap(render=False) @@ -1110,7 +1123,7 @@ elif digit.action in ["deleteLine", "moveLine", "splitLine", "addVertex", "removeVertex", "moveVertex"]: # unselected selected features - # self.parent.digit.driver.SetSelect([]) + # PyDisplayDriver: self.parent.digit.driver.SetSelect([]) self.parent.digit.driver.Unselect() if digit.action in ["moveLine", "moveVertex"] and hasattr(self, "moveBegin"): del self.moveBegin @@ -1138,7 +1151,7 @@ if len(self.moveIds) > 0: # draw lines on new position for id in self.moveIds: - self.pdc.TranslateId(id, dx, dy) + self.pdcVector.TranslateId(id, dx, dy) self.Refresh() # TODO: use RefreshRect() self.mouse['begin'] = self.mouse['end'] @@ -1692,11 +1705,16 @@ def Pointer(self, event): """Pointer button clicled""" + self.MapWindow.mouse['use'] = "pointer" self.MapWindow.mouse['box'] = "point" # change the cursor - self.MapWindow.SetCursor(self.cursors["default"]) # default + if self.digittoolbar: + # digitization tool activated + self.MapWindow.SetCursor(self.cursors["cross"]) + else: + self.MapWindow.SetCursor(self.cursors["default"]) def OnZoomIn(self, event): """ From maldacker at grass.itc.it Thu Aug 23 00:26:15 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 00:26:15 2007 Subject: [grass-addons] r1046 - trunk/grassaddons/v.path.obstacles Message-ID: <200708222226.l7MMQFbU030501@grass.itc.it> Author: maldacker Date: 2007-08-23 00:26:07 +0200 (Thu, 23 Aug 2007) New Revision: 1046 Added: trunk/grassaddons/v.path.obstacles/proto.h Log: Added: trunk/grassaddons/v.path.obstacles/proto.h =================================================================== --- trunk/grassaddons/v.path.obstacles/proto.h (rev 0) +++ trunk/grassaddons/v.path.obstacles/proto.h 2007-08-22 22:26:07 UTC (rev 1046) @@ -0,0 +1,26 @@ +/**************************************************************** + * MODULE: v.path.obstacles + * + * AUTHOR(S): Maximilian Maldacker + * + * + * COPYRIGHT: (C) 2002-2005 by the GRASS Development Team + * + * This program is free software under the + * GNU General Public License (>=v2). + * Read the file COPYING that comes with GRASS + * for details. + * + ****************************************************************/ + + #ifndef PROTO_H + #define PROTO_H + +void load_lines( struct Map_info * map, struct Point ** points, int * num_points, struct Line ** lines, int * num_lines ); +void count( struct Map_info * map, int * num_points, int * num_lines); +void process_point( struct line_pnts * sites, struct Point ** points, int * index_point, int cat); +void process_line( struct line_pnts * sites, struct Point ** points, int * index_point, struct Line ** lines, int * index_line, int cat); +void process_boundary( struct line_pnts * sites, struct Point ** points, int * index_point, struct Line ** lines, int * index_line, int cat); +int add_points( char ** coor, struct Point ** points, int * num_points ); + +#endif Property changes on: trunk/grassaddons/v.path.obstacles/proto.h ___________________________________________________________________ Name: svn:eol-style + native From maldacker at grass.itc.it Thu Aug 23 00:34:39 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 00:34:41 2007 Subject: [grass-addons] r1047 - trunk/grassaddons/v.path.obstacles Message-ID: <200708222234.l7MMYdPV030532@grass.itc.it> Author: maldacker Date: 2007-08-23 00:33:56 +0200 (Thu, 23 Aug 2007) New Revision: 1047 Modified: trunk/grassaddons/v.path.obstacles/visibility.c Log: Modified: trunk/grassaddons/v.path.obstacles/visibility.c =================================================================== --- trunk/grassaddons/v.path.obstacles/visibility.c 2007-08-22 22:26:07 UTC (rev 1046) +++ trunk/grassaddons/v.path.obstacles/visibility.c 2007-08-22 22:33:56 UTC (rev 1047) @@ -15,7 +15,6 @@ /* TODO take in account if it is long/lat projection */ -/* TODO vis initialisation algorithm can be optimised with a scan line technic which runs in O( n log n ) instead of O( n^2 ); */ #include "visibility.h" @@ -23,35 +22,88 @@ */ void init_vis( struct Point * points, int num_points, struct Line * lines, int num_lines ) { - int i; - int j; - double current_distance; + double d; + struct avl_table * tree = avl_create( cmp_points, NULL, NULL ); + struct avl_traverser it; + struct Point * p; - double x,y; + double y1,y2; - for ( i = 0 ; i < num_points ; i++ ) + struct Point * s1, *s2; + + for ( i = 0 ; i < num_points ; i ++ ) { - current_distance = PORT_DOUBLE_MAX; + points[i].vis = NULL; + d = PORT_DOUBLE_MAX; + + avl_t_init( &it, tree); - for ( j = 0 ; j < num_lines ; j++ ) + /* loop through the tree */ + while( ( p = avl_t_next( &it ) ) != NULL ) { - if ( &lines[j] == segment1( &points[i]) || &lines[j] == segment2( &points[i])) - continue; - - /* if it's directly below, compute its distance to the last smallest found */ - if ( segment_intersect(&lines[j], &points[i], &x, &y) != -1 && y < points[i].y && (points[i].y - y) < current_distance) + /* test for intersection and get the intersecting point */ + if ( segment1(p) != NULL && segment_intersect( segment1(p), &points[i], &y1 ) > -1 ) { + /* find the closest one below */ + if ( y1 < points[i].y && (points[i].y - y1) < d) + { + d = points[i].y - y1; + points[i].vis = segment1(p); + + } + } - points[i].vis = &lines[j]; - current_distance = points[i].y - y; + + if ( segment2(p) != NULL && segment_intersect( segment2(p), &points[i], &y2 ) > -1 ) + { + if ( y2 < points[i].y && (points[i].y - y2) < d) + { + d = points[i].y - y2; + points[i].vis = segment2(p); + } } + + }/* end loop */ + + s1 = s2 = NULL ; + + /* now if the other point is on the right, we can delete it */ + if ( segment1(&points[i]) != NULL && cmp_points(&points[i], other1(&points[i]), NULL) > 0 ) + { + p = other1(&points[i]); + + /* unless the other point of it is on the left */ + if ( segment1(p) != NULL && other1(p) != &points[i] && cmp_points(&points[i], other1(p), NULL) > 0 ) + s1 = avl_delete( tree, p ); + else if ( segment2(p) != NULL && other2(p) != &points[i] && cmp_points(&points[i], other2(p), NULL) > 0 ) + s1 = avl_delete( tree, p ); } - + + /* now if the other point is on the right, we can delete it */ + if ( segment2(&points[i]) != NULL && cmp_points(&points[i], other2(&points[i]), NULL) > 0 ) + { + p = other2(&points[i]); + + /* unless the other point of it is on the left */ + if ( segment1(p) != NULL && other1(p) != &points[i] && cmp_points(&points[i], other1(p), NULL) > 0 ) + s2 = avl_delete( tree, p ); + else if ( segment2(p) != NULL && other2(p) != &points[i] && cmp_points(&points[i], other2(p), NULL) > 0 ) + s2 = avl_delete( tree, p ); + } + + /* if both weren't deleted, it means there is at least one other point on the left, so add the current */ + /* also there is no point adding the point if there is no segment attached to it */ + if ( (s1 == NULL || s2 == NULL ) && ( segment1(&points[i]) != NULL || segment2(&points[i]) != NULL )) + { + avl_insert( tree, &points[i] ); + } } - + + + avl_destroy(tree, NULL); } @@ -194,10 +246,11 @@ p_infinity->rightmost_son = NULL; init_stack(num_points); - + /* sort points in decreasing x order*/ quickSort( points, 0, num_points-1 ); - + + /* initialize the vis pointer of the vertices */ init_vis( points, num_points, lines, num_lines ); add_rightmost( p_ninfinity, p_infinity ); @@ -208,7 +261,7 @@ } push( &points[0] ); - + /* main loop */ while( !empty_stack() ) { @@ -256,7 +309,7 @@ push(p_r); } } - + G_free(p_infinity); G_free(p_ninfinity); } @@ -264,7 +317,7 @@ void visibility_points( struct Point * points, int num_points, struct Line * lines, int num_lines, struct Map_info * out, int n ) { - + int i,j,k; double x1,y1,z1,x2,y2,z2; @@ -285,14 +338,8 @@ break; } - G_message("Here k is %d",k); if ( k == num_lines ) - { - G_message("Reporting %f,%f and %f,%f", points[j].x, points[j].y, points[num_points-1-i].x, points[num_points-1-i].y); report( &points[num_points-i-1], &points[j], out ); - } } } - } - From maldacker at grass.itc.it Thu Aug 23 16:35:18 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 16:35:19 2007 Subject: [grass-addons] r1048 - trunk/grassaddons/v.path.obstacles Message-ID: <200708231435.l7NEZIUG008528@grass.itc.it> Author: maldacker Date: 2007-08-23 16:35:13 +0200 (Thu, 23 Aug 2007) New Revision: 1048 Modified: trunk/grassaddons/v.path.obstacles/Makefile trunk/grassaddons/v.path.obstacles/data_structures.c trunk/grassaddons/v.path.obstacles/data_structures.h trunk/grassaddons/v.path.obstacles/description.html trunk/grassaddons/v.path.obstacles/geometry.c trunk/grassaddons/v.path.obstacles/geometry.h trunk/grassaddons/v.path.obstacles/main.c Log: speed up preprocessing Modified: trunk/grassaddons/v.path.obstacles/Makefile =================================================================== --- trunk/grassaddons/v.path.obstacles/Makefile 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/Makefile 2007-08-23 14:35:13 UTC (rev 1048) @@ -6,7 +6,7 @@ LIBES = $(VECTLIB) $(GISLIB) DEPENDENCIES = $(VECTDEP) $(GISDEP) EXTRA_INC = $(VECT_INC) -EXTRA_CFLAGS = $(VECT_CFLAGS) +EXTRA_CFLAGS = $(VECT_CFLAGS) -Wall include $(MODULE_TOPDIR)/include/Make/Module.make Modified: trunk/grassaddons/v.path.obstacles/data_structures.c =================================================================== --- trunk/grassaddons/v.path.obstacles/data_structures.c 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/data_structures.c 2007-08-23 14:35:13 UTC (rev 1048) @@ -49,11 +49,10 @@ /** compare the points along the x axis */ -int cmp_points(struct Point * v1, struct Point* v2) +int cmp_points( const void * v1, const void* v2, void * param) { - struct Point *p1, *p2; - p1 = (struct Point*) v1; - p2 = (struct Point*) v2; + struct Point * p1 = (struct Point * ) v1; + struct Point * p2 = (struct Point * ) v2; if( p1->x < p2->x ) return 1; @@ -93,8 +92,8 @@ while( 1) { - do ++i; while( cmp_points(&a[i], &pivot) < 1 && i <= r ); - do --j; while( cmp_points(&a[j], &pivot) == 1 ); + do ++i; while( cmp_points(&a[i], &pivot, NULL) < 1 && i <= r ); + do --j; while( cmp_points(&a[j], &pivot, NULL) == 1 ); if( i >= j ) break; Modified: trunk/grassaddons/v.path.obstacles/data_structures.h =================================================================== --- trunk/grassaddons/v.path.obstacles/data_structures.h 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/data_structures.h 2007-08-23 14:35:13 UTC (rev 1048) @@ -28,8 +28,10 @@ static int stack_index = 0; static struct Point ** stack = NULL; -int cmp_points(struct Point * v1, struct Point* v2); +int cmp_points(const void* v1, const void* v2, void * param); + void quickSort( struct Point a[], int l, int r); int partition( struct Point a[], int l, int r); + #endif \ No newline at end of file Modified: trunk/grassaddons/v.path.obstacles/description.html =================================================================== --- trunk/grassaddons/v.path.obstacles/description.html 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/description.html 2007-08-23 14:35:13 UTC (rev 1048) @@ -1,19 +1,41 @@ DESCRIPTION
-v.path.obstacles Computes the visibility graph of a map containing lines. This is the graph with vertices the end point of the lines and the edges are between two visibiles vertices. Two points are visibible if there no segments in between them, i.e. there are no lines e where the segment pq intersects it. -+
v.path.obstacles Computes the visibility graph of a vector map containing lines, areas ( boundaries ) and points. The visibility graph is the graph where the nodes are the end point of the lines, boundaries or simply the points. There is an edge between two nodes if they are 'visible'. Two nodes are visibible if there is no segments in between them, i.e. the edge doesn't intersect any line or boundary in the vector map. This is useful to compute the sortest path in a vector map from any two points. To do this, first you need to compute the visibility graph and from it compute the shortest path using v.net.path or d.path. +
-The first argument is the input map. It supports lines and boudaries ( so areas ). For the algorithm to work, lines must not be intersecting. +IMPORTANT : the algorithm doesn't work well with intersecting lines ( that includes overlapping ) + ++If you compute a shortest path after computing the visibility graph you will notice that this path might go through a vertix of a line. If this is not wanted you might to run the map through v.buffer first whith a small value. Example:
Modified: trunk/grassaddons/v.path.obstacles/description.html =================================================================== --- trunk/grassaddons/v.path.obstacles/description.html 2007-08-31 17:05:53 UTC (rev 1060) +++ trunk/grassaddons/v.path.obstacles/description.html 2007-08-31 20:20:37 UTC (rev 1061) @@ -9,7 +9,7 @@ If you compute a shortest path after computing the visibility graph you will notice that this path might go through a vertix of a line. If this is not wanted you might to run the map through v.buffer first whith a small value. Example:+v.buffer input=map output=bufferedmap buffer=1 type=point,line,area,boundary +
+ + + ++The first argument is the input map. It supports lines, boudaries ( so areas ) and points. For the algorithm to work lines and boundaries must not be intersecting ( that includes overlapping ). +
-The result map containing the visibility graph of the input map +The result map containing the visibility graph is given in the output mapinput=map
+ +If you need to add additional points to compute a shortest path between them afterwards you can use the coordinate parameter. +output=map2
+where 25556200,6686400 are the coordinate of the first point and 25556400,6686600 are the coordinates of the second point. Of course you can give as many points as you want. They will be added to the visibility graph and edges from them will be computed. You can always add those points after computing the visibility graph. Simply use the vis parameter. The input will be the original vector map, the vis will be the computed visibility graph and the output the new visibility graph which will be the vis + the new points given with coordinate ( edges will be computed as well ). ++coordinate=25556200,6686400,25556400,6686600 +
+ ++v.net.visibility input=map vis=vis_map output=new_vis_map coordinate=25556200,6686400,25556400,6686600 +
EXAMPLE
-Modified: trunk/grassaddons/v.path.obstacles/geometry.c =================================================================== --- trunk/grassaddons/v.path.obstacles/geometry.c 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/geometry.c 2007-08-23 14:35:13 UTC (rev 1048) @@ -88,7 +88,7 @@ /** returns 1 if the segment intersect with the half line starting from p pointing downards x and y are the intersection point */ -int segment_intersect( struct Line * line, struct Point * p, double * x, double * y ) +int segment_intersect( struct Line * line, struct Point * p, double * y ) { struct Point * p1 = line->p1; struct Point * p2 = line->p2; @@ -98,7 +98,6 @@ { t = ( p->x - p1->x ) / ( p2->x - p1->x ); - *x = p->x; *y = p1->y + t * ( p2->y - p1->y ); return 1; Modified: trunk/grassaddons/v.path.obstacles/geometry.h =================================================================== --- trunk/grassaddons/v.path.obstacles/geometry.h 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/geometry.h 2007-08-23 14:35:13 UTC (rev 1048) @@ -28,7 +28,7 @@ int left_turn( struct Point * p1, struct Point * p2, struct Point * p3 ); int before( struct Point * p, struct Point * q, struct Line * e ); -int segment_intersect( struct Line * line, struct Point * p, double * x, double * y ); +int segment_intersect( struct Line * line, struct Point * p, double * y ); #endif Modified: trunk/grassaddons/v.path.obstacles/main.c =================================================================== --- trunk/grassaddons/v.path.obstacles/main.c 2007-08-22 22:33:56 UTC (rev 1047) +++ trunk/grassaddons/v.path.obstacles/main.c 2007-08-23 14:35:13 UTC (rev 1048) @@ -79,6 +79,12 @@ if(Vect_open_old(&in, input->answer, mapset) < 1) /* opens the map */ G_fatal_error(_("Could not open input")); + if (Vect_open_new(&out, output->answer, WITHOUT_Z) < 0) + { + Vect_close(&in); + G_fatal_error(_("Could not open output")); + } + if ( ovis->answer != NULL ) { mapset = G_find_vector2( ovis->answer, NULL ); @@ -86,38 +92,23 @@ if( Vect_open_old(&vis, ovis->answer, mapset) < 1 ) G_fatal_error("Could not open vis"); - if(Vect_copy( ovis->answer, mapset, output->answer, NULL) < 0 ) - G_fatal_error("Could not copy map"); - - mapset = G_find_vector2( output->answer, NULL ); - - if( Vect_open_old(&out, output->answer, mapset) < 1 ) - G_fatal_error("Could not open vis"); + if ( Vect_copy_map_lines (&vis, &out) > 0 ) + G_fatal_error("Could not copy elements"); } - else - { - if (Vect_open_new(&out, output->answer, WITHOUT_Z) < 0) - { - Vect_close(&in); - G_fatal_error(_("Could not open output")); - } - } if (G_projection () == PROJECTION_LL) G_warning("We are in LL projection"); load_lines( &in, &points, &num_points, &lines, &num_lines); - if ( coor->answers != NULL ) n = add_points( coor->answers, &points, &num_points); - - G_message("We have %d new points", n ); if ( ovis->answer == NULL ) construct_visibility( points, num_points, lines, num_lines, &out ); else + visibility_points( points, num_points, lines, num_lines, &out, n ); G_free(points); @@ -238,8 +229,6 @@ *points = G_malloc( *num_points * sizeof( struct Point )); *lines = G_malloc( *num_lines * sizeof( struct Line )); - - while( ( type = Vect_read_next_line( map, sites, cats) ) > -1 ) { @@ -253,8 +242,8 @@ else if ( type == GV_POINT ) process_point( sites, points, &index_point, -1); - } + } void process_point( struct line_pnts * sites, struct Point ** points, int * index_point, int cat) From maldacker at grass.itc.it Thu Aug 23 16:41:47 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 16:41:48 2007 Subject: [grass-addons] r1049 - trunk/grassaddons/v.path.obstacles Message-ID: <200708231441.l7NEfluE008568@grass.itc.it> Author: maldacker Date: 2007-08-23 16:41:44 +0200 (Thu, 23 Aug 2007) New Revision: 1049 Modified: trunk/grassaddons/v.path.obstacles/data_structures.h trunk/grassaddons/v.path.obstacles/geometry.c trunk/grassaddons/v.path.obstacles/main.c Log: removed warnings Modified: trunk/grassaddons/v.path.obstacles/data_structures.h =================================================================== --- trunk/grassaddons/v.path.obstacles/data_structures.h 2007-08-23 14:35:13 UTC (rev 1048) +++ trunk/grassaddons/v.path.obstacles/data_structures.h 2007-08-23 14:41:44 UTC (rev 1049) @@ -34,4 +34,4 @@ int partition( struct Point a[], int l, int r); -#endif \ No newline at end of file +#endif Modified: trunk/grassaddons/v.path.obstacles/geometry.c =================================================================== --- trunk/grassaddons/v.path.obstacles/geometry.c 2007-08-23 14:35:13 UTC (rev 1048) +++ trunk/grassaddons/v.path.obstacles/geometry.c 2007-08-23 14:41:44 UTC (rev 1049) @@ -105,4 +105,4 @@ else return -1; -} \ No newline at end of file +} Modified: trunk/grassaddons/v.path.obstacles/main.c =================================================================== --- trunk/grassaddons/v.path.obstacles/main.c 2007-08-23 14:35:13 UTC (rev 1048) +++ trunk/grassaddons/v.path.obstacles/main.c 2007-08-23 14:41:44 UTC (rev 1049) @@ -33,7 +33,7 @@ struct Point * points; struct Line * lines; int num_points, num_lines; - int n; + int n = 0; From maldacker at grass.itc.it Thu Aug 23 16:51:29 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 16:51:30 2007 Subject: [grass-addons] r1050 - trunk/grassaddons/v.path.obstacles Message-ID: <200708231451.l7NEpTsq009495@grass.itc.it> Author: maldacker Date: 2007-08-23 16:51:26 +0200 (Thu, 23 Aug 2007) New Revision: 1050 Modified: trunk/grassaddons/v.path.obstacles/data_structures.c trunk/grassaddons/v.path.obstacles/data_structures.h trunk/grassaddons/v.path.obstacles/geometry.c Log: bug correction Modified: trunk/grassaddons/v.path.obstacles/data_structures.c =================================================================== --- trunk/grassaddons/v.path.obstacles/data_structures.c 2007-08-23 14:41:44 UTC (rev 1049) +++ trunk/grassaddons/v.path.obstacles/data_structures.c 2007-08-23 14:51:26 UTC (rev 1050) @@ -15,6 +15,10 @@ #include "data_structures.h" +/* stack variables */ +static int stack_index = 0; +static struct Point ** stack = NULL; + struct Point * pop() { stack_index--; @@ -156,3 +160,5 @@ } + + Modified: trunk/grassaddons/v.path.obstacles/data_structures.h =================================================================== --- trunk/grassaddons/v.path.obstacles/data_structures.h 2007-08-23 14:41:44 UTC (rev 1049) +++ trunk/grassaddons/v.path.obstacles/data_structures.h 2007-08-23 14:51:26 UTC (rev 1050) @@ -25,9 +25,6 @@ int empty_stack(); void init_stack(); -static int stack_index = 0; -static struct Point ** stack = NULL; - int cmp_points(const void* v1, const void* v2, void * param); void quickSort( struct Point a[], int l, int r); Modified: trunk/grassaddons/v.path.obstacles/geometry.c =================================================================== --- trunk/grassaddons/v.path.obstacles/geometry.c 2007-08-23 14:41:44 UTC (rev 1049) +++ trunk/grassaddons/v.path.obstacles/geometry.c 2007-08-23 14:51:26 UTC (rev 1050) @@ -96,9 +96,19 @@ if ( in_between(p, line ) ) { - t = ( p->x - p1->x ) / ( p2->x - p1->x ); + if ( p2->x != p1->x ) + { + t = ( p->x - p1->x ) / ( p2->x - p1->x ); - *y = p1->y + t * ( p2->y - p1->y ); + *y = p1->y + t * ( p2->y - p1->y ); + } + else + { + if ( p1->y > p->y || p2->y > p->y ) + return -1; + + *y = p1->y > p2->y ? p1->y : p2->y; + } return 1; } From maldacker at grass.itc.it Thu Aug 23 19:41:47 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 19:41:59 2007 Subject: [grass-addons] r1051 - trunk/grassaddons/v.path.obstacles Message-ID: <200708231741.l7NHfl22011170@grass.itc.it> Author: maldacker Date: 2007-08-23 19:41:40 +0200 (Thu, 23 Aug 2007) New Revision: 1051 Modified: trunk/grassaddons/v.path.obstacles/main.c trunk/grassaddons/v.path.obstacles/proto.h trunk/grassaddons/v.path.obstacles/rotation_tree.c trunk/grassaddons/v.path.obstacles/visibility.c Log: memory allocation bug fix Modified: trunk/grassaddons/v.path.obstacles/main.c =================================================================== --- trunk/grassaddons/v.path.obstacles/main.c 2007-08-23 14:51:26 UTC (rev 1050) +++ trunk/grassaddons/v.path.obstacles/main.c 2007-08-23 17:41:40 UTC (rev 1051) @@ -100,15 +100,34 @@ if (G_projection () == PROJECTION_LL) G_warning("We are in LL projection"); + + /* counting how many points and lines we have to allocate */ + count( &in, &num_points, &num_lines); + + G_message("We have %d poitns", num_points); + + /* modify the number if we have new points to add */ + if ( coor->answers != NULL ) + num_points+= count_new( coor->answers ); + + G_message("Now we have %d points", num_points); + + /* and allocate */ + points = G_malloc( num_points * sizeof( struct Point )); + lines = G_malloc( num_lines * sizeof( struct Line )); + + /* and finally set the lines */ load_lines( &in, &points, &num_points, &lines, &num_lines); - + G_message("And now we have %d points", num_points); + if ( coor->answers != NULL ) - n = add_points( coor->answers, &points, &num_points); + add_points( coor->answers, &points, &num_points); + + G_message("And finally we have %d points", num_points); if ( ovis->answer == NULL ) construct_visibility( points, num_points, lines, num_lines, &out ); else - visibility_points( points, num_points, lines, num_lines, &out, n ); G_free(points); @@ -121,13 +140,10 @@ } -/** add points to the visibility graph -*/ -int add_points( char ** coor, struct Point ** points, int * index_point ) +/* count how many new points we have to add */ +int count_new( char ** coor ) { - int i, n; - double x, y; - + int n, i; /* first count how many points we are going to add */ n = 0; i = 0; while ( coor[i] != NULL ) @@ -136,8 +152,15 @@ i+=2; } - /* resizing points acordingly */ - *points = G_realloc( *points, (*index_point+n)*sizeof( struct Point ) ); + return n; +} + +/** add points to the visibility graph +*/ +void add_points( char ** coor, struct Point ** points, int * index_point ) +{ + int i; + double x, y; /* and defining the points */ @@ -161,8 +184,6 @@ (*index_point)++; } - - return n; } /** counts the number of individual segments ( boundaries and lines ) and vertices @@ -224,11 +245,6 @@ sites = Vect_new_line_struct(); cats = Vect_new_cats_struct(); - count( map, num_points, num_lines); - - *points = G_malloc( *num_points * sizeof( struct Point )); - *lines = G_malloc( *num_lines * sizeof( struct Line )); - while( ( type = Vect_read_next_line( map, sites, cats) ) > -1 ) { @@ -243,6 +259,9 @@ process_point( sites, points, &index_point, -1); } + + *num_points = index_point; + *num_lines = index_line; } Modified: trunk/grassaddons/v.path.obstacles/proto.h =================================================================== --- trunk/grassaddons/v.path.obstacles/proto.h 2007-08-23 14:51:26 UTC (rev 1050) +++ trunk/grassaddons/v.path.obstacles/proto.h 2007-08-23 17:41:40 UTC (rev 1051) @@ -21,6 +21,8 @@ void process_point( struct line_pnts * sites, struct Point ** points, int * index_point, int cat); void process_line( struct line_pnts * sites, struct Point ** points, int * index_point, struct Line ** lines, int * index_line, int cat); void process_boundary( struct line_pnts * sites, struct Point ** points, int * index_point, struct Line ** lines, int * index_line, int cat); -int add_points( char ** coor, struct Point ** points, int * num_points ); +void add_points( char ** coor, struct Point ** points, int * num_points ); +int count_new( char ** coor); + #endif Modified: trunk/grassaddons/v.path.obstacles/rotation_tree.c =================================================================== --- trunk/grassaddons/v.path.obstacles/rotation_tree.c 2007-08-23 14:51:26 UTC (rev 1050) +++ trunk/grassaddons/v.path.obstacles/rotation_tree.c 2007-08-23 17:41:40 UTC (rev 1051) @@ -79,8 +79,7 @@ r->left_brother = l; if ( f->rightmost_son == p ) - //f->rightmost_son = NULL; - f->rightmost_son = l; + f->rightmost_son = NULL; p->father = NULL; p->left_brother = NULL; Modified: trunk/grassaddons/v.path.obstacles/visibility.c =================================================================== --- trunk/grassaddons/v.path.obstacles/visibility.c 2007-08-23 14:51:26 UTC (rev 1050) +++ trunk/grassaddons/v.path.obstacles/visibility.c 2007-08-23 17:41:40 UTC (rev 1051) @@ -43,6 +43,8 @@ /* loop through the tree */ while( ( p = avl_t_next( &it ) ) != NULL ) { + if ( segment1(p) == NULL && segment2(p) == NULL) + continue; /* test for intersection and get the intersecting point */ if ( segment1(p) != NULL && segment_intersect( segment1(p), &points[i], &y1 ) > -1 ) @@ -96,7 +98,7 @@ /* if both weren't deleted, it means there is at least one other point on the left, so add the current */ /* also there is no point adding the point if there is no segment attached to it */ - if ( (s1 == NULL || s2 == NULL ) && ( segment1(&points[i]) != NULL || segment2(&points[i]) != NULL )) + if ( (s1 == NULL || s2 == NULL ) ) { avl_insert( tree, &points[i] ); } From maldacker at grass.itc.it Thu Aug 23 20:03:51 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Thu Aug 23 20:03:54 2007 Subject: [grass-addons] r1052 - trunk/grassaddons/v.path.obstacles Message-ID: <200708231803.l7NI3p4e012512@grass.itc.it> Author: maldacker Date: 2007-08-23 20:03:48 +0200 (Thu, 23 Aug 2007) New Revision: 1052 Modified: trunk/grassaddons/v.path.obstacles/description.html Log: update of the documentation Modified: trunk/grassaddons/v.path.obstacles/description.html =================================================================== --- trunk/grassaddons/v.path.obstacles/description.html 2007-08-23 17:41:40 UTC (rev 1051) +++ trunk/grassaddons/v.path.obstacles/description.html 2007-08-23 18:03:48 UTC (rev 1052) @@ -36,14 +36,48 @@EXAMPLE
+EXAMPLE 1
+A simple example showing how to use the module +++v.path.obstacles input=lines output=graph
+d.vect graph
+d.vect lines col=red
+EXAMPLE 2
+An example on how to use v.buffer with the module+ + ++v.buffer input=lines output=buffered_lines buffer=1 +v.path.obstacles input=buffered_lines output=graph
+d.vect graph
+d.vect lines col=red
+EXAMPLE 3
+An example on how to use the coordinate parameter. This will compute the visibility graph of the vector map lines with the point 2555678,6686343 ++ ++v.path.obstacles input=lines output=graph coordinate=2555678,6686343
+d.vect graph
+d.vect lines col=red
+EXAMPLE 4
+An example on how to use the coordinate parameter with the vis parameter. Here the vector map graph is computed then a new visibility graph is computed from it with the point 2555678,6686343 extra ++v.path.obstacles input=lines output=graph
d.vect graph
d.vect lines col=red
+v.path.obstacles input=lines vis=graph output=new_graph coordinate=2555678,6686343
+d.erase +d.vect new_graph +d.vect lines col=redKNOWN BUGS
+In some cases when 3 points or nodes are collinear, some wrong edges are added. This happens only really rarly and shouldn't be a big problem. +When two points have the exact same x coordinate and are visible, some wrong edges are added. +SEE ALSO
d.path, @@ -58,4 +92,4 @@ Maximilian Maldacker -Last changed: Date: 03/07/2007 +
Last changed: Date: 23/08/2007 From neteler at grass.itc.it Thu Aug 23 23:10:34 2007 From: neteler at grass.itc.it (neteler@grass.itc.it) Date: Thu Aug 23 23:10:35 2007 Subject: [grass-addons] r1053 - trunk/grassaddons/v.path.obstacles Message-ID: <200708232110.l7NLAYtr014275@grass.itc.it> Author: neteler Date: 2007-08-23 23:10:32 +0200 (Thu, 23 Aug 2007) New Revision: 1053 Modified: trunk/grassaddons/v.path.obstacles/description.html Log: close dif tag Modified: trunk/grassaddons/v.path.obstacles/description.html =================================================================== --- trunk/grassaddons/v.path.obstacles/description.html 2007-08-23 18:03:48 UTC (rev 1052) +++ trunk/grassaddons/v.path.obstacles/description.html 2007-08-23 21:10:32 UTC (rev 1053) @@ -9,7 +9,7 @@ If you compute a shortest path after computing the visibility graph you will notice that this path might go through a vertix of a line. If this is not wanted you might to run the map through v.buffer first whith a small value. Example:
From maldacker at grass.itc.it Fri Aug 24 18:48:29 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Fri Aug 24 18:48:30 2007 Subject: [grass-addons] r1054 - trunk/grassaddons/v.path.obstacles Message-ID: <200708241648.l7OGmTYr025531@grass.itc.it> Author: maldacker Date: 2007-08-24 18:48:27 +0200 (Fri, 24 Aug 2007) New Revision: 1054 Modified: trunk/grassaddons/v.path.obstacles/main.c Log: message removal Modified: trunk/grassaddons/v.path.obstacles/main.c =================================================================== --- trunk/grassaddons/v.path.obstacles/main.c 2007-08-23 21:10:32 UTC (rev 1053) +++ trunk/grassaddons/v.path.obstacles/main.c 2007-08-24 16:48:27 UTC (rev 1054) @@ -104,13 +104,9 @@ /* counting how many points and lines we have to allocate */ count( &in, &num_points, &num_lines); - G_message("We have %d poitns", num_points); - /* modify the number if we have new points to add */ if ( coor->answers != NULL ) num_points+= count_new( coor->answers ); - - G_message("Now we have %d points", num_points); /* and allocate */ points = G_malloc( num_points * sizeof( struct Point )); @@ -118,12 +114,9 @@ /* and finally set the lines */ load_lines( &in, &points, &num_points, &lines, &num_lines); - G_message("And now we have %d points", num_points); if ( coor->answers != NULL ) add_points( coor->answers, &points, &num_points); - - G_message("And finally we have %d points", num_points); if ( ovis->answer == NULL ) construct_visibility( points, num_points, lines, num_lines, &out ); From maldacker at grass.itc.it Fri Aug 24 21:17:32 2007 From: maldacker at grass.itc.it (maldacker@grass.itc.it) Date: Fri Aug 24 21:17:43 2007 Subject: [grass-addons] r1055 - trunk/grassaddons/v.path.obstacles Message-ID: <200708241917.l7OJHW7o027060@grass.itc.it> Author: maldacker Date: 2007-08-24 21:17:29 +0200 (Fri, 24 Aug 2007) New Revision: 1055 Modified: trunk/grassaddons/v.path.obstacles/description.html Log: added mentor in doc Modified: trunk/grassaddons/v.path.obstacles/description.html =================================================================== --- trunk/grassaddons/v.path.obstacles/description.html 2007-08-24 16:48:27 UTC (rev 1054) +++ trunk/grassaddons/v.path.obstacles/description.html 2007-08-24 19:17:29 UTC (rev 1055) @@ -9,7 +9,7 @@ If you compute a shortest path after computing the visibility graph you will notice that this path might go through a vertix of a line. If this is not wanted you might to run the map through v.buffer first whith a small value. Example:v.buffer input=map output=bufferedmap buffer=1 type=point,line,area,boundary -
++ @@ -89,7 +89,7 @@ v.to.dbv.buffer input=map output=bufferedmap buffer=1 type=point,line,area,boundary -
AUTHOR
- Maximilian Maldacker +Mentor : Wolf BergenheimLast changed: Date: 23/08/2007 From barton at grass.itc.it Wed Aug 29 05:26:26 2007 From: barton at grass.itc.it (barton@grass.itc.it) Date: Wed Aug 29 05:26:28 2007 Subject: [grass-addons] r1056 - trunk/grassaddons/gui Message-ID: <200708290326.l7T3QQAm006741@grass.itc.it> Author: barton Date: 2007-08-29 05:26:06 +0200 (Wed, 29 Aug 2007) New Revision: 1056 Modified: trunk/grassaddons/gui/wxgui.py Log: Code for georectifier (not yet functional) Modified: trunk/grassaddons/gui/wxgui.py =================================================================== --- trunk/grassaddons/gui/wxgui.py 2007-08-24 19:17:29 UTC (rev 1055) +++ trunk/grassaddons/gui/wxgui.py 2007-08-29 03:26:06 UTC (rev 1056) @@ -56,7 +56,6 @@ import gui_modules.wxgui_utils as wxgui_utils import gui_modules.mapdisp as mapdisp -import gui_modules.render as render import gui_modules.menudata as menudata import gui_modules.menuform as menuform import gui_modules.grassenv as grassenv @@ -66,6 +65,8 @@ import gui_modules.rules as rules import gui_modules.utils as utils import gui_modules.cmd as cmd +import gui_modules.georect as georect + from icons.icon import Icons as Icons from gui_modules.debug import Debug as Debug @@ -291,7 +292,8 @@ """ Launch georectifier module """ - pass + print 'launch georect' + georect.GeorectWizard(self) def OnMapsets(self, event): """ From barton at grass.itc.it Wed Aug 29 05:27:40 2007 From: barton at grass.itc.it (barton@grass.itc.it) Date: Wed Aug 29 05:27:46 2007 Subject: [grass-addons] r1057 - trunk/grassaddons/gui/gui_modules Message-ID: <200708290327.l7T3RedQ006761@grass.itc.it> Author: barton Date: 2007-08-29 05:27:05 +0200 (Wed, 29 Aug 2007) New Revision: 1057 Modified: trunk/grassaddons/gui/gui_modules/georect.py Log: Working on georectifier code. Set up is now a wizard. Modified: trunk/grassaddons/gui/gui_modules/georect.py =================================================================== --- trunk/grassaddons/gui/gui_modules/georect.py 2007-08-29 03:26:06 UTC (rev 1056) +++ trunk/grassaddons/gui/gui_modules/georect.py 2007-08-29 03:27:05 UTC (rev 1057) @@ -30,6 +30,8 @@ import wx import wx.aui import wx.lib.filebrowsebutton as filebrowse +import wx.wizard as wiz +import wx.lib.rcsizer as rcs from threading import Thread try: @@ -88,6 +90,246 @@ def StartUp(self): pass +class TitledPage(wiz.WizardPageSimple): + """ + Class to make wizard pages. Generic methods to make + labels, text entries, and buttons. + """ + def __init__(self, parent, title): + wiz.WizardPageSimple.__init__(self, parent) + + self.title = wx.StaticText(self,-1,title) + self.title.SetFont(wx.Font(13, wx.SWISS, wx.NORMAL, wx.BOLD)) + self.sizer = wx.BoxSizer(wx.VERTICAL) + +# self.sizer = rcs.RowColSizer() + tmpsizer = wx.BoxSizer(wx.VERTICAL) + + tmpsizer.Add(self.title, 0, wx.ALIGN_CENTRE|wx.ALL, 5) + tmpsizer.AddSpacer(10) + tmpsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND|wx.ALL, 0) + tmpsizer.Add(self.sizer, wx.EXPAND) + + self.SetSizer(tmpsizer) + self.SetAutoLayout(True) + tmpsizer.Fit(self) +# self.SetSizer(self.sizer) +# self.sizer.Fit(tmpsizer) + + + def SwitchLocMapset(self, location, mapset): + cmdlst = ['g.mapset','mapset=%s' % mapset,'location=%s' % location,'--q'] + cmd.Command(cmdlist) + + +class GeorectWizard(object): + """ + Start wizard here and finish wizard here + """ + + def __init__(self, parent): + wizbmp = wx.Image(os.path.join(os.getenv("GISBASE"),"etc","wx","images","wizard.png"), wx.BITMAP_TYPE_PNG) + wizbmp.Rescale(250,600) + wizbmp = wizbmp.ConvertToBitmap() + + self.parent = parent + + #set environmental variables + cmdlist = ['g.gisenv', 'get=GISDBASE'] + self.grassdatabase = cmd.Command(cmdlist).module_stdout.read().strip() + + cmdlist = ['g.gisenv', 'get=LOCATION_NAME'] + self.curr_location = cmd.Command(cmdlist).module_stdout.read().strip() + + cmdlist = ['g.gisenv', 'get=MAPSET'] + self.curr_mapset = cmd.Command(cmdlist).module_stdout.read().strip() + + self.StartDir = os.path.join(self.grassdatabase,self.curr_location) + self.maptype = '' + self.xy_grassdatabase = '' + self.xy_locationPath = '' + self.xy_location = '' + self.xy_mapset = '' + self.xy_mapsetPath = '' + self.xy_groupPath = '' + self.xy_group = '' + self.xy_dispmap = '' + + # define wizard pages + self.wizard = wiz.Wizard(parent, -1, "Setup for georectification") + self.startpage = LocationPage(self.wizard, self, self.StartDir) + self.grouppage = GroupPage(self.wizard, self, self.xy_groupPath) + self.mappage = DispMapPage(self.wizard, self, self.curr_location, \ + self.curr_mapset, self.xy_location, \ + self.xy_mapset) + + # Set the initial order of the pages + self.startpage.SetNext(self.grouppage) + + self.grouppage.SetPrev(self.startpage) + self.grouppage.SetNext(self.mappage) + + self.mappage.SetPrev(self.grouppage) + + self.wizard.FitToPage(self.startpage) + + success = False + + if self.wizard.RunWizard(self.startpage): + success = self.onWizFinished() + if success == True: + pass + else: + wx.MessageBox("Georectifying setup canceled.") + else: + wx.MessageBox("Georectifying setup canceled.") + +# self.wizard.Destroy() + + def onWizFinished(self): + return success + +class LocationPage(TitledPage): + """ + Set map type (raster or vector) to georectify and + select location/mapset of map(s) to georectify. + """ + def __init__(self, wizard, parent, startDir): + TitledPage.__init__(self, wizard, "Select map type and location/mapset") + + self.parent = parent + self.StartDir = startDir + + box = wx.BoxSizer(wx.HORIZONTAL) + self.rb_maptype = wx.RadioBox(self, -1, "Map type to georectify", + wx.DefaultPosition, wx.DefaultSize, + ['raster','vector'], 2, wx.RA_SPECIFY_COLS) + box.Add(self.rb_maptype, 0, wx.ALIGN_CENTER|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + + box = wx.BoxSizer(wx.HORIZONTAL) + self.dbb_mapset = filebrowse.DirBrowseButton( + self, wx.ID_ANY, size=(450, -1), + labelText='Select mapset: ', + buttonText='Browse ...', + toolTip='Select mapset of maps to georeference', + dialogTitle='Mapsets', + startDirectory=self.StartDir, + changeCallback = self.On_dbb_mapset) + box.Add(self.dbb_mapset, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + + self.Bind(wiz.EVT_WIZARD_PAGE_CHANGING, self.onPageChanging) + self.Bind(wiz.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged) + + def On_dbb_mapset(self,event): + self.parent.xy_mapsetPath = event.GetString() + self.StartDir = self.parent.xy_mapsetPath + print 'general start =',self.StartDir + + def onPageChanging(self,event=None): + if event.GetDirection() and self.parent.xy_mapsetPath == '': + wx.MessageBox('You must select a valid location and mapset in order to continue') + event.Veto() + return + + def OnPageChanged(self,event=None): + self.parent.xy_locationPath,self.parent.xy_mapset = os.path.split(self.parent.xy_mapsetPath) + self.parent.xy_grassdatabase, self.parent.xy_location = os.path.split(self.parent.xy_locationPath) + self.parent.xy_groupPath = os.path.join(self.parent.xy_mapsetPath,'group') + +class GroupPage(TitledPage): + """ + Set group to georectify. Create group if desired. + """ + def __init__(self, wizard, parent, startDir): + TitledPage.__init__(self, wizard, "Select image/map group to georectify") + + self.parent = parent + self.path = '' + self.StartDir = startDir + + box = wx.BoxSizer(wx.HORIZONTAL) + self.dbb_group = filebrowse.DirBrowseButton( + self, wx.ID_ANY, size=(450, -1), + labelText='Select group: ', + buttonText='Browse ...', + toolTip='Select group of images or maps to georeference', + dialogTitle='Groups', + startDirectory=self.StartDir, + changeCallback = self.On_dbb_group) + box.Add(self.dbb_group, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + + box = wx.BoxSizer(wx.HORIZONTAL) + label = wx.StaticText(self, -1, 'Create group if none exists', style=wx.ALIGN_LEFT) + box.Add(label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.btn_mkgroup = wx.Button(self, wx.ID_ANY, "Make group ...") + box.Add(self.btn_mkgroup, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + + self.Bind(wiz.EVT_WIZARD_PAGE_CHANGING, self.onPageChanging) + self.Bind(wiz.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged) + + def On_dbb_group(self,event): + self.path = event.GetString() + print 'group path =',self.path + + def onPageChanging(self,event=None): + if event.GetDirection() and self.path == '': + wx.MessageBox('You must select a valid image/map group in order to continue') + event.Veto() + return + + def OnPageChanged(self,event=None): + self.parent.xy_groupPath,self.parent.xy_group = os.path.split(self.path) + +class DispMapPage(TitledPage): + """ + Select ungeoreferenced map to display for interactively + setting ground control points (GCPs). + """ + def __init__(self, wizard, parent, curr_location, curr_mapset, xy_location, xy_mapset): + TitledPage.__init__(self, wizard, "Select image/map to display for ground control point (GCP) creation") + + self.parent = parent + self.curr_location = curr_location + self.curr_mapset = curr_mapset + self.xy_location = xy_location + self.xy_mapset = xy_mapset + self.path = '' + + box = wx.BoxSizer(wx.HORIZONTAL) + label = wx.StaticText(self, -1, 'Select display image/map:', style=wx.ALIGN_LEFT) + box.Add(label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.selection = select.Select(self, id=wx.ID_ANY, size=(300,-1), + type=self.parent.maptype ) + box.Add(self.selection, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + + self.Bind(wx.EVT_TEXT, self.OnSelection, self.selection) + self.Bind(wiz.EVT_WIZARD_PAGE_CHANGING, self.onPageChanging) + self.Bind(wiz.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged) + + def OnSelection(self,event): + self.parent.xy_dispmap = event.GetString() + print 'map =',self.parent.xy_dispmap + + def onPageChanging(self,event=None): + if event.GetDirection() and self.parent.xy_dispmap == '': + wx.MessageBox('You must select a valid image/map in order to continue') + event.Veto() + return + else: + pass + # return to current location/mapset + + def OnPageChanged(self,event=None): + if event.GetDirection(): + # switch to xy location + pass + + class GeorectStart(wx.Dialog): def __init__(self, parent, id=wx.ID_ANY, title=_('Set georectification parameters'), pos=wx.DefaultPosition, size=(-1,-1), @@ -105,8 +347,12 @@ self.curr_mapset = cmd.Command(cmdlist).module_stdout.read().strip() self.StartDir = os.path.join(self.grassdatabase,self.curr_location) + self.xy_grassdatabase = '' + self.xy_locationPath = '' + self.xy_location = '' self.xy_mapset = '' - self.xy_mapsetDir = '' + self.xy_mapsetPath = '' + self.xy_groupPath = '' self.xy_group = '' #select display map (entry) @@ -119,7 +365,7 @@ wx.DefaultPosition, wx.DefaultSize, ['raster','vector'], 2, wx.RA_SPECIFY_COLS) box.Add(self.rb_maptype, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) - sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) box = wx.BoxSizer(wx.HORIZONTAL) self.dbb_mapset = filebrowse.DirBrowseButton( @@ -131,12 +377,12 @@ startDirectory=self.StartDir, changeCallback = self.On_dbb_mapset) box.Add(self.dbb_mapset, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) - sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) box = wx.BoxSizer(wx.HORIZONTAL) self.btn_mkgroup = wx.Button(self, wx.ID_ANY, "Make group ...") box.Add(self.btn_mkgroup, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) - sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) box = wx.BoxSizer(wx.HORIZONTAL) self.dbb_group = filebrowse.DirBrowseButton( @@ -145,11 +391,11 @@ buttonText='Browse ...', toolTip='Select group of maps to georeference', dialogTitle='Groups', - startDirectory=os.path.join(self.xy_mapset,"group"), + startDirectory=self.xy_groupPath, changeCallback = self.On_dbb_group) - # Need to deactivate until xy_mapsetDir is set + # Need to deactivate until xy_mapsetPath is set box.Add(self.dbb_group, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) - sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) #Select the display map here...???? #In TclTk, first switch to xy mapset; then select map @@ -157,10 +403,10 @@ self.btn_selmap = wx.Button(self, wx.ID_ANY, "Select map ...") box.Add(self.btn_selmap, 0, wx.ALIGN_CENTRE|wx.ALL, 5) - sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) - sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5) + self.sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5) btnsizer = wx.StdDialogButtonSizer() @@ -172,7 +418,7 @@ btnsizer.AddButton(btn) btnsizer.Realize() - sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) self.SetSizer(sizer) sizer.Fit(self) @@ -181,21 +427,25 @@ self.Bind(wx.EVT_BUTTON, self.OnSelectMap, self.btn_selmap) def On_dbb_mapset(self,event): - self.xy_mapsetDir = event.GetString() - # Disable group select if no mapset selected? - # need to split mapsetDir into xy_location and xy_mapset -# self.xy_mapsetDir = os.path.join(self.grassdatabase,self.location,self.mapset) + self.xy_mapsetPath = event.GetString() + self.xy_locationPath,self.xy_mapset = os.path.split(self.xy_mapsetPath) + self.xy_grassdatabase, self.xy_location = os.path.split(self.xy_locationPath) + self.StartDir = self.xy_mapsetPath + self.xy_groupPath = os.path.join(self.xy_mapsetPath,'group') + self.Refresh() + print 'group start =',self.xy_groupPath + print 'general start =',self.StartDir - print 'mapset =',self.mapset - def On_dbb_group(self,event): - self.xy_group = event.GetString() + if self.xy_mapsetPath != '': + self.xy_groupPath,self.xy_group = os.path.split(event.GetString()) + print 'group =',self.xy_group + else: + wx.MessageBox('You must select a valid mapset') - print 'group =',self.xy_group - def OnSelectMap(self,event): dlg = select.SelectDialog(self,title="Select map",type='cell') - + dlg.CenterOnScreen() if dlg.ShowModal() == wx.ID_OK: self.xy_map = dlg.selection.GetValue() @@ -204,6 +454,7 @@ def OnMkgroup(self,event): + menuform.GUI().ParseCommand('i.group', parentframe=self) pass def SwitchToXY(self): From barton at grass.itc.it Wed Aug 29 09:16:34 2007 From: barton at grass.itc.it (barton@grass.itc.it) Date: Wed Aug 29 09:16:57 2007 Subject: [grass-addons] r1058 - trunk/grassaddons/gui/gui_modules Message-ID: <200708290716.l7T7GYFW010006@grass.itc.it> Author: barton Date: 2007-08-29 09:15:56 +0200 (Wed, 29 Aug 2007) New Revision: 1058 Modified: trunk/grassaddons/gui/gui_modules/georect.py Log: Updates to georectifier set up wizard. Now uses comboboxes to select location, mapset, and group. Modified: trunk/grassaddons/gui/gui_modules/georect.py =================================================================== --- trunk/grassaddons/gui/gui_modules/georect.py 2007-08-29 03:27:05 UTC (rev 1057) +++ trunk/grassaddons/gui/gui_modules/georect.py 2007-08-29 07:15:56 UTC (rev 1058) @@ -61,13 +61,30 @@ imagepath = images.__path__[0] sys.path.append(imagepath) +# global variables +global grassdatabase +global curr_location +global curr_mapset + +global xy_location +global xy_mapset +global xy_group +global xy_dispmap + +global maptype + +xy_location = '' +xy_mapset = '' +xy_group = '' +xy_dispmap = '' +maptype = 'raster' + class Georectify(object): """ Init class for georectifying. Launches startup dialog for setting georectifying parameters. """ def __init__(self,parent): - print 'in georectify start' self.parent = parent @@ -136,32 +153,24 @@ #set environmental variables cmdlist = ['g.gisenv', 'get=GISDBASE'] - self.grassdatabase = cmd.Command(cmdlist).module_stdout.read().strip() + global grassdatabase + grassdatabase = cmd.Command(cmdlist).module_stdout.read().strip() cmdlist = ['g.gisenv', 'get=LOCATION_NAME'] - self.curr_location = cmd.Command(cmdlist).module_stdout.read().strip() + global curr_location + curr_location = cmd.Command(cmdlist).module_stdout.read().strip() cmdlist = ['g.gisenv', 'get=MAPSET'] - self.curr_mapset = cmd.Command(cmdlist).module_stdout.read().strip() + global curr_mapset + curr_mapset = cmd.Command(cmdlist).module_stdout.read().strip() - self.StartDir = os.path.join(self.grassdatabase,self.curr_location) self.maptype = '' - self.xy_grassdatabase = '' - self.xy_locationPath = '' - self.xy_location = '' - self.xy_mapset = '' - self.xy_mapsetPath = '' - self.xy_groupPath = '' - self.xy_group = '' - self.xy_dispmap = '' # define wizard pages self.wizard = wiz.Wizard(parent, -1, "Setup for georectification") - self.startpage = LocationPage(self.wizard, self, self.StartDir) - self.grouppage = GroupPage(self.wizard, self, self.xy_groupPath) - self.mappage = DispMapPage(self.wizard, self, self.curr_location, \ - self.curr_mapset, self.xy_location, \ - self.xy_mapset) + self.startpage = LocationPage(self.wizard, self) + self.grouppage = GroupPage(self.wizard, self) + self.mappage = DispMapPage(self.wizard, self) # Set the initial order of the pages self.startpage.SetNext(self.grouppage) @@ -194,12 +203,26 @@ Set map type (raster or vector) to georectify and select location/mapset of map(s) to georectify. """ - def __init__(self, wizard, parent, startDir): + def __init__(self, wizard, parent): TitledPage.__init__(self, wizard, "Select map type and location/mapset") self.parent = parent - self.StartDir = startDir + global grassdatabase + global xy_location + global xy_mapset + tmplist = os.listdir(grassdatabase) + + self.locList = [] + + # Create a list of valid locations + for item in tmplist: + if os.path.isdir(os.path.join(grassdatabase,item)) and \ + os.path.exists(os.path.join(grassdatabase,item,'PERMANENT')): + self.locList.append(item) + + self.mapsetList = [] + box = wx.BoxSizer(wx.HORIZONTAL) self.rb_maptype = wx.RadioBox(self, -1, "Map type to georectify", wx.DefaultPosition, wx.DefaultSize, @@ -208,57 +231,89 @@ self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) box = wx.BoxSizer(wx.HORIZONTAL) - self.dbb_mapset = filebrowse.DirBrowseButton( - self, wx.ID_ANY, size=(450, -1), - labelText='Select mapset: ', - buttonText='Browse ...', - toolTip='Select mapset of maps to georeference', - dialogTitle='Mapsets', - startDirectory=self.StartDir, - changeCallback = self.On_dbb_mapset) - box.Add(self.dbb_mapset, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + label = wx.StaticText(self, -1, 'select location:', + style=wx.ALIGN_RIGHT) + box.Add(label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.cb_location = wx.ComboBox(self, wx.ID_ANY, "", + wx.DefaultPosition, + wx.DefaultSize, + choices = self.locList, + style=wx.CB_DROPDOWN|wx.CB_READONLY) + box.Add(self.cb_location, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + box = wx.BoxSizer(wx.HORIZONTAL) + label = wx.StaticText(self, -1, 'select mapset:', + style=wx.ALIGN_RIGHT) + box.Add(label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.cb_mapset = wx.ComboBox(self, wx.ID_ANY, "", + wx.DefaultPosition, + wx.DefaultSize, + choices = self.mapsetList, + style=wx.CB_DROPDOWN|wx.CB_READONLY) + box.Add(self.cb_mapset, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + + self.Bind(wx.EVT_COMBOBOX, self.OnLocation, self.cb_location) + self.Bind(wx.EVT_COMBOBOX, self.OnMapset, self.cb_mapset) self.Bind(wiz.EVT_WIZARD_PAGE_CHANGING, self.onPageChanging) self.Bind(wiz.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged) - def On_dbb_mapset(self,event): - self.parent.xy_mapsetPath = event.GetString() - self.StartDir = self.parent.xy_mapsetPath - print 'general start =',self.StartDir + def OnLocation(self, event): + global grassdatabase + global xy_location + xy_location = event.GetString() + tmplist = os.listdir(os.path.join(grassdatabase,xy_location)) + self.mapsetList = [] + for item in tmplist: + if os.path.isdir(os.path.join(grassdatabase,xy_location,item)): + self.mapsetList.append(item) + + self.cb_mapset.SetItems(self.mapsetList) + + def OnMapset(self, event): + global xy_mapset + global xy_location + + if xy_location == '': + wx.MessageBox('You must select a valid location before selecting a mapset') + return + + xy_mapset = event.GetString() + def onPageChanging(self,event=None): - if event.GetDirection() and self.parent.xy_mapsetPath == '': + global xy_location + global xy_mapset + + if event.GetDirection() and (xy_location == '' or xy_mapset == ''): wx.MessageBox('You must select a valid location and mapset in order to continue') event.Veto() return def OnPageChanged(self,event=None): - self.parent.xy_locationPath,self.parent.xy_mapset = os.path.split(self.parent.xy_mapsetPath) - self.parent.xy_grassdatabase, self.parent.xy_location = os.path.split(self.parent.xy_locationPath) - self.parent.xy_groupPath = os.path.join(self.parent.xy_mapsetPath,'group') + pass class GroupPage(TitledPage): """ Set group to georectify. Create group if desired. """ - def __init__(self, wizard, parent, startDir): + def __init__(self, wizard, parent): TitledPage.__init__(self, wizard, "Select image/map group to georectify") self.parent = parent - self.path = '' - self.StartDir = startDir + self.groupList = [] box = wx.BoxSizer(wx.HORIZONTAL) - self.dbb_group = filebrowse.DirBrowseButton( - self, wx.ID_ANY, size=(450, -1), - labelText='Select group: ', - buttonText='Browse ...', - toolTip='Select group of images or maps to georeference', - dialogTitle='Groups', - startDirectory=self.StartDir, - changeCallback = self.On_dbb_group) - box.Add(self.dbb_group, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + label = wx.StaticText(self, -1, 'select group:', + style=wx.ALIGN_RIGHT) + box.Add(label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.cb_group = wx.ComboBox(self, wx.ID_ANY, "", + wx.DefaultPosition, + wx.DefaultSize, + choices = self.groupList, + style=wx.CB_DROPDOWN|wx.CB_READONLY) + box.Add(self.cb_group, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) box = wx.BoxSizer(wx.HORIZONTAL) @@ -268,35 +323,63 @@ box.Add(self.btn_mkgroup, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) self.sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + self.Bind(wx.EVT_COMBOBOX, self.OnGroup, self.cb_group) self.Bind(wiz.EVT_WIZARD_PAGE_CHANGING, self.onPageChanging) self.Bind(wiz.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged) - def On_dbb_group(self,event): - self.path = event.GetString() - print 'group path =',self.path + def OnGroup(self, event): + global xy_location + global xy_mapset + global xy_group + if xy_location == '' or xy_mapset == '': + wx.MessageBox('You must select a valid location and mapset before selecting a group') + return + + xy_group = event.GetString() + def onPageChanging(self,event=None): - if event.GetDirection() and self.path == '': + global xy_group + + if event.GetDirection() and xy_group == '': wx.MessageBox('You must select a valid image/map group in order to continue') event.Veto() return def OnPageChanged(self,event=None): - self.parent.xy_groupPath,self.parent.xy_group = os.path.split(self.path) + global grassdatabase + global xy_location + global xy_mapset + self.groupList = [] + tmplist = [] + tmplist = os.listdir(os.path.join(grassdatabase,xy_location,xy_mapset,'group'))\ + + if tmplist == []: + wx.MessageBox('No map/imagery groups exist to georectify. You will need to create one') + else: + for item in tmplist: + if os.path.isdir(os.path.join(grassdatabase,xy_location,xy_mapset,'group',item)): + self.groupList.append(item) + + self.cb_group.SetItems(self.groupList) + class DispMapPage(TitledPage): """ Select ungeoreferenced map to display for interactively setting ground control points (GCPs). """ - def __init__(self, wizard, parent, curr_location, curr_mapset, xy_location, xy_mapset): + def __init__(self, wizard, parent): TitledPage.__init__(self, wizard, "Select image/map to display for ground control point (GCP) creation") self.parent = parent - self.curr_location = curr_location - self.curr_mapset = curr_mapset - self.xy_location = xy_location - self.xy_mapset = xy_mapset + + global curr_location + global curr_mapset + global xy_location + global xy_mapset + global xy_group + self.path = '' box = wx.BoxSizer(wx.HORIZONTAL) @@ -312,11 +395,13 @@ self.Bind(wiz.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged) def OnSelection(self,event): - self.parent.xy_dispmap = event.GetString() - print 'map =',self.parent.xy_dispmap + global xy_dispmap + xy_dispmap = event.GetString() + print 'map =',xy_dispmap def onPageChanging(self,event=None): - if event.GetDirection() and self.parent.xy_dispmap == '': + global xy_dispmap + if event.GetDirection() and xy_dispmap == '': wx.MessageBox('You must select a valid image/map in order to continue') event.Veto() return @@ -347,7 +432,7 @@ self.curr_mapset = cmd.Command(cmdlist).module_stdout.read().strip() self.StartDir = os.path.join(self.grassdatabase,self.curr_location) - self.xy_grassdatabase = '' + self.grassdatabase = '' self.xy_locationPath = '' self.xy_location = '' self.xy_mapset = '' @@ -429,12 +514,12 @@ def On_dbb_mapset(self,event): self.xy_mapsetPath = event.GetString() self.xy_locationPath,self.xy_mapset = os.path.split(self.xy_mapsetPath) - self.xy_grassdatabase, self.xy_location = os.path.split(self.xy_locationPath) + self.grassdatabase, self.xy_location = os.path.split(self.xy_locationPath) self.StartDir = self.xy_mapsetPath self.xy_groupPath = os.path.join(self.xy_mapsetPath,'group') self.Refresh() print 'group start =',self.xy_groupPath - print 'general start =',self.StartDir + print 'new start dir =',self.StartDir def On_dbb_group(self,event): if self.xy_mapsetPath != '': From landa at grass.itc.it Fri Aug 31 19:00:47 2007 From: landa at grass.itc.it (landa@grass.itc.it) Date: Fri Aug 31 19:00:50 2007 Subject: [grass-addons] r1059 - in trunk/grassaddons/gui: display_driver gui_modules Message-ID: <200708311700.l7VH0lQH018910@grass.itc.it> Author: landa Date: 2007-08-31 19:00:46 +0200 (Fri, 31 Aug 2007) New Revision: 1059 Modified: trunk/grassaddons/gui/display_driver/driver.cc trunk/grassaddons/gui/display_driver/driver.h trunk/grassaddons/gui/gui_modules/digit.py trunk/grassaddons/gui/gui_modules/mapdisp.py Log: Minor updates for digitization tool (still disabled). Modified: trunk/grassaddons/gui/display_driver/driver.cc =================================================================== --- trunk/grassaddons/gui/display_driver/driver.cc 2007-08-29 07:15:56 UTC (rev 1058) +++ trunk/grassaddons/gui/display_driver/driver.cc 2007-08-31 17:00:46 UTC (rev 1059) @@ -63,7 +63,7 @@ \brief Display content of the map in device \param[in,out] device wxDC object where to draw vector features - +\ \return number of displayed features \return -1 on error */ @@ -113,13 +113,19 @@ type = Vect_read_line (mapInfo, points, cats, line); pointsScreen->Clear(); - //self.ids[line] = [] + for (int i = 0; i < points->n_points; i++) { Cell2Pixel(points->x[i], points->y[i], points->z[i], &x, &y, &z); pointsScreen->Append((wxObject*) new wxPoint(x, y)); /* TODO: 3D */ } + // add ids + // -> node1, line1, vertex1, line2, ..., node2 + struct lineDesc desc = {points->n_points, dcId}; + dcId += points->n_points * 2 - 1; + ids[line] = desc; + // draw vector feature if (type & GV_LINES) { switch (type) { @@ -149,31 +155,30 @@ break; } - if (draw) { - // highlight feature? - if (IsSelected(line)) { - dc->SetPen(wxPen(settings.highlight, settings.lineWidth, wxSOLID)); - } + // highlight feature? + if (draw && IsSelected(line)) { + dc->SetPen(wxPen(settings.highlight, settings.lineWidth, wxSOLID)); + } - //dc->DrawLines(pointsScreen); - for (int i = 0; i < pointsScreen->GetCount() - 1;) { - wxPoint *point_beg = (wxPoint *) pointsScreen->Item(i)->GetData(); - wxPoint *point_end = (wxPoint *) pointsScreen->Item(++i)->GetData(); + long int startId = ids[line].startId + 1; - ids[line].push_back(dcId); - dc->SetId(dcId++); + for (int i = 0; i < pointsScreen->GetCount() - 1; startId += 2) { + wxPoint *point_beg = (wxPoint *) pointsScreen->Item(i)->GetData(); + wxPoint *point_end = (wxPoint *) pointsScreen->Item(++i)->GetData(); + + wxRect rect (*point_beg, *point_end); + dc->SetIdBounds(startId, rect); + // draw line if needed + if (draw) { + dc->SetId(startId); dc->DrawLine(point_beg->x, point_beg->y, point_end->x, point_end->y); } + } - if (settings.vertex.enabled) { - if (!IsSelected(line)) - dc->SetPen(wxPen(settings.vertex.color, settings.lineWidth, wxSOLID)); - DrawLineVerteces(line); - } - DrawLineNodes(line); - } + DrawLineVerteces(line); // draw vertices + DrawLineNodes(line); // draw nodes } else if (type & GV_POINTS) { if (type == GV_POINT && settings.point.enabled) { @@ -220,10 +225,29 @@ */ int DisplayDriver::DrawLineVerteces(int line) { - for (int i = 1; i < pointsScreen->GetCount() - 1; i++) { - DrawCross(line, (const wxPoint*) pointsScreen->Item(i)->GetData()); + long int id; + wxPoint *point; + + // set id + id = ids[line].startId + 2; + for (int i = 1; i < pointsScreen->GetCount() - 1; i++, id += 2) { + point = (wxPoint*) pointsScreen->Item(i)->GetData(); + wxRect rect (*point, *point); + dc->SetIdBounds(id, rect); } + // draw vertices if needed + if (settings.vertex.enabled) { + if (!IsSelected(line)) + dc->SetPen(wxPen(settings.vertex.color, settings.lineWidth, wxSOLID)); + + id = ids[line].startId + 2; + for (int i = 1; i < pointsScreen->GetCount() - 1; i++, id += 2) { + dc->SetId(id); + DrawCross(line, (const wxPoint*) pointsScreen->Item(i)->GetData()); + } + } + return pointsScreen->GetCount() - 2; } @@ -237,9 +261,11 @@ int DisplayDriver::DrawLineNodes(int line) { int node; + long int id; double east, north, depth; int x, y, z; int nodes [2]; + bool draw; Vect_get_line_nodes(mapInfo, line, &(nodes[0]), &(nodes[1])); @@ -252,21 +278,35 @@ &x, &y, &z); - // highlight feature? - if (IsSelected(line)) { - dc->SetPen(wxPen(settings.highlight, settings.lineWidth, wxSOLID)); + if (Vect_get_node_n_lines(mapInfo, node) == 1) { + dc->SetPen(wxPen(settings.nodeOne.color, settings.lineWidth, wxSOLID)); + draw = settings.nodeOne.enabled; } else { - if (Vect_get_node_n_lines(mapInfo, node) == 1) - dc->SetPen(wxPen(settings.nodeOne.color, settings.lineWidth, wxSOLID)); - else - dc->SetPen(wxPen(settings.nodeTwo.color, settings.lineWidth, wxSOLID)); + dc->SetPen(wxPen(settings.nodeTwo.color, settings.lineWidth, wxSOLID)); + draw = settings.nodeTwo.enabled; } + + // highlight feature? + if (draw && IsSelected(line)) { + dc->SetPen(wxPen(settings.highlight, settings.lineWidth, wxSOLID)); + } + // node1, line1, vertex1, line2, vertex2, ..., node2 + if (i == 0) // first node + id = dcId - points->n_points * 2 + 1; + else // last node + id = dcId - 1; + wxPoint point(x, y); - DrawCross(line, &point); + wxRect rect (point, point); + dc->SetIdBounds(id, rect); - //elf.ids[line].append(self.mapwindow.DrawCross(coords, size=5)) + // draw node if needed + if (draw) { + dc->SetId(id); + DrawCross(line, &point); + } } return 1; @@ -391,9 +431,6 @@ if (!dc || !point) return -1; - ids[line].push_back(dcId); - dc->SetId(dcId++); - dc->DrawLine(point->x - size, point->y, point->x + size, point->y); dc->DrawLine(point->x, point->y - size, point->x, point->y + size); @@ -472,12 +509,10 @@ { for (ids_map::const_iterator i = ids.begin(), e = ids.end(); i != e; ++i) { - std::cout << i->first << ":"; - for(std::vector
::const_iterator ii = i->second.begin(), ee = i->second.end(); - ii != ee; ++ii) { - std::cout << " " << *ii; - } - std::cout << std::endl; + std::cout << "line=" << i->first << ": " + << "npoints=" << i->second.npoints + << " startId=" << i->second.startId + << std::endl; } for (std::vector ::const_iterator i = selected.begin(), e = selected.end(); @@ -627,18 +662,15 @@ for(std::vector ::const_iterator i = selected.begin(), e = selected.end(); i != e; ++i) { - // TODO ids[*i] ... - for(ids_map::const_iterator ii = ids.begin(), ee = ids.end(); - ii != ee; ++ii) { - if (*i == ii->first) { - for(std::vector ::const_iterator iii = ii->second.begin(), - eee = ii->second.end(); iii != eee; ++iii) { - dc_ids.push_back(*iii); - } - break; + ids_map::const_iterator ii = ids.find(*i); + if (ii != ids.end()) { // line found + long int endId = ii->second.npoints * 2 - 1 + ii->second.startId; + for (long int id = ii->second.startId; id < endId; id++) { + dc_ids.push_back(id); } } } + return dc_ids; } @@ -657,24 +689,24 @@ } /** - \brief Get PseudoDC id of selected line of given coordinates + \brief Get PseudoDC vertex id of selected line \param[in] x,y coordinates of vertex on line - \return number of line - \return 0 no line found - \return -1 on error + \return PseudoDC ids (vertex, left vertex, right vertex, left line, right line) + \return (0) no line found + \return (-1) on error */ -long int DisplayDriver::GetSelectedVertex(double x, double y) +std::vector DisplayDriver::GetSelectedVertex(double x, double y) { - int line, type, minIdx; - long int dcId; + struct lineDesc *desc; + int line, type, minIdx, lline, rline; // left, right line double dist, minDist; - std::vector * dcIds; + std::vector returnId; // TODO: long int if (selected.size() != 1) - return -1; + return returnId; line = selected[0]; @@ -695,16 +727,35 @@ } } } - - // [line, vertex1, ..., node1, node2] - dcIds = &(ids[line]); + + desc = &(ids[line]); - if (minIdx == 0) - dcId = (*dcIds)[dcIds->size()-2]; // first node - else if (minIdx == points->n_points - 1) - dcId = (*dcIds)[dcIds->size()-1]; // last node - else - dcId = (*dcIds)[minIdx]; // vertex + // translate id + minIdx = minIdx * 2 + desc->startId; - return dcId; + // add selected vertex + returnId.push_back(minIdx); + // left vertex & line + if (minIdx == desc->startId) { + returnId.push_back(-1); + lline = -1; + } + else { + returnId.push_back(minIdx - 2); + lline = minIdx - 1; + } + // right vertex + if (minIdx == (desc->npoints - 1) * 2 + desc->startId) { + returnId.push_back(-1); + rline = -1; + } + else { + returnId.push_back(minIdx + 2); + rline = minIdx + 1; + } + + returnId.push_back(lline); + returnId.push_back(rline); + + return returnId; } Modified: trunk/grassaddons/gui/display_driver/driver.h =================================================================== --- trunk/grassaddons/gui/display_driver/driver.h 2007-08-29 07:15:56 UTC (rev 1058) +++ trunk/grassaddons/gui/display_driver/driver.h 2007-08-31 17:00:46 UTC (rev 1059) @@ -35,8 +35,13 @@ wxPseudoDC *dc; // device content long int dcId; // wxDC id starting - typedef std::map selected; // list of selected features (gId) @@ -115,7 +120,7 @@ void Unselect(); std::vector GetSelected(bool grassId); int SetSelected(std::vector id); - long int GetSelectedVertex(double x, double y); + std::vector GetSelectedVertex(double x, double y); /* general */ void CloseMap(); Modified: trunk/grassaddons/gui/gui_modules/digit.py =================================================================== --- trunk/grassaddons/gui/gui_modules/digit.py 2007-08-29 07:15:56 UTC (rev 1058) +++ trunk/grassaddons/gui/gui_modules/digit.py 2007-08-31 17:00:46 UTC (rev 1059) @@ -55,6 +55,9 @@ "This only TEMPORARY solution (display driver based on SWIG-Python interface is EXTREMELY SLOW!\n" \ "Will be replaced by C/C++ display driver." else: + driverPath = os.path.join( os.getenv("GISBASE"), "etc","wx", "display_driver") + sys.path.append(driverPath) + from grass6_wxdriver import DisplayDriver try: driverPath = os.path.join( os.getenv("GISBASE"), "etc","wx", "display_driver") sys.path.append(driverPath) @@ -442,20 +445,19 @@ Debug.msg(3, "CDisplayDriver.DrawMap(): nlines=%d" % nlines) return nlines - def SelectLinesByBox(self, rect, onlyType=None): + def SelectLinesByBox(self, begin, end, onlyType=None): """Select vector features by given bounding box. - rect = ((x1, y1), (x2, y2)) Number of selected features can be decreased by 'onlyType' ('None' for no types) """ - x1, y1 = rect[0] - x2, y2 = rect[1] + x1, y1 = begin + x2, y2 = end nselected = self.__display.SelectLinesByBox(x1, y1, x2, y2) Debug.msg(4, "CDisplayDriver.SelectLinesByBox(): selected=%d" % \ - nselected) + nselected) return nselected @@ -471,7 +473,7 @@ Debug.msg(4, "CDisplayDriver.SelectLinesByPoint(): selected=%d" % \ nselected) - return nselected + return (nselected,) # tuple def GetSelected(self, grassId=True): """Return ids of selected vector features @@ -484,8 +486,8 @@ else: selected = self.__display.GetSelected(False) - #Debug.msg(4, "CDisplayDriver.GetSelected(): grassId=%d, ids=%s" % \ - #grassId, ids) + Debug.msg(4, "CDisplayDriver.GetSelected(): grassId=%d, ids=%s" % \ + (grassId, (",".join(["%d" % v for v in selected])))) return selected @@ -497,10 +499,10 @@ id = self.__display.GetSelectedVertex(x, y) - Debug.msg(4, "CDisplayDriver.GetSelectedVertex(): id=%d" % \ - id) + Debug.msg(4, "CDisplayDriver.GetSelectedVertex(): id=%s" % \ + (",".join(["%d" % v for v in id]))) - return (id,) # return tuple + return id def Unselect(self): """Delesect selected vector features""" Modified: trunk/grassaddons/gui/gui_modules/mapdisp.py =================================================================== --- trunk/grassaddons/gui/gui_modules/mapdisp.py 2007-08-29 07:15:56 UTC (rev 1058) +++ trunk/grassaddons/gui/gui_modules/mapdisp.py 2007-08-31 17:00:46 UTC (rev 1059) @@ -244,15 +244,17 @@ pdc.BeginDrawing() - if drawid != 99 and drawid != 100: + if drawid != 99: bg = wx.TRANSPARENT_BRUSH else: bg = wx.Brush(self.GetBackgroundColour()) + pdc.SetBackground(bg) #pdc.Clear() self.Refresh() - Debug.msg (5, "BufferedWindow.Draw(): id=%s, pdctype=%s, coord=%s" % (drawid, pdctype, coords)) + Debug.msg (5, "BufferedWindow.Draw(): id=%s, pdctype=%s, coord=%s" % \ + (drawid, pdctype, coords)) if pdctype == 'clear': # erase the display bg = wx.WHITE_BRUSH @@ -531,9 +533,12 @@ # update statusbar self.Map.SetRegion() - self.parent.statusbar.SetStatusText("Ext: %.2f(W)-%.2f(E), %.2f(N)-%.2f(S)" % + self.parent.statusbar.SetStatusText("Ext:%.2f(W)-%.2f(E),%.2f(N)-%.2f(S); " + "Res:%.2f(NS),%.2f(EW)" % (self.Map.region["w"], self.Map.region["e"], - self.Map.region["n"], self.Map.region["s"]), 0) + self.Map.region["n"], self.Map.region["s"], + self.Map.region["nsres"], self.Map.region["ewres"]), + 0) return True @@ -623,34 +628,39 @@ self.Draw(self.pdc, drawid=self.lineid, pdctype='line', coords=mousecoords) - def DrawLines(self, polycoords=None): - """Draw polyline in PseudoDC""" - if not polycoords: # alternative coordinates + def DrawLines(self, pdc=None, polycoords=None): + """Draw polylines in PseudoDC""" + + if not pdc: + pdc = self.pdc + + if not polycoords: polycoords = self.polycoords - #Debug.msg (4, "BufferedWindow.DrawLines(): coords=%s" % \ - # polycoords) + if len(polycoords) > 0: + self.plineid = wx.ID_NEW + 1 + self.Draw(pdc, drawid=self.plineid, pdctype='polyline', coords=polycoords) - if len(polycoords) > 0: - self.plineid = wx.NewId() - self.Draw(self.pdc, drawid=self.plineid, pdctype='polyline', coords=polycoords) + Debug.msg (4, "BufferedWindow.DrawLines(): coords=%s, id=%s" % \ + (polycoords, self.plineid)) + return self.plineid return -1 - def DrawCross(self, coords, size, rotation=0): + def DrawCross(self, pdc, coords, size, rotation=0): """Draw cross in PseudoDC TODO: implement rotation """ - Debug.msg(4, "BufferedWindow.DrawCross(): coords=%s, size=%d" % \ - (coords, size)) + Debug.msg(4, "BufferedWindow.DrawCross(): pdc=%s, coords=%s, size=%d" % \ + (pdc, coords, size)) coordsCross = ((coords[0] - size, coords[1], coords[0] + size, coords[1]), (coords[0], coords[1] - size, coords[0], coords[1] + size)) self.lineid = wx.NewId() for lineCoords in coordsCross: - self.Draw(self.pdc, drawid=self.lineid, pdctype='line', coords=lineCoords) + self.Draw(pdc, drawid=self.lineid, pdctype='line', coords=lineCoords) return self.lineid @@ -777,11 +787,12 @@ if digitToolbar.action == "addLine": if digitToolbar.type in ["point", "centroid"]: # add new point - #self.DrawCross(self.mouse['begin'], 5) self.parent.digit.AddPoint(map=map, type=digitToolbar.type, x=east, y=north) + self.UpdateMap(render=False) # redraw map + # add new record into atribute table if self.parent.digit.settings["addRecord"]: # select attributes based on layer and category @@ -798,7 +809,6 @@ executeCommand = cmd.Command(cmd=["db.execute", "--q", "input=%s" % sqlfile.name]) - self.UpdateMap() # redraw map elif digitToolbar.type in ["line", "boundary"]: # add new point to the line @@ -811,6 +821,11 @@ self.moveBegin = [0, 0] self.moveCoords = self.mouse['begin'] self.moveIds = [] + if digitToolbar.action == "moveVertex": + # set pen + self.polypen = wx.Pen(colour=self.parent.digit.settings["symbolHighlight"][1], + width=2, style=wx.SHORT_DASH) + self.pdcVector.SetPen(self.polypen) elif digitToolbar.action == "splitLine": pass elif digitToolbar.action == "displayAttributes": @@ -892,21 +907,20 @@ # digitization tool active digitToolbar = self.parent.digittoolbar self.mouse['end'] = event.GetPositionTuple()[:] + pos1 = self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1]) + pos2 = self.Pixel2Cell(self.mouse['end'][0], self.mouse['end'][1]) + if digitToolbar.action in ["deleteLine", "moveLine", "moveVertex"]: nselected = 0 driver = self.parent.digit.driver # -> delete line || move line || move vertex if digitToolbar.action == "moveVertex": # -> move vertex (select by point) - self.moveIds = driver.SelectLinesByPoint(self.Pixel2Cell(self.mouse['begin'][0], - self.mouse['begin'][1]), - onlyType="line") - + nselected = driver.SelectLinesByPoint(pos1, onlyType="line") + self.moveIds = driver.GetSelectedVertex(pos1) else: # -> moveLine || deleteLine (select by box) - x1, y1 = self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1]) - x2, y2 = self.Pixel2Cell(self.mouse['end'][0], self.mouse['end'][1]) - nselected = driver.SelectLinesByBox(((x1, y1), (x2, y2))) + nselected = driver.SelectLinesByBox(pos1, pos2) if nselected > 0: # highlight selected features @@ -920,12 +934,10 @@ self.moveIds = driver.GetSelected(grassId=False) else: # -> move vertex - self.moveIds = driver.GetSelectedVertex(self.Pixel2Cell(self.mouse['begin'][0], - self.mouse['begin'][1])) - print "#", self.moveIds + self.moveIds = driver.GetSelectedVertex(pos1) + elif digitToolbar.action in ["splitLine", "addVertex", "removeVertex"]: - east, north = self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1]) - self.parent.digit.driver.SelectLinesByPoint((east, north), onlyType="line") + self.parent.digit.driver.SelectLinesByPoint(pos1, onlyType="line") self.UpdateMap(render=False) elif self.dragid != None: # end drag of overlay decoration @@ -1042,6 +1054,8 @@ type=self.parent.digittoolbar.type, coords=mapcoords) + self.UpdateMap(render=False) + # add new record into atribute table if self.parent.digit.settings["addRecord"]: offset = 5 @@ -1062,7 +1076,6 @@ executeCommand = cmd.Command(cmd=["db.execute", "--q", "input=%s" % sqlfile.name]) - # clean up saved positions self.polycoords = [] elif digit.action == "deleteLine": @@ -1103,33 +1116,44 @@ self.parent.digit.RemoveVertex(self.Pixel2Cell(self.mouse['begin'][0], self.mouse['begin'][1])) - # PyDisplayDriver: self.parent.digit.driver.SetSelected([]) - self.parent.digit.driver.Unselect() - self.UpdateMap(render=False) + if digit.action != "addLine": + # PyDisplayDriver: self.parent.digit.driver.SetSelected([]) + self.parent.digit.driver.Unselect() + self.UpdateMap(render=False) event.Skip() def OnMiddleDown(self, event): """Middle mouse button pressed""" digit = self.parent.digittoolbar + # digitization tool if self.mouse["use"] == "pointer" and digit: if digit.action == "addLine" and \ digit.type in ["line", "boundary"]: - # remove last point from the line - self.polycoords.pop() - self.mouse['begin'] = self.polycoords[-1] + # add line or boundary -> remove last point from the line + try: + removed = self.polycoords.pop() + Debug.msg(4, "BufferedWindow.OnMiddleDown(): polycoords_poped=%s" % \ + [removed,]) + + self.mouse['begin'] = self.polycoords[-1] + except: + pass + self.ClearLines() + self.UpdateMap(render=False) self.DrawLines() elif digit.action in ["deleteLine", "moveLine", "splitLine", "addVertex", "removeVertex", "moveVertex"]: - # unselected selected features + # varios tools -> unselected selected features # PyDisplayDriver: self.parent.digit.driver.SetSelect([]) self.parent.digit.driver.Unselect() if digit.action in ["moveLine", "moveVertex"] and hasattr(self, "moveBegin"): + # move feature -> delete 'move' variables del self.moveBegin del self.moveCoords del self.moveIds - self.UpdateMap() + self.UpdateMap(render=False) # render map def OnMouseMoving(self, event): """Motion event and no mouse buttons were pressed""" @@ -1150,26 +1174,68 @@ self.moveBegin[1] += dy if len(self.moveIds) > 0: # draw lines on new position - for id in self.moveIds: - self.pdcVector.TranslateId(id, dx, dy) + if digit.action == "moveLine": + # move line + for id in self.moveIds: + self.pdcVector.TranslateId(id, dx, dy) + else: + # move vertex -> + # (vertex, left vertex, left line, + # right vertex, right line) + + # draw polyline + self.pdcVector.TranslateId(self.moveIds[0], dx, dy) + self.pdcVector.RemoveId(self.moveIds[0]) + self.pdcVector.RemoveId(self.moveIds[-1]) + self.pdcVector.RemoveId(self.moveIds[-2]) + self.polycoords = [] + if self.moveIds[-2] > 0: # left line + x1, y1 = self.pdcVector.GetIdBounds(self.moveIds[1])[0:2] + self.polycoords.append((x1, y1)) + x2, y2 = self.mouse['end'] + self.polycoords.append((x2, y2)) + if self.moveIds[-1] > 0: # right line + x3, y3 = self.pdcVector.GetIdBounds(self.moveIds[2])[0:2] + self.polycoords.append((x3, y3)) + + self.ClearLines() + self.DrawLines() + self.Refresh() # TODO: use RefreshRect() self.mouse['begin'] = self.mouse['end'] event.Skip() - def ClearLines(self): + def ClearLines(self, pdc=None): """ - Clears lines drawn for measurement and profiling + Clears temporary drawn lines from PseudoDC """ + + if not pdc: + pdc = self.pdc + + exit = True + try: - self.pdc.ClearId(self.lineid) - self.pdc.ClearId(self.plineid) - self.Refresh() - return True + pdc.ClearId(self.lineid) + pdc.RemoveId(self.lineid) except: - return False + exit = False + + try: + pdc.ClearId(self.plineid) + pdc.RemoveId(self.plineid) + except: + exit = False + Debug.msg(4, "BufferedWindow.ClearLines(): lineid=%s, plineid=%s" % + (self.lineid, self.plineid)) + self.Refresh() + + return exit + + def Pixel2Cell(self, x, y): """ Calculates real word coordinates to image coordinates @@ -1500,7 +1566,7 @@ # # Fancy gui # -# self._mgr = auimgr + # self._mgr = auimgr self._mgr = wx.aui.AuiManager(self) self.SetIcon(wx.Icon(os.path.join(imagepath,'grass.map.gif'), wx.BITMAP_TYPE_ANY)) @@ -1518,9 +1584,11 @@ self.statusbar = self.CreateStatusBar(number=2, style=0) self.statusbar.SetStatusWidths([-5, -2]) self.Map.SetRegion() - map_frame_statusbar_fields = ["Ext: %.2f(W)-%.2f(E), %.2f(N)-%.2f(S)" % + map_frame_statusbar_fields = ["Ext:%.2f(W)-%.2f(E),%.2f(N)-%.2f(S); " + "Res:%.2f(NS),%.2f(EW)" % (self.Map.region["w"], self.Map.region["e"], - self.Map.region["n"], self.Map.region["s"]), + self.Map.region["n"], self.Map.region["s"], + self.Map.region["nsres"], self.Map.region["ewres"]), "%s,%s" %(None, None)] for i in range(len(map_frame_statusbar_fields)): self.statusbar.SetStatusText(map_frame_statusbar_fields[i], i) From landa at grass.itc.it Fri Aug 31 19:05:54 2007 From: landa at grass.itc.it (landa@grass.itc.it) Date: Fri Aug 31 19:05:55 2007 Subject: [grass-addons] r1060 - trunk/grassaddons/gui/gui_modules Message-ID: <200708311705.l7VH5siM018958@grass.itc.it> Author: landa Date: 2007-08-31 19:05:53 +0200 (Fri, 31 Aug 2007) New Revision: 1060 Modified: trunk/grassaddons/gui/gui_modules/digit.py Log: Remove redundant code. Modified: trunk/grassaddons/gui/gui_modules/digit.py =================================================================== --- trunk/grassaddons/gui/gui_modules/digit.py 2007-08-31 17:00:46 UTC (rev 1059) +++ trunk/grassaddons/gui/gui_modules/digit.py 2007-08-31 17:05:53 UTC (rev 1060) @@ -55,9 +55,6 @@ "This only TEMPORARY solution (display driver based on SWIG-Python interface is EXTREMELY SLOW!\n" \ "Will be replaced by C/C++ display driver." else: - driverPath = os.path.join( os.getenv("GISBASE"), "etc","wx", "display_driver") - sys.path.append(driverPath) - from grass6_wxdriver import DisplayDriver try: driverPath = os.path.join( os.getenv("GISBASE"), "etc","wx", "display_driver") sys.path.append(driverPath) From neteler at grass.itc.it Fri Aug 31 22:20:40 2007 From: neteler at grass.itc.it (neteler@grass.itc.it) Date: Fri Aug 31 22:20:41 2007 Subject: [grass-addons] r1061 - trunk/grassaddons/v.path.obstacles Message-ID: <200708312020.l7VKKeYu020708@grass.itc.it> Author: neteler Date: 2007-08-31 22:20:37 +0200 (Fri, 31 Aug 2007) New Revision: 1061 Modified: trunk/grassaddons/v.path.obstacles/description.html Log: fix v.buffer input=map output=bufferedmap buffer=1 type=point,line,area,boundary -
+Last changed: Date: 23/08/2007 +
Last changed: Date: 31/08/2007
