Changeset 1919 in Sophya for trunk/SophyaPI/PIGcont/picntools.cc

Timestamp:

Mar 6, 2002, 5:46:47 PM (24 years ago)

Author:

perderos

Message:

correction de bugs dans setting des niveaux + changement du defaut du trace
OP 06-03-2002

File:

• trunk/SophyaPI/PIGcont/picntools.cc (modified) (7 diffs)

trunk/SophyaPI/PIGcont/picntools.cc

@@ -531 +531 @@
 t_contour_levels_kind lvkind = dr->GetCntLevelKind()  ;
 for (ii=0 ; ii<4 ; ii++)
-  if(crbe_algo[ii]==kind)
+  if(lev_kind[ii]==lvkind)
     {mOpt[9]->SetValue(910+ii); break;}
 
@@ -538 +538 @@
 sprintf(txt,"%d",nlv);
 mTxt[0]->SetText(txt);  
-// cout << " nlv "<<nlv<< endl;
+
 if(dr->Levels()!=NULL){
   string strg=" ";
   for(int kk=0 ; kk<nlv ; kk++) {
-    cout << " dr->Level("<<kk<<") "<<endl;
+    //cout << " dr->Level("<<kk<<") "<<endl;
     cout <<dr->Level(kk)<<endl;
-    sprintf(txt,"%g",dr->Level(kk)); 
+    if (kk!=nlv-1)
+       sprintf(txt,"%g ,",dr->Level(kk)); 
+    else
+      sprintf(txt,"%g",dr->Level(kk)); 
+
     strg += txt;
   }
@@ -569 +573 @@
 int k,ii,jj,kk;
 
-k = mOpt[8]->GetValue()-900; // type de ligne 
+k = mOpt[8]->GetValue()-900; // type de contour 
 dr->SetCntKind(crbe_algo[k]);
 
@@ -576 +580 @@
 
 string str=mTxt[0]->GetText();
+
 ii=atoi(str.c_str());
-dr->SetNLevel(ii);
+if(ii>0) 
+  dr->SetNLevel(ii);
+else 
+  cerr<< " PICnTools::SetCalcParm ERREUR noombre de contours <=0 "<<ii<<endl;
 char *buff;
 char *tmp;
 str=mTxt[1]->GetText();
+
 buff=strdup(str.c_str());
 double * zlev=NULL;
@@ -587 +596 @@
   zlev = new double[2];
   tmp = strtok(buff,",");
+  if(tmp ==NULL) {
+    cerr<< " PICnTools::SetCalcParm ERREUR decodage des niveaux impossible avec " << buff <<endl;
+    return;
+  }
   zlev[0] = atof(tmp);
+  
   tmp = strtok(NULL,",");
+  if(tmp ==NULL) {
+    cerr<< " PICnTools::SetCalcParm ERREUR decodage des niveaux impossible avec " << buff <<endl;
+    return;
+  }
   zlev[1]= atof(tmp);
   dr->SetMyLevels(zlev,2);
@@ -596 +614 @@
   zlev = new double[ii];
   tmp = strtok(buff,",");
+  if(tmp ==NULL) {
+    cerr<< " PICnTools::SetCalcParm ERREUR decodage des niveaux impossible dans  " << buff <<endl;
+    return;
+  }
+  int cntr = 0;
   for(jj=0 ; jj<ii ; jj++){
       zlev[jj]= atof(tmp);
-      cout << " jj "<<zlev[jj]<<endl;
-      tmp = strtok(NULL,",");
+      cntr++;
+      //cout << " jj "<<zlev[jj]<<endl;
+      tmp = strtok(NULL,"," );
+      if(tmp == NULL) {
+        
+        break;
+      }
+      cout << " tmp = <"<<tmp<<"<"<<endl;
+
+  }
+  if(cntr<ii) {
+    cerr<< " PICnTools::SetCalcParm ERREUR decodage des niveaux "<<cntr
+        <<" trouves sur "<<ii<<" dans " << buff <<endl;
+    return;
+
   }
   dr->SetMyLevels(zlev,ii);
@@ -605 +641 @@
 
 
-} 
+}  
 
 //