Changeset 2651 in Sophya for trunk/SophyaPI/PIext/pistdimgapp.cc

Timestamp:

Feb 18, 2005, 3:09:47 PM (21 years ago)

Author:

ansari

Message:

Modifications pour l'utilisation viewer PIImageNavigator (ajout commande imagnav) - Reza 18 Fev 2005

File:

• trunk/SophyaPI/PIext/pistdimgapp.cc (modified) (14 diffs)

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -661 +661 @@
 PIApplication::SetBusy();
 // Attention : Appel XSync specifique X11 -  en attendant multi-thread
-XSync(PIXDisplay(), False);  
+// XSync(PIXDisplay(), False);  RZDEL
 }
 
@@ -671 +671 @@
 PIApplication::SetBlocked();
 // Attention : Appel XSync specifique X11 -  en attendant multi-thread
-XSync(PIXDisplay(), False);  
+// XSync(PIXDisplay(), False);  RZDEL
 }
 
@@ -701 +701 @@
 /* --Methode-- */
 int PIStdImgApp::DispImage(P2DArrayAdapter* nouv, string const & name, string const& sop, 
-                           int oid, bool fglock)
-{
-PIImage* pii;
+                           bool fgimagnav, int oid, bool fglock)
+{
+PIImage* pii=NULL;
+PIImageNavigator* piin=NULL; 
 PIWindow* win;
 int sx, sy, px, py, flag;
@@ -738 +739 @@
 px = py = 0;
 win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)name.c_str());
-pii = new PIImage(win, (char *)name.c_str(), sx, sy, px,py);
-pii->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
-pii->SetZoomWin(zoom, false);
-pii->SetGloVWin(gimv, false);
-pii->SetCMapWin(cmapv, false);
-pii->ShowCursor(true);
-pii->SetUserData(NULL, oid);
-
+if (fgimagnav) {  // Creation de naviguateur d'image 
+  piin = new PIImageNavigator(win, (char *)name.c_str(), sx, sy, px,py);
+  piin->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
+  piin->ImageWdg()->ShowCursor(true);
+  pii = piin->ImageWdg();
+  pii->SetUserData(NULL, oid);
+  //  XSync(PIXDisplay(), False);  
+  // cout << " DBG-ImagNav-BBB-BBB Apres XSync() " << endl;  
+  
+}
+else { // Creation de widget PIImage normal
+  pii = new PIImage(win, (char *)name.c_str(), sx, sy, px,py);
+  pii->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
+  pii->SetZoomWin(zoom, false);
+  pii->SetGloVWin(gimv, false);
+  pii->SetCMapWin(cmapv, false);
+  pii->ShowCursor(true);
+  pii->SetUserData(NULL, oid);
+}
 
 // On recalcule la taille de la fenetre si Disp_Win
@@ -776 +788 @@
 mBWList[mBWId] = pii;
 // pii->Refresh();
-pii->Apply();
-cmapv->Refresh();
+  pii->Apply(true);
+  //  cmapv->Refresh();  Pas besoin ? , Reza Fev 2005 
 return(mBWId); 
 }
@@ -1380 +1392 @@
     PIWdg* nw = mGrW->NextChildPosSize(px, py, sx, sy);
 //    cerr << "**DBG** PIStdImgApp::GetWindow() DispNext : nw = " << (long)nw << endl;
-    if (nw) DeleteBaseWidget((PIBaseWdg*)nw, false, false);
+    if (nw) DeleteWidget(nw, false, false);
     flag = mGrIdx;
     mGrIdx = (mGrIdx+1)%(nx*ny);
@@ -1430 +1442 @@
   for(k=0; k<mGrW->NbChilds(); k++) {
     if ((cwd = mGrW->GetChild(k)) == NULL)  continue; 
-    DeleteBaseWidget((PIBaseWdg*)cwd, false, false);
+    DeleteWidget(cwd, false, false);
     }
   mGrW->SetZone(nzx, nzy);
@@ -1461 +1473 @@
 for(k=0; k<w->NbChilds(); k++) {
   if ((cwd = w->GetChild(k)) == NULL)  continue; 
-  DeleteBaseWidget((PIBaseWdg*)cwd,false,false);
+  DeleteWidget(cwd,false,false);
   }
 delete w;
@@ -1468 +1480 @@
 
 /* --Methode-- */
