Changeset 193 in Sophya for trunk/SophyaPI

Timestamp:

Jan 20, 1999, 2:54:14 PM (27 years ago)

Author:

ercodmgr

Message:

aper: centrage pave autour pix + brillant (cmv 20/1/99)

File:

• trunk/SophyaPI/PIext/piacmd.cc (modified) (5 diffs)

trunk/SophyaPI/PIext/piacmd.cc

@@ -881 +881 @@
 //|      : la = "a" niveau de print
 //|      : c  = la surface pour la photometrie est un carre (defaut=cercle)
+//|      : C  = recentrage du pave sur le pixel le + brillant  (defaut=non)
 //| tokens[2] = options graphiques
 //| Return: 0 si Ok, <0 sinon.
@@ -888 +889 @@
 int typ_fond=1, rmin=0, rmax, npt_gliss=4, lp=0;
 float fondimpos=0., fondbord=0., fondautre;
-bool cercle = true;
+bool cercle=true, centre=false;
 string opt="";
 string dummy; string dum;
@@ -910 +911 @@
     if(dum.length()>2) sscanf(dum.c_str(),",l%d",&lp);
   }
-  if(strstr(dummy.c_str(),",c")) {
-    cercle = false;
-  }
+  if(strstr(dummy.c_str(),",c")) cercle = false;
+  if(strstr(dummy.c_str(),",C")) centre = true;
 }
 
@@ -953 +953 @@
 if(rmin>=rmax)
   {cout<<"rayon mini="<<rmin<<">= rmax="<<rmax<<endl; return(-11);}
+if(centre) {  // Recentrage autour du pixel le + brillant?
+  int xcnew=-1, ycnew=-1; float pxnew=-1.e20,pxold=-1.e20,px;
+  for(int j=yc-rmax;j<=yc+rmax;j++) {
+    if(j<0 || j>=img->YSize()) continue;
+    for(int i=xc-rmax;i<=xc+rmax;i++) {
+      if(i<0 || i>=img->XSize()) continue;
+      px = (*img)(i,j);
+      if(i==xc && j==yc) pxold = px;
+      if((xcnew==-1 && ycnew==-1) || px>=pxnew) {xcnew=i; ycnew=j; pxnew=px;}
+      // cout<<"xcnew,ycnew,pxnew="<<xcnew<<" "<<ycnew<<" "<<pxnew<<endl;
+  } }
+  if(lp>1) cout<<"Re-centrage(x,y,px): old=("<<xc<<","<<yc<<","<<pxold<<")"
+               <<" -> new=("<<xcnew<<","<<ycnew<<","<<pxnew<<")"<<endl;
+  if(xcnew!=-1 && ycnew!=-1 && pxnew>pxold) {xc=xcnew; yc=ycnew;}
+}
 int x0=xc-rmax, y0=yc-rmax, x1=xc+rmax, y1=yc+rmax;
 if(x0<0||y0<0||x1>=img->XSize()||y1>=img->YSize())
@@ -964 +979 @@
 if(lp>1)
   cout<<"photom_ouv[cercle="<<cercle<<",typ="<<typ_fond<<"]: pav["
-      <<dx<<","<<dy<<" ("<<dxym
-      <<"] xc,yc="<<xc<<","<<yc<<"] ic,jc="<<ic<<","<<jc<<endl
-      <<"] (fond="<<fondimpos<<") pxmil="<<(*pav)(ic,ic)
+      <<dx<<","<<dy<<","<<dxym
+      <<"] xc,yc=["<<xc<<","<<yc<<"] ic,jc="<<ic<<","<<jc<<endl
+      <<"          (fond="<<fondimpos<<") pxmil="<<(*pav)(ic,ic)
       <<" -> Rph de "<<rmin<<" a "<<rmax<<endl;