Changeset 368 in Sophya for trunk/SophyaPI/PIext/piafitting.cc

Timestamp:

Aug 9, 1999, 1:57:10 PM (26 years ago)

Author:

ercodmgr

Message:

modifs Fenetre de fit et gestion repertoire /func Reza 9/8/99

File:

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

trunk/SophyaPI/PIext/piafitting.cc

@@ -29 +29 @@
 
 ////      ----------    Classe de fenetre de fit interactive ------------
+#define FINPARMAX  10    // Nb maxi de parametres de fit 
+
 class PIAFitterWind :  public PIWindow {
 public :
@@ -36 +38 @@
   virtual void  Process(PIMessage msg, PIMsgHandler* sender, void* data=NULL);
   inline  void  SetObjName(string& nom) { oname = nom; }
+          void  SetNbParms(int npar);
 protected :
   PIStdImgApp* dap;
   PIAFitter* fitter;
+  PILabel* labn;  
   PIOptMenu* pom[2];
-  PILabel* lab[2];  // Maximum 20 parametres
-  PIText* txt[2];   //     "    "      " 
   PIButton* but[2];
   PICheckBox* ckb[2];
+  PILabel* lab[2];
+  PILabel* labp[FINPARMAX];   // Maximum FINPARMAX  parametres
+  PIText* txtp[FINPARMAX];    //        "       "      "
+  PIText* txts[FINPARMAX];    //        "       "      "  
   string oname;
 };
@@ -101 +107 @@
 }
 else if (kw == "fitw") {
+  if (tokens.size() < 1) {
+    cout << "Usage: fitw nomobj" << endl;
+    return(0);
+    }
   cout << " *DBG* Affichage PIAFitterWind ** " << endl;
+  fwind->SetObjName(tokens[0]);
   fwind->Show();
  }
@@ -592 +603 @@
 spy = bsy/4;
 
-int wszx = 5*spx+3*bsx; 
+int wszx = 3*spx+4*bsx; 
 int wszy = 5*bsy+6*spy;
 SetSize(wszx, wszy);
 int cpx = spx;
 int cpy = spy;
-int csx = cpx;
-int csy = cpy;
-lab[0] = new PILabel(this, "Object", 1.5*bsx, bsy, cpx, cpy);
+
+cpx = spx+bsx;
+labn = new PILabel(this, "ObjectName", 2.0*bsx, bsy, cpx, cpy);
+labn->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+
 cpy += spy+bsy;
