Changeset 2778 in Sophya

Timestamp:

May 27, 2005, 5:39:42 PM (20 years ago)

Author:

ansari

Message:

Corrections diveres suite pb imagnav - Reza 27/5/2005

Location:

trunk/SophyaPI/PIext

Files:

• pisiadw.cc (modified) (2 diffs)
• pistdimgapp.cc (modified) (8 diffs)

trunk/SophyaPI/PIext/pisiadw.cc

@@ -71 +71 @@
 void ObjMgrWind::Show()
 {
-// dap->SetBlocked();  Ce n'est plus necessaire - Reza 11/12/99
+PIWindow::Show();
 string cdir;
 dap->ObjMgr()->GetCurrentDir(cdir);
@@ -77 +77 @@
 dirlist->SetValueStr(cdir);
 dap->ObjMgr()->UpdateObjMgrWindow( GetCurDirId() );
-PIWindow::Show();
 return;
 }

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -761 +761 @@
   piin = new PIImageNavigator(win, (char *)name.c_str(), sx, sy, px,py);
   piin->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
+  piin->Show();
   piin->ImageWdg()->ShowCursor(true);
   pii = piin->ImageWdg();
   piin->SetUserData(NULL, oid);
   pii->SetUserData(NULL, oid);
-  //  XSync(PIXDisplay(), False);  
-  // cout << " DBG-ImagNav-BBB-BBB Apres XSync() " << endl;  
-  
 }
 else { // Creation de widget PIImage normal
@@ -778 +776 @@
   pii->SetUserData(NULL, oid);
 }
+
+
+pii->SetImage(nouv, true, false);
+
+// decode des options en chaine de caracteres
+if (mAxesAtt.size() > 0) 
+  pii->DecodeOptionString(mAxesAtt, false);   // Les options d'axe
+if (mDefaultAtt.size() > 0) 
+  pii->DecodeOptionString(mDefaultAtt, false);  // d'abord les options par defaut
+if (opts.size() > 0) 
+  pii->DecodeOptionString(opts);    // ensuite, les options specifies en argument
 
 // On recalcule la taille de la fenetre si Disp_Win
@@ -791 +800 @@
 }
 
-pii->SetImage(nouv, true, false);
-
-// decode des options en chaine de caracteres
-if (mAxesAtt.size() > 0) 
-  pii->DecodeOptionString(mAxesAtt, false);   // Les options d'axe
-if (mDefaultAtt.size() > 0) 
-  pii->DecodeOptionString(mDefaultAtt, false);  // d'abord les options par defaut
-if (opts.size() > 0) 
-  pii->DecodeOptionString(opts);    // ensuite, les options specifies en argument
-
 // printf("!!DBG!! PIImage Pos= %d %d  Size= %d %d \n", pii->XPos(), pii->YPos(), pii->XSize(), pii->YSize()   );
 mCurWin = win;
@@ -806 +805 @@
 mLastWdg = pii;
 mBWId++;
-if (fgimagnav) mBWList[mBWId] = piin;
+if (fgimagnav)  mBWList[mBWId] = piin;
 else mBWList[mBWId] = pii;
 // pii->Refresh();
@@ -1594 +1593 @@
 
   if (fg) {
+    consolecont->Hide();
     consolecont->SetBinding(PIBK_free,PIBK_free,PIBK_free, PIBK_free); 
     int szy = MainWin()->YSize();
@@ -1600 +1600 @@
     consolecont->SetSize(MainWin()->XSize(), szy);
     consolecont->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_fixed); 
+    consolecont->Show();
     statcont->Show();
     m[3]->SetStateMsg(10470, true);
@@ -1605 +1606 @@
   else {
     statcont->Hide();
+    consolecont->Hide();
     consolecont->SetBinding(PIBK_free,PIBK_free,PIBK_free, PIBK_free); 
     MainWin()->SetSize(MainWin()->XSize(), MainWin()->YSize()-statcont->YSize());
@@ -1610 +1612 @@
     consolecont->SetSize(MainWin()->XSize(), MainWin()->YSize());
     consolecont->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_fixed); 
+    consolecont->Show();    
     m[3]->SetStateMsg(10470, false);    
   }