Changeset 386 in Sophya

Timestamp:

Aug 13, 1999, 2:36:09 PM (26 years ago)

Author:

ercodmgr

Message:

suite fit fonction user cmv 13/8/99

File:

• trunk/SophyaPI/PIext/piafitting.cc (modified) (8 diffs)

trunk/SophyaPI/PIext/piafitting.cc

@@ -508 +508 @@
   mFunc = new GeneralFunc(mUFNVar,mUFNPar,mFitFunc,mFitFuncDer);
   mNPar = mUFNPar;
+  cout<<"Fonction utilisateur nvar="<<mUFNVar<<", npar="<<mNPar<<endl;
 } else if(func[0]=='p' && mNVar==1) { //polynome
   int degre=0; if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
@@ -908 +909 @@
 , saveI1(0), saveI2(0), saveJ1(0), saveJ2(0), ErrValue(1.)
 {
+COMPATIBLE_ASSERT(mFitter);
 int npar = mFitter->mNPar;
 
@@ -925 +927 @@
 
 int wszx = (5*bsx+5*spx)+spx;
-int wszy = 8*(bsy+spy)+npar*(bsy+spy)+spy;
+int wszy = 8*(bsy+spy)+npar*(bsy+spy)+2*spy;
 SetSize(wszx, wszy);
 int cpx,cpy;
@@ -931 +933 @@
 // new ligne
 cpx = spx; cpy = spy;
-lab[0] = new PILabel(this,mFitter->mNObj.c_str(),4*bsx,bsy,cpx,cpy);
+string dum = "Object: "+mFitter->mNObj+" , Fun: "+mFitter->mFName;
+lab[0] = new PILabel(this,dum.c_str(),4*bsx,bsy,cpx,cpy);
 lab[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
@@ -954 +957 @@
   pom[0]->AppendItem("Err cste",2102);
   pom[0]->AppendItem("Err sqrt",2103);
+  pom[0]->SetValue(2101);
 pom[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 cpx += int(1.5*bsx+spx);
@@ -1008 +1012 @@
   pom[1]->AppendItem("X.Value",2002);
   pom[1]->AppendItem("X.Auto",2003);
+  pom[1]->SetValue(2001);
 pom[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 cpx += int(1.25*bsx+spx);
@@ -1017 +1022 @@
   pom[2]->AppendItem("Y.Value",2012);
   pom[2]->AppendItem("Y.Auto",2013);
+  pom[2]->SetValue(2011);
 pom[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 cpx += int(1.25*bsx+spx);
@@ -1221 +1227 @@
   if(ReFillGData) mFitter->FillGData();
   ReFillGData = false;
+  if(mFitter->mFit) mFitter->mFit->PrintStatus();
 }
 else if(msg ==111) {