Changeset 1857 in Sophya for trunk/SophyaPI/PIGcont/gp_contour.c

Timestamp:

Jan 14, 2002, 2:42:24 PM (24 years ago)

Author:

perderos

Message:

1) correction de fuites de memoire
2) integration de glpc_set.* ds gp_contour (variables en commun)

File:

• trunk/SophyaPI/PIGcont/gp_contour.c (modified) (10 diffs)

trunk/SophyaPI/PIGcont/gp_contour.c

@@ -41 +41 @@
  *        Hans-Martin Keller, 1995,1997 (hkeller@gwdg.de)
  *
+ *   Quelques modifs (adaptation pour SOPHYA/PEIDA) O. PErdereau 11/2001
  */
 
@@ -47 +48 @@
 #include "gp_alloc.h"
 #include "gp_axis.h"
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
 /*  #include "setshow.h" */
 
@@ -52 +57 @@
 
 char contour_format[32] = "%8.3g";      /* format for contour key entries */
-t_contour_kind contour_kind = CONTOUR_KIND_LINEAR;
-t_contour_levels_kind contour_levels_kind = LEVELS_AUTO;
-int contour_levels = DEFAULT_CONTOUR_LEVELS;
-int contour_order = DEFAULT_CONTOUR_ORDER;
-int contour_pts = DEFAULT_NUM_APPROX_PTS;
+static t_contour_kind contour_kind = CONTOUR_KIND_LINEAR;
+static t_contour_levels_kind contour_levels_kind = LEVELS_AUTO;
+static int contour_levels = DEFAULT_CONTOUR_LEVELS;
+static int contour_order = DEFAULT_CONTOUR_ORDER;
+static int contour_pts = DEFAULT_NUM_APPROX_PTS;
 
 dynarray dyn_contour_levels_list;/* storage for z levels to draw contours at */
@@ -70 +75 @@
 
 /* Valeur de zero - Reza 21/12/2001 - Pourquoi zero = 0. ??? */
-static double zero = 0.;
+        double zero = 0.;
 
 /* FIXME HBB 2000052: yet another local copy of 'epsilon'. Why? */
@@ -206 +211 @@
 struct iso_curve *iso_lines;
 {
+    struct rusage r_usage;
+    int rcus;
+ 
     int i;
     /*OP    int num_of_z_levels;*/      /* # Z contour levels. */
@@ -217 +225 @@
 
     contour_list = NULL;
-
+    /******* DEBUG ********
+    rcus = getrusage( RUSAGE_SELF , &r_usage);
+    if(rcus==0) 
+      printf("contour[1] / rusage -> %ld , %ld , %ld \n",  r_usage.ru_maxrss , r_usage.ru_ixrss , r_usage.ru_ixrss);
+    else
+      perror("contour/1er appel");
+    *************/
     /* 
      * Calculate min/max values :
@@ -224 +238 @@
                  &x_min, &y_min, &z_min, &x_max, &y_max, &z_max);
 
+
     dz = fabs(z_max - z_min);
     /* 
@@ -232 +247 @@
     gen_triangle(num_isolines, iso_lines, &p_polys, &p_edges);
     crnt_cntr_pt_index = 0;
+
+
     /*AJOUT OP */
     if (contour_levels_kind == LEVELS_NUM) {
@@ -279 +296 @@
     /* Free all contouring related temporary data. */ 
     while (p_polys) {
+        
         p_poly = p_polys->next;
         free(p_polys);
         p_polys = p_poly; 
     }
-    while (p_edges) {
+
+
+    while (p_edges) {        
         p_edge = p_edges->next;
         free(p_edges);
         p_edges = p_edge;
     }
+    /*********DEBUG 
+    rcus = getrusage( RUSAGE_SELF , &r_usage);
+    if(rcus==0) 
+      printf("contour[5] / rusage -> %ld , %ld , %ld \n",  r_usage.ru_maxrss , r_usage.ru_ixrss , r_usage.ru_ixrss);
+    else
+      perror("contour / 5eme appel");
+    rcus = getrusage( RUSAGE_SELF , &r_usage);
+    ********/
 
     return contour_list;
@@ -1534 +1562 @@
     }
 }
+
+
+/* setting et getting de variables */
+/*        OP 01/2002               */
+
+void set_contour_kind(t_contour_kind in){
+  contour_kind = in;
+}
+
+t_contour_kind get_contour_kind(){
+  return (contour_kind);
+}
+
+void set_contour_levels_kind(t_contour_levels_kind in){
+ contour_levels_kind = in;
+
+}
+
+t_contour_levels_kind get_contour_levels_kind(){
+
+  return(contour_levels_kind);
+}
+
+void set_contour_levels(int num){
+  contour_levels = num;
+}
+
+int get_contour_levels(){
+  return(contour_levels);
+}
+void set_contour_levels_list(double *vec){
+
+  contour_levels_list=vec;
+}
+
+/*******
+void set_contour_levels_list(double *vec,int sz){
+  int i;
+  printf(" <set_contour_levels_list> sz %d \n",sz);
+  contour_levels_list = (double *)  malloc(sz*sizeof(double));
+  for (i=0 ; i<sz ; i++){
+    printf(" <set_contour_levels_list> i %d vec %g\n",i,vec[i]);
+    contour_levels_list[i] = vec[i];
+    
+  }
+}
+void free_contour_levels_list(){
+  if(contour_levels_list != NULL){
+    free(contour_levels_list);
+    contour_levels_list = NULL;
+  }
+}
+*****/
+double * get_contour_levels_list(){
+
+return(contour_levels_list);
+}
+