Changeset 1911 in Sophya

Timestamp:

Feb 23, 2002, 4:32:50 PM (24 years ago)

Author:

cmv

Message:

%g dans fenetre fit, pn de \n dans Help cmv 23/2/2002

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• piafitting.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -1319 +1319 @@
 usage += "o <Alt>Z : Removes added signs (text) to Drawer 0 \n";
 usage += "o <Alt>I : Shows (or updates) a text info window on the selected rectangle \n";
-usage += "o <Alt>M : Activate/Deactivate a measurement cursor on Button-1";
-usage += "o <Alt>L : Deactivate DX,DY print (see below)";
+usage += "o <Alt>M : Activate/Deactivate a measurement cursor on Button-1\n";
+usage += "o <Alt>L : Deactivate DX,DY print (see below)\n";
 usage += ">>>> Mouse + Keyboard controls : \n";
 usage += "o Button-1 + <Alt>K : Set (reset) the reference point for DX,DY print \n";

trunk/SophyaPI/PIext/piafitting.cc

@@ -1424 +1424 @@
 // Les champs textes
 char str[128]; string dum;
-sprintf(str,"%f",mFitter->mOpt.err_scale); dum=str; txt[0]->SetText(dum);
-sprintf(str,"%f",mFitter->mOpt.err_min);   dum=str; txt[1]->SetText(dum);
+sprintf(str,"%g",mFitter->mOpt.err_scale); dum=str; txt[0]->SetText(dum);
+sprintf(str,"%g",mFitter->mOpt.err_min);   dum=str; txt[1]->SetText(dum);
 sprintf(str,"%d,%d",mFitter->mOpt.lp,mFitter->mOpt.lpg); dum=str; txt[2]->SetText(dum);
-sprintf(str,"%f",mFitter->mOpt.stc2);  dum=str; txt[3]->SetText(dum);
+sprintf(str,"%g",mFitter->mOpt.stc2);  dum=str; txt[3]->SetText(dum);
 sprintf(str,"%d",mFitter->mOpt.nstep); dum=str; txt[4]->SetText(dum);
 sprintf(str,"%d",mFitter->mOpt.i1);    dum=str; txt[5]->SetText(dum);
@@ -1433 +1433 @@
 sprintf(str,"%d",mFitter->mOpt.j1);    dum=str; txt[7]->SetText(dum);
 sprintf(str,"%d",mFitter->mOpt.j2);    dum=str; txt[8]->SetText(dum);
-sprintf(str,"%f",mFitter->mOpt.xc);    dum=str; txt[9]->SetText(dum);
-sprintf(str,"%f",mFitter->mOpt.yc);    dum=str; txt[10]->SetText(dum);
+sprintf(str,"%g",mFitter->mOpt.xc);    dum=str; txt[9]->SetText(dum);
+sprintf(str,"%g",mFitter->mOpt.yc);    dum=str; txt[10]->SetText(dum);
 if(npar>0) {
   for(int i=0;i<npar;i++) {
-    sprintf(str,"%f",mFitter->mPar(i));  dum=str; txt[15+4*i+0]->SetText(dum);
-    sprintf(str,"%f",mFitter->mStep(i)); dum=str; txt[15+4*i+1]->SetText(dum);
-    sprintf(str,"%f",mFitter->mMin(i));  dum=str; txt[15+4*i+2]->SetText(dum);
-    sprintf(str,"%f",mFitter->mMax(i));  dum=str; txt[15+4*i+3]->SetText(dum);
+    sprintf(str,"%g",mFitter->mPar(i));  dum=str; txt[15+4*i+0]->SetText(dum);
+    sprintf(str,"%g",mFitter->mStep(i)); dum=str; txt[15+4*i+1]->SetText(dum);
+    sprintf(str,"%g",mFitter->mMin(i));  dum=str; txt[15+4*i+2]->SetText(dum);
+    sprintf(str,"%g",mFitter->mMax(i));  dum=str; txt[15+4*i+3]->SetText(dum);
   }
 }