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

Timestamp:

May 24, 2005, 6:31:58 PM (20 years ago)

Author:

ansari

Message:

Suite corrections ZSync + correction (probable) du probleme de plantage a la fin lie a imagnav - reste a corriger menu::del_cur_widget - Reza 24/05/2005

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -763 +763 @@
   piin->ImageWdg()->ShowCursor(true);
   pii = piin->ImageWdg();
+  piin->SetUserData(NULL, oid);
   pii->SetUserData(NULL, oid);
   //  XSync(PIXDisplay(), False);  
@@ -805 +806 @@
 mLastWdg = pii;
 mBWId++;
-mBWList[mBWId] = pii;
+if (fgimagnav) mBWList[mBWId] = piin;
+else mBWList[mBWId] = pii;
 // pii->Refresh();
   pii->Apply(true);
@@ -1505 +1507 @@
 for(it = mBWList.begin(); it != mBWList.end(); it++) 
   if ((*it).second == w)  { mBWList.erase(it);  break; }
-PIBaseWdg* bw = dynamic_cast<PIBaseWdg *>(w);
+PIBaseWdg* bw = NULL;
+if (w->kind() == PIImageNavigator::ClassId) {
+  PIImageNavigator* piin = dynamic_cast<PIImageNavigator *>(w);
+  if (piin) bw = piin->ImageWdg();
+}                                
+else bw = dynamic_cast<PIBaseWdg *>(w);
 if (bw != NULL) {
   PIDrawer* drw;
@@ -1517 +1524 @@
 }
 
-// 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
+if ( (w == mCurWdg) || (bw == mCurWdg) ) {  
   mCurWdg = NULL;
   if (mFgCWImg) {
@@ -1529 +1533 @@
   }
 
-// if (w == mLastWdg)  mLastWdg = NULL;
-mLastWdg = NULL; // Reza Fev 2005 - mLastWdg = NULL systematique
+if ( (w == mLastWdg) || (bw == mLastWdg) ) mLastWdg = NULL;
 
 PIWdg* pw=NULL;
 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)) 
+if (dw)  delete w;
+
+if (dwin && pw) { 
+  PIWindow* pww = dynamic_cast<PIWindow *>(pw);
+  if (pww && (pww != (PIWindow*)mGrW) && (pww != (PIWindow*)mStW) && (pww->NbChilds()==0)) 
     DeleteWindow((PIWindow*)pw);
- } 
+  } 
 return;
 }
@@ -1911 +1909 @@
     if (mCurWdg) {
       int oid = mCurWdg->UserFlag();
-      DeleteWidget(mCurWdg);
+      //RZDEL-Mai2005      DeleteWidget(mCurWdg);
       mObjMgr->DelObj_Id(oid);
       }