Changeset 333 in Sophya for trunk/SophyaPI/PIext/pisiadw.cc

Timestamp:

Jul 12, 1999, 1:12:29 PM (26 years ago)

Author:

ercodmgr

Message:

Trace de NTuple en 2D avec Marker de taille proportionnelle a Weight
Introduction des repertoires dans la gestion d'objets NameObjMgr
Reorganisation NamedObjMgr et Services2NObjMgr, ajout de commandes , ...
Reza 12/7/99

File:

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

trunk/SophyaPI/PIext/pisiadw.cc

@@ -34 +34 @@
 // On definit la taille a partir de la taille par defaut des composantes 
 PIApplicationPrefCompSize(bsx, bsy);
-spx = bsx/4;   spy = bsy/3;
-tsx = 5*bsx+6*spx;  tsy = 7*bsy+4*spy;
+spx = bsx/4;   spy = bsy/4;
+tsx = 4.0*bsx+3*spx;  tsy = 6*bsy+7*spy;
 SetSize(tsx,tsy);
-objlist = new PIList(this, "objlist", tsx-spx, tsy-4*spy-bsy, spx/2, spy/2);
+dirlist = new PIOptMenu(this, "dirlist", 2.5*bsx, bsy, spx+0.25*bsx, spy); 
+dirlist->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+objlist = new PIList(this, "objlist", 3*bsx, tsy-3*spy-bsy, spx, 2*spy+bsy);
 objlist->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
-objlist->SetBorderWidth(2);
-
-int py = tsy-2*spy-bsy;
-int px = spx;
-mBut[0] = new PIButton(this, "Display", 100, bsx, bsy, px, py);   px += (bsx+spx);
-mBut[1] = new PIButton(this, "Print",   200, bsx, bsy, px, py);   px += (bsx+spx);
-mBut[2] = new PIButton(this, "SavePPF", 300, bsx, bsy, px, py);   px += (bsx+spx);
-mBut[3] = new PIButton(this, "Delete",  400, bsx, bsy, px, py);   px += (bsx+spx);
-mBut[4] = new PIButton(this, "Dismiss", 900, bsx, bsy, px, py);   px += (bsx+spx);
+// objlist->SetBorderWidth(2);
+
+int py = spy;
+int px = 2*spx+3*bsx;
+mBut[0] = new PIButton(this, "SetCurDir", 20, bsx, bsy, px, py);   py += (bsy+spy);
+mBut[1] = new PIButton(this, "Display", 20, bsx, bsy, px, py);   py += (bsy+spy);
+mBut[2] = new PIButton(this, "Print",   30, bsx, bsy, px, py);   py += (bsy+spy);
+mBut[3] = new PIButton(this, "SavePPF", 40, bsx, bsy, px, py);   py += (bsy+spy);
+mBut[4] = new PIButton(this, "Delete",  50, bsx, bsy, px, py);   py += (bsy+spy);
+mBut[5] = new PIButton(this, "Dismiss", 90, bsx, bsy, px, py);   py += (bsy+spy);
 
 for(i=0; i<5; i++)
@@ -59 +62 @@
 {
 int i;
+delete dirlist;
 delete objlist;
-for(i=0; i<5; i++)  delete mBut[i];
+for(i=0; i<6; i++)  delete mBut[i];
 }
 
@@ -67 +71 @@
 {
 dap->SetBlocked();
+string cdir;
+dap->ObjMgr()->GetCurrentDir(cdir);
+cdir = '/' + cdir;
+dirlist->SetValueStr(cdir);
+dap->ObjMgr()->UpdateObjMgrWindow(dirlist->GetValue()-30000);
 PIWindow::Show();
 return;
@@ -77 +86 @@
   // PIMessage ssg = ModMsg(msg);
 msg = UserMsg(msg);
-if (msg == 900)  {
+if (msg == 90)  {
   dap->SetReady();
   this->Hide();
   return;
-}
+  }
+else if (msg >= 30000) {
+  dap->ObjMgr()->UpdateObjMgrWindow(msg-30000);
+  return;
+  }
+else if (msg == 10) {
+  string cdir = dirlist->GetValueStr();
+  dap->ObjMgr()->SetCurrentDir(cdir);
+  return;
+  }
 
 string nom = "";
-if ( (msg == 100) || (msg == 200) || (msg == 300) || (msg == 400) ) {
+if ( (msg == 20) || (msg == 30) || (msg == 40) || (msg == 50) ) {
   string sel = objlist->GetSelectionStr();
   //  size_t p = sel.find_first_not_of(" \t");
@@ -91 +109 @@
   size_t q = sel.find_first_of(" \t");
   if (q > l)   q = l; 
-  nom = sel.substr(0, q);
-}
+  nom = dirlist->GetValueStr() + '/' + sel.substr(0, q);
+  }
 
 NamedObjMgr* om = dap->ObjMgr();
 if (om == NULL)  return;
-if (nom == "")  return;
+if (nom.length() < 1)  return;
 
 switch (msg)
   {
-  case 100:
+  case 20:
     om->DisplayObj(nom);
     break;
-  case 200:
+  case 30:
     om->PrintObj(nom);
     break;
-  case 300:
-    if (dap->mPpfout)  om->SaveObj(nom, *(dap->mPpfout));
-    break;
-  case 400:
+  case 40:
+    if (dap->mPpfout)  om->SaveObj(nom, *(dap->mPpfout), false);
+    break;
+  case 50:
     om->DelObj(nom);
-    break;
-
-  case 900:
-    dap->SetReady();
-    Hide();
+    objlist->DeleteItemMsg(objlist->GetSelection());
+    //    dap->ObjMgr()->UpdateObjMgrWindow(dirlist->GetValue()-30000);
     break;
 
@@ -218 +233 @@
   if (ln <= 0)  nom = "?";
   else { strncpy(noms, mPin->TagName(i).c_str(), 31);  noms[31] = '\0'; nom = noms; }
-//  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, dap->ObjMgr()->GetServiceObj()->PClassIdToClassName(cid), key);
-  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, " DataObject ?", key);
+  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, dap->ObjMgr()->GetServiceObj()->PClassIdToClassName(cid), key);
+  //  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, " DataObject ?", key);  Attention SANS_EVOLPLANCK
   objlist->AppendItem(strg, 5000+i);
 }