Changeset 558 in Sophya

Timestamp:

Nov 9, 1999, 7:24:44 PM (26 years ago)

Author:

ercodmgr

Message:

Center Image et Cur-LastWdg - Reza 9/9/99

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (4 diffs)
• pistdimgapp.cc (modified) (9 diffs)
• pistdimgapp.h (modified) (2 diffs)
• servnobjm.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -83 +83 @@
   mImgApp->SetInsetLimits(xmin, xmax, ymin, ymax);
   }
+else if (kw == "setimgcenter") {
+  if (tokens.size() < 2) { cout << "Usage: setimgcenter xc yc" << endl;  return(0); }
+  int xc = atoi(tokens[0].c_str());
+  int yc = atoi(tokens[1].c_str());
+  mImgApp->SetImageCenterPosition(xc, yc);
+  }
 else if (kw == "addtext") {
   if (tokens.size() < 4) { cout << "Usage: addtext x y colfontatt txt" << endl;  return(0); }
@@ -689 +695 @@
 usage += ">> ZoomFactors: defzoom zoomx1 zoomx2 zoomx3 zoomx4 zoomx5 \n";
 usage += "                               zoom/2 zoom/3 zoom/4 zoom/5 \n";
+usage += ">> Image centering: centerimg -> Position the image in widget \n";
 usage += ">> Axes:  stdaxes=defaxes=boxaxes  simpleaxes boxaxesgrid \n";
 usage += "          fineaxes  grid=fineaxesgrid \n"; 
@@ -695 +702 @@
 usage += ">> stat/nostat or stats/nostats -> Toggle statistic display flag \n";
 usage += ">> DisplayWindow: next same win stack inset \n";
-usage += "   Related commands: setxylimits setinsetlimits";  
+usage += "   Related commands: setxylimits setinsetlimits setimgcenter";  
 mpiac->RegisterCommand(kw, usage, this, "Graphics");
 
 kw = "setxylimits";
 usage = "Define 2-D plot limits \n Usage: setxylimits xmin xmax ymin ymax";
-usage += "\n  Related commands: graphicatt";  
+usage += "\n  Related commands: graphicatt /xylimits";  
 mpiac->RegisterCommand(kw, usage, this, "Graphics");
 
@@ -708 +715 @@
 usage += " graphic object size (0. .. 1.) Xmax at right, YMax top. ";
 usage += " Usage: setinsetlimits xmin xmax ymin ymax";
-usage += "\n  Related commands: graphicatt";  
+usage += "\n  Related commands: graphicatt /inset";  
+mpiac->RegisterCommand(kw, usage, this, "Graphics");
+
+kw = "setimgcenter";
+usage = "Define image center postion \n Usage: setimgcenter xc yc";
+usage += "\n  Related commands: graphicatt /centerimg";  
 mpiac->RegisterCommand(kw, usage, this, "Graphics");
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -85 +85 @@
 m[3]->AppendItem("Window 3x1", 10431);
 m[3]->AppendItem("Window 3x3", 10433);
+m[3]->AppendItem("Cur->LastWdg", 10441);
 
 m[4] = new PIMenu(Menubar(),"PostScript");
@@ -202 +203 @@
 mAxesFlags = kBoxAxes | kExtTicks | kLabels;
 SetXYLimits(-1, 1., -1., 1.);
+mFXYlim = false;
 SetInsetLimits(0.4, 0.6, 0.4, 0.6);
+SetImageCenterPosition(-1,-1);
+mFImgCenter = false;
 maXlog = maYlog = false;
 SaveGraphicAtt();
@@ -215 +219 @@
 {
 int i;
+
+// Destrucion de tous les objets de NameObjMgr
+string patt = "/*/*";
+mObjMgr->DelObjects(patt, true);
 
 delete mc;
@@ -430 +438 @@
 pii->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 pii->SetZoomWin(zoom, false);
+// Centrage eventuel du pave
+if (mFImgCenter && (mXImgCenter > 0) && (mYImgCenter > 0))
+   pii->SetPave(mXImgCenter, mYImgCenter, false, true);
 pii->SetGloVWin(gimv, false);
 pii->SetCMapWin(cmapv, false);
@@ -1115 +1126 @@
     CreateGraphWin(3,3);
     break;
-
+  case 10441 :
+    if (mCurWdg)  { 
+      mLastWdg = mCurWdg;
+      cout << " Using current widget as last-widget (display same) " << endl;
+      }
+    else  cout << " No current widget - select widget with mouse " << endl;
+    break;
   default:
     cerr << "PIStdImgApp::MBProcess4() BUG?? Msg= " <<  msg << endl;    
@@ -1325 +1342 @@
   mYmin = ymin;  mYmax= ymax;
 }
-
 /* --Methode-- */
 void PIStdImgApp::SetInsetLimits(double xmin, double xmax, double ymin, double ymax)
@@ -1331 +1347 @@
   mIXmin = xmin;  mIXmax= xmax;
   mIYmin = ymin;  mIYmax= ymax;
+}
+/* --Methode-- */
+void PIStdImgApp::SetImageCenterPosition(int x, int y)
+{
+  mXImgCenter = x;  mYImgCenter = y;
 }
 
