Changeset 1855 in Sophya

Timestamp:

Jan 12, 2002, 1:41:47 AM (24 years ago)

Author:

ansari

Message:

Correction diverses (PIDrwTools en particulier) Reza 11/01/2001

Location:

trunk/SophyaPI/PI

Files:

• pidrawer.cc (modified) (4 diffs)
• pidrwtools.cc (modified) (8 diffs)
• piscdrawwdg.cc (modified) (2 diffs)
• pisurfdr.cc (modified) (1 diff)
• psfile.cc (modified) (1 diff)

trunk/SophyaPI/PI/pidrawer.cc

@@ -7 +7 @@
 #include <strings.h>
 #include <iostream.h>
-#include <typeinfo>
+// #include <typeinfo>
 #include "pidrawer.h"
 
@@ -66 +66 @@
 
   // Nom par defaut : Le nom de la classe
-  mName = typeid(*this).name();
+  //  mName = typeid(*this).name();
+  mName = "PIDrawer";
   // Par defaut, pas de fenetre de controle specifique
   mFgSpecContWind = false;
@@ -552 +553 @@
   int kk;
 
-  g->SelFontSz(xMajTickLen*3., mFAtt);
+  if (mFSz == PI_NotDefFontSize) 
+    g->SelFontSz(xMajTickLen*3., mFAtt);
 
   // Choix du bon format pour les labels des axes;
@@ -581 +583 @@
 {
   double xOffset = 0;
-  g->SelFontSz(xMajTickLen*3., mFAtt);
+
+  if (mFSz == PI_NotDefFontSize) 
+    g->SelFontSz(xMajTickLen*3., mFAtt);
 
   // Choix du bon format pour les labels des axes;

trunk/SophyaPI/PI/pidrwtools.cc

@@ -80 +80 @@
 if (mCurBW == cbw) return;
 mCurBW = cbw;
-cwdrwt->UpdateControlsFromDrawer(-1);
+if (cwdrwt != NULL)
+  cwdrwt->UpdateControlsFromDrawer(-9);
 }
 
@@ -256 +257 @@
 mButdr[0] = new PIButton(this, "-", 1501, bsy, bsy, cpx, cpy);
 cpx += bsy+0.25*spy;
-mNlb = new PILabel(this,"NumDr", 1.5*bsy, bsy, cpx, cpy);
+mNlb = new PILabel(this,"NumDr", 1.2*bsy, bsy, cpx, cpy);
 mNlb->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 mNlb->SetLabel("");
 mNDr = 0;
-cpx += 1.5*bsy+0.25*spy;
+cpx += 1.2*bsy+0.25*spy;
 mButdr[1] = new PIButton(this, "+", 1502, bsy, bsy, cpx, cpy);
 mButdr[0]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
@@ -268 +269 @@
   mButdr[kb]->SetUnSensitive();
 }
-cpx += 2*spx; 
+cpx += bsy+2*spx; 
 mDrName = new PILabel(this,"DrName", wszx-2*spx-cpx, bsy, cpx, cpy);
 mDrName->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
@@ -276 +277 @@
 cpy += bsy+spy;
 cpx = 2*spx;
-int butszx = 0.8*bsx;
+int butszx = 0.7*bsx;
 mButcf[0] = new PIButton(this, "GetAtt", 2500, butszx, bsy, cpx, cpy);
 cpx += butszx+spx;
@@ -349 +350 @@
 {
 PIWindow::Show();
-UpdateControlsFromDrawer(-1);
+UpdateControlsFromDrawer(-9);
 UpdateAttFromDrawer();
 return;
@@ -364 +365 @@
   
   if (mCurBW != NULL) {
-    if (numdr < 0) { 
+    if (numdr < -1) { 
       if (mCurBW->NbDrawers() > 0)  mNDr = mCurBW->GetActiveDrawerNum();
       else mNDr = -1;
@@ -370 +371 @@
     else { 
       if (mCurBW->NbDrawers() > 0) {
+        mNDr = numdr;
         if (mNDr < 0)  mNDr = 0;
-        else if (mNDr >= mCurBW->NbDrawers()) mNDr = mCurBW->NbDrawers();
+        else if (mNDr >= mCurBW->NbDrawers()) mNDr = mCurBW->NbDrawers()-1;
       }
       else mNDr = -1;
@@ -381 +383 @@
 
   if (butsensnew == 2) {
-    mDrName->SetLabel(dr->Name());
     char strg[64];
     sprintf(strg,"%d",mNDr);
     mNlb->SetLabel(strg);
+    string wdrname = mCurBW->Nom()+":"+dr->Name();
+    mDrName->SetLabel(wdrname);
   }
   else if (mButSens != butsensnew) {
     if(mButSens == 2)  mNlb->SetLabel("");
-    if (butsensnew == 1) 
-      mDrName->SetLabel("No-Drawer");
+    if (butsensnew == 1)   mDrName->SetLabel(mCurBW->Nom());
     else  mDrName->SetLabel("No-BaseWdg");
   }

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -82 +82 @@
 
   mBDrw = new PIElDrawer;
+  mBDrw->SetName("AxesDrw");
   SetLimits(-1.,1.,-1.,1.,kAxeDirLtoR,kAxeDirDownUp);
   SetAxesFlags(kBoxAxes | kExtTicks | kLabels);  
@@ -583 +584 @@
   mAx = ax;
   mAy = ay;
+  mName = "YfXDrawer";
 } 
 

trunk/SophyaPI/PI/pisurfdr.cc

@@ -65 +65 @@
   double dzz = (mZmax-mZmin)*0.05;
   mLut = new LUT(zmin-dzz*2, zmax-dzz, 256);
+
+  SetName("SurfDrw");
 }
 

trunk/SophyaPI/PI/psfile.cc

@@ -141 +141 @@
 { dup stringwidth pop 2 div neg  %% get minus(string length/2)  \n\
   0 rmoveto gs 1 -1 sc show gr } bind def \n\
-/hrvbshstr   %% Horizontal-Right Vertical-BaseLine justified \n\
+/hrshstr   %% Horizontal-Right Vertical-BaseLine justified \n\
 { dup stringwidth pop neg  %% get minus(string width)  \n\
   0 rmoveto gs 1 -1 sc show gr } bind def \n\