-lab[1] = new PILabel(this, "Params", 1.5*bsx, bsy, cpx, cpy);
-cpx += bsx*1.5+spx;
-
-cpy = spy;
-txt[0] = new PIText(this, "", 3.5*bsx, bsy, cpx, cpy);
+cpx = spx;
+ckb[0] = new PICheckBox(this,"Gen.Func", 1001, 2*bsx, bsy, cpx, cpy);
+cpx += bsx*2+spx;
+ckb[1] = new PICheckBox(this,"Gen.Resid", 1002, 2*bsx, bsy, cpx, cpy);
+ckb[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+ckb[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+
 cpy += spy+bsy;
-txt[1] = new PIText(this, "1.", 3.5*bsx, bsy, cpx, cpy);
-
-cpy += spy+bsy;
-ckb[0] = new PICheckBox(this,"Gen.Func", 1001, 2.5*bsx, bsy, cpx, cpy);
-cpx += bsx*1.5+spx;
-ckb[1] = new PICheckBox(this,"Gen.Resid", 1002, 2.5*bsx, bsy, cpx, cpy);
-
-cpy += spy+bsy;
-pom[0] = new PIOptMenu(this, "FitFunc", 2.5*bsx, bsy, cpx, cpy);
+cpx = spx;
+pom[0] = new PIOptMenu(this, "FitFunc", 2*bsx, bsy, cpx, cpy);
 pom[0]->AppendItem("Poly0", 100);
 pom[0]->AppendItem("Poly1", 101);
@@ -623 +631 @@
 pom[0]->AppendItem("Gauss+Poly1",105);
 pom[0]->AppendItem("Gauss+Poly2",106);
-
-cpx += bsx*1.5+spx;
-pom[1] = new PIOptMenu(this, "Bidon", 2.5*bsx, bsy, cpx, cpy);
-pom[1]->AppendItem("Un", 150);
-pom[1]->AppendItem("Deux",250);
-pom[1]->AppendItem("Trois",350);
+pom[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+
+cpx += bsx*2+spx;
+pom[1] = new PIOptMenu(this, "NPar", 2*bsx, bsy, cpx, cpy);
+pom[1]->AppendItem("Un NP=1", 201);
+pom[1]->AppendItem("Deux NP=2",202);
+pom[1]->AppendItem("Trois NP=3",203);
+pom[1]->AppendItem("Cinq  NP=5",205);
+pom[1]->AppendItem("Huit  NP=8",208);
+pom[1]->AppendItem("Dix  NP=10",210);
+pom[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
 
 cpy += spy+bsy;
-cpx = 0.5*spx;
-but[0] =  new PIButton(this, "DoFit", 555, bsx*2, bsy, cpx, cpy);
-cpx += 3*spx;
-but[1] =  new PIButton(this, "Dismiss", 777, bsx*2, bsy, cpx, cpy);
-
-}
+cpx = 0.5*bsx;
+but[0] =  new PIButton(this, "DoFit", 555, bsx*1.5, bsy, cpx, cpy);
+cpx += bsx*1.5+3*spx;
+but[1] =  new PIButton(this, "Dismiss", 777, bsx*1.5, bsy, cpx, cpy);
+but[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+but[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+
+//  Pour les parametres
+cpy += bsy+spy;
+cpx = 0.6*bsx+1.5*spx;
+lab[0] = new PILabel(this, "Init.Val", 1.7*bsx, bsy, cpx, cpy);
+cpx += 1.7*bsx+0.5*spx;
+lab[1] = new PILabel(this, "Step", 1.7*bsx, bsy, cpx, cpy);
+lab[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+lab[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+
+for(int i=0; i<FINPARMAX; i++) {
+  char buff[32];
+  cpy += bsy+spy;
+  cpx = spx;
+  sprintf(buff, "P%d",i);
+  labp[i] = new PILabel(this, buff, 0.6*bsx, bsy, cpx, cpy);
+  labp[i]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+  sprintf(buff, "Val%d",i);
+  cpx += 0.6*bsx+0.5*spx;
+  txtp[i] = new PIText(this, buff, 1.7*bsx, bsy, cpx, cpy);
+  txtp[i]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+  sprintf(buff, "Step%d",i);
+  cpx += 1.7*bsx+0.5*spx;
+  txts[i] = new PIText(this, buff, 1.7*bsx, bsy, cpx, cpy);
+  txts[i]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
+  }  
+}
+
 /* --Methode-- */
 PIAFitterWind::~PIAFitterWind()
 {
-for(int i=0; i<2; i++) {
-  delete lab[i];
-  delete txt[i];
+int i;
+for(i=0; i<2; i++) {
   delete pom[i];
   delete ckb[i];
   delete but[i];
   }
-}
+delete labn;
+delete lab[0];
+delete lab[1];
+for(i=0; i< FINPARMAX; i++) {
+  delete labp[i];
+  delete txtp[i];
+  delete txts[i];
+  }
+}
+
+/* --Methode-- */
+void PIAFitterWind::SetNbParms(int npar)
+{
+if (npar < 1) npar = 1;
+if (npar > FINPARMAX) npar = FINPARMAX;
+
+int bsx, bsy, spx, spy;
+
+dap->PrefCompSz(bsx, bsy);
+spx = bsx/10;
+spy = bsy/4;
+
+int wszx = 3*spx+4*bsx; 
+int wszy = (5+npar)*bsy+(6+npar)*spy;
+SetSize(wszx, wszy);
+
+int i;
+for(i=0; i<npar; i++) {
+  labp[i]->Manage();
+  txtp[i]->Manage();
+  txts[i]->Manage();
+  }
+for(i=npar; i<FINPARMAX; i++) {
+  labp[i]->UnManage();
+  txtp[i]->UnManage();
+  txts[i]->UnManage();
+  }
+
+}
+
 /* --Methode-- */
 void PIAFitterWind::Show()
 {
 // Si on veut initialiser des trucs au moment ou apparait la fenetre
-txt[0]->SetText(oname);
+labn->SetLabel(oname);
+SetNbParms(3);
+pom[1]->SetValue(203);
 PIWindow::Show();
 }
@@ -662 +743 @@
 char *mf[7] = {"p0","p1","p2","g","g0","g1","g2"};
 msg = UserMsg(msg);
+
+if ((msg > 200) && (msg <= 200+FINPARMAX)) {  // On change le nombre de parametre
+  SetNbParms(msg-200);
+  return;
+  }
+  
 if (msg == 777)  { Hide(); return; }  // On cache la fenetre
 
@@ -674 +761 @@
   cmd += " " + a + " ";
   args.push_back(a);
-  a = txt[1]->GetText();  // Definition des parametres
   cmd += a;
   args.push_back(a);