Forráskód Böngészése

nviz_cmd: color_map/value option added
template for manual page created
[merge from devbr6, 31669]


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31670 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 17 éve
szülő
commit
f873096a7b
2 módosított fájl, 13 hozzáadás és 12 törlés
  1. 10 9
      lib/ogsf/GS2.c
  2. 3 3
      lib/ogsf/gsd_views.c

+ 10 - 9
lib/ogsf/GS2.c

@@ -2611,9 +2611,9 @@ void GS_set_focus_center_map(int id)
 }
 }
 
 
 /*!
 /*!
-  \brief Move to position
+  \brief Move viewpoint 
 
 
-  \param pt point model coordinates
+  \param pt 'from' model coordinates
 */
 */
 void GS_moveto(float *pt)
 void GS_moveto(float *pt)
 {
 {
@@ -2718,7 +2718,7 @@ int GS_get_zrange(float *min, float *max, int doexag)
 }
 }
 
 
 /*!
 /*!
-  \brief Get 'from' position
+  \brief Get viewpoint 'from' position
 
 
   \param[out] fr from model coordinates
   \param[out] fr from model coordinates
 */
 */
@@ -2732,7 +2732,7 @@ void GS_get_from(float *fr)
 }
 }
 
 
 /*!
 /*!
-  \brief Get 'from' real coordinates
+  \brief Get viewpoint 'from' real coordinates
 
 
   \param[out] fr 'from' real coordinates
   \param[out] fr 'from' real coordinates
 */
 */
@@ -2867,7 +2867,7 @@ int GS_get_twist(void)
 }
 }
 
 
 /*!
 /*!
-  \brief Set twist value
+  \brief Set viewpoint twist value
 
 
   10ths of degrees off twelve o'clock
   10ths of degrees off twelve o'clock
   
   
@@ -3165,7 +3165,7 @@ void GS_unset_cplane(int num)
 }
 }
 
 
 /*!
 /*!
-  \brief Get scale
+  \brief Get axis scale
 
 
   \param sx,sy,sz x/y/z scale values
   \param sx,sy,sz x/y/z scale values
   \param doexag use vertical exaggeration
   \param doexag use vertical exaggeration
@@ -3269,7 +3269,7 @@ int GS_load_3dview(char *vname, int surfid)
 ************************************************************************/
 ************************************************************************/
 
 
 /*!
 /*!
-  \brief Init view
+  \brief Init viewpoint
 
 
   \todo allow to set center?
   \todo allow to set center?
 */
 */
@@ -3380,8 +3380,6 @@ double GS_get_aspect(void)
     int left, right, bottom, top;
     int left, right, bottom, top;
     GLint tmp[4];
     GLint tmp[4];
 
 
-    G_debug(3, "GS_get_aspect");
-
     /* OGLXXX
     /* OGLXXX
      * get GL_VIEWPORT:
      * get GL_VIEWPORT:
      * You can probably do better than this.
      * You can probably do better than this.
@@ -3392,6 +3390,9 @@ double GS_get_aspect(void)
     bottom = tmp[1];
     bottom = tmp[1];
     top = tmp[1] + tmp[3] - 1;
     top = tmp[1] + tmp[3] - 1;
 
 
+    G_debug(3, "GS_get_aspect(): left=%d, right=%d, top=%d, bottom=%d",
+	    left, right, top, bottom);
+
     return ((double) (right - left) / (top - bottom));
     return ((double) (right - left) / (top - bottom));
 }
 }
 
 

+ 3 - 3
lib/ogsf/gsd_views.c

@@ -159,10 +159,10 @@ void gsd_check_focus(geoview * gv)
 }
 }
 
 
 /*!
 /*!
-  \brief ADD
+  \brief Get z-up vector (z-direction)
 
 
   \param gv view (geoview)
   \param gv view (geoview)
-  \param up
+  \param up up vector
 */
 */
 void gsd_get_zup(geoview * gv, double *up)
 void gsd_get_zup(geoview * gv, double *up)
 {
 {
@@ -316,7 +316,7 @@ void gsd_real2model(Point3 point)
 /*!
 /*!
   \brief Convert model to real coordinates
   \brief Convert model to real coordinates
 
 
-  \param point[in,out] 3d point (Point3)
+  \param point[in,out] 3d point (x,y,z)
 */
 */
 void gsd_model2real(Point3 point)
 void gsd_model2real(Point3 point)
 {
 {