@@ -1351 +1372 @@
   mSIYmin = mIYmin;  mSIYmax = mIYmax;
   mSFXYlim = mFXYlim;
+  mSXImgCenter = mXImgCenter;
+  mSYImgCenter = mYImgCenter;
+  mSFImgCenter = mFImgCenter;
   mSaXlog = maXlog;
   mSaYlog = maYlog;
@@ -1373 +1397 @@
   mIYmin = mSIYmin;  mIYmax = mSIYmax;
   mFXYlim = mSFXYlim;
+  mXImgCenter = mSXImgCenter;
+  mYImgCenter = mSYImgCenter;
+  mFImgCenter = mSFImgCenter;
   maXlog = mSaXlog;
   maYlog = mSaYlog;

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -102 +102 @@
      void  SetXYLimits(double xmin=-1., double xmax=1., double ymin=-1., double ymax=1.);
      void  SetInsetLimits(double xmin=0.4, double xmax=0.6, double ymin=0.4, double ymax=0.6);
+     void  SetImageCenterPosition(int x=-1, int y=-1);
      inline void  UseXYLimits(bool fg=false) {  mFXYlim=fg; }
+     inline void  UseImageCenter(bool fg=false) { mFImgCenter=fg; }
      inline void  SetXLogScale(bool logx=false) { maXlog = logx; }
      inline void  SetYLogScale(bool logy=false) { maYlog = logy; }
@@ -174 +176 @@
     double       mIXmin, mIXmax, mIYmin, mIYmax;
     double       mSIXmin, mSIXmax, mSIYmin, mSIYmax;
+    int          mXImgCenter, mYImgCenter;
+    int          mSXImgCenter, mSYImgCenter;
     bool         mFXYlim, mSFXYlim;
+    bool         mFImgCenter, mSFImgCenter;
     bool         maXlog, mSaXlog;
     bool         maYlog, mSaYlog;

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1277 +1277 @@
   mImgapp->SetXYLimits();
   mImgapp->UseXYLimits();
+  mImgapp->SetImageCenterPosition();
+  mImgapp->UseImageCenter();
   mImgapp->SetXLogScale();
   mImgapp->SetYLogScale();
@@ -1321 +1323 @@
   // Utilisation limites X-Y
   if ( grt[k] == "xylimits" ) { mImgapp->UseXYLimits(true);  fgsrgr = true;  continue; }
+  if ( grt[k] == "centerimg" ) { mImgapp->UseImageCenter(true);  fgsrgr = true;  continue; }
   // Echelle logarithmique d'axe
   if ( grt[k] == "logx" )  { mImgapp->SetXLogScale(true); fgsrgr = true;  continue; }