-void PIStdImgApp::DeleteBaseWidget(PIBaseWdg* w, bool dw, bool dwin)
+void PIStdImgApp::DeleteWidget(PIWdg* w, bool dw, bool dwin)
 {
 if (w == NULL)  return;
@@ -1474 +1486 @@
 for(it = mBWList.begin(); it != mBWList.end(); it++) 
   if ((*it).second == w)  { mBWList.erase(it);  break; }
-int k;
-PIDrawer* drw;
-for(k=0; k<w->NbDrawers(); k++) {
-  if ((drw = w->GetDrawer(k)) == NULL)  continue; 
-  DrwMList::iterator itt;
-  for(itt = mDrwList.begin(); itt != mDrwList.end(); itt++) 
-    if ((*itt).second == drw)  { mDrwList.erase(itt);  break; }
-  }
-
-if (w == mCurWdg) {  
+PIBaseWdg* bw = dynamic_cast<PIBaseWdg *>(w);
+if (bw != NULL) {
+  PIDrawer* drw;
+  int k;
+  for(k=0; k<bw->NbDrawers(); k++) {
+    if ((drw = bw->GetDrawer(k)) == NULL)  continue; 
+    DrwMList::iterator itt;
+    for(itt = mDrwList.begin(); itt != mDrwList.end(); itt++) 
+      if ((*itt).second == drw)  { mDrwList.erase(itt);  break; }
+  }
+}
+
+// Reza Fev 2005 - On met systematiquement mCurWdg et mLastWdg a NULL
+// Il peuvent en effet etre un des fils du widget qui est supprime
+// if (w == mCurWdg) {  
+if (true) {    // Reza Fev 2005 - mCurWdg = NULL systematique
   mCurWdg = NULL;
   if (mFgCWImg) {
@@ -1492 +1510 @@
   }
 
-if (w == mLastWdg)  mLastWdg = NULL;
+// if (w == mLastWdg)  mLastWdg = NULL;
+mLastWdg = NULL; // Reza Fev 2005 - mLastWdg = NULL systematique
 
 PIWdg* pw=NULL;
-if (dwin)  pw = (PIWdg*)(w->Parent());
-//DBG printf("DeleteBaseWidget(%lx)-DBG kind = %d - %d %d \n", (long)w, w->kind(), (int)dw, (int)dwin); 
-if (dw) delete w;
-if (pw && (pw->kind() == PIWindow::ClassId )) {
- PIWindow* pww = (PIWindow*) pw;
- if ((pww != (PIWindow*)mGrW) && (pww != (PIWindow*)mStW) && (pww->NbChilds()==0)) 
+pw = (PIWdg*)(w->Parent());
+//DBG printf("DeleteWidget(%lx)-DBG kind = %d - %d %d \n", (long)w, w->kind(), (int)dw, (int)dwin); 
+if (dw) { 
+  if (pw && (pw->kind() == PIImageNavigator::ClassId) )  { 
+    delete pw;
+    pw = NULL;
+  }
+  else delete w;
+}
+if (dwin && pw && (pw->kind() == PIWindow::ClassId )) {
+ PIWindow* pww = dynamic_cast<PIWindow *>(pw);
+ if (pww && (pww != (PIWindow*)mGrW) && (pww != (PIWindow*)mStW) && (pww->NbChilds()==0)) 
     DeleteWindow((PIWindow*)pw);
  } 
@@ -1516 +1541 @@
   it  = mBWList.find(k);
   if (it == mBWList.end())  return;
-  PIBaseWdg* wd = (*it).second;
+  PIWdg* wd = (*it).second;
 //DBG cerr << "-DBG- PIStdImgApp::DelWRsId Deleting BaseWidget " << (long)(wd) << endl ; 
-  DeleteBaseWidget(wd, true, true);
+  DeleteWidget(wd, true, true);
   }
 else {  // C'est un drawer
@@ -1867 +1892 @@
     if (mCurWdg) {
       int oid = mCurWdg->UserFlag();
-      DeleteBaseWidget(mCurWdg);
+      DeleteWidget(mCurWdg);
       mObjMgr->DelObj_Id(oid);
       }
@@ -1964 +1989 @@
     if (mStW) {
       PIWdg* cw =  mStW->CurrentWdg();
-      if (cw) DeleteBaseWidget((PIBaseWdg*)cw);
+      if (cw) DeleteWidget(cw);
       }
     break;