Changeset 547 in Sophya for trunk

Timestamp:

Nov 4, 1999, 5:19:58 PM (26 years ago)

Author:

ercodmgr

Message:

corrections diverses - Reza 4/11/99

Location:

trunk/SophyaPI/PI

Files:

• pi3ddrw.cc (modified) (1 diff)
• pibwdggen.cc (modified) (4 diffs)
• pidrawer.cc (modified) (1 diff)
• pigraphps.cc (modified) (2 diffs)
• psfile.cc (modified) (1 diff)

trunk/SophyaPI/PI/pi3ddrw.cc

@@ -413 +413 @@
 int id = AddDrawer(dr3, false, false, ad);
 if (m3DrIl.size() == 0)  dr3->SetAxesFlags(kStdAxes);
+else dr3->SetAxesFlags(kAxesNone);
 m3DrIl.push_back(id);
 return(id);

trunk/SophyaPI/PI/pibwdggen.cc

@@ -338 +338 @@
 mDrXmin = xmin;   mDrXmax = xmax; 
 mDrYmin = ymin;   mDrYmax = ymax; 
-if ( (axrl != kAxeDirSame) && (axrl != kAxeDirAuto) )  mDXdir = axrl;    
-if ( (ayud != kAxeDirSame) && (ayud != kAxeDirAuto) )  mDYdir = ayud;
+if (axrl != kAxeDirSame)   mDXdir = axrl;    
+if (ayud != kAxeDirSame)   mDYdir = ayud;
 }
 
@@ -515 +515 @@
 
 vector<BWDrwId>::iterator it;
-bool fgc=false;
 for(it = mDrwList.begin(); it != mDrwList.end(); it++) {
   g->SaveGraphicAtt();
@@ -538 +537 @@
   }
   guc = (*it).drw->SetDrwWdg(this, drx0, dry0, drdx, drdy, g);
-  if ((*it).clip)  { g->SetClipRectangle(drx0, dry0, drdx , drdy);  fgc = true; }
+  if ((*it).clip)  g->SetClipRectangle(drx0, dry0, drdx , drdy);  
   (*it).drw->SelGraAtt(guc);
   if (sxy) {
@@ -552 +551 @@
   (*it).drw->Draw(guc, xmin, ymin, xmax, ymax);
   g->RestoreGraphicAtt();
-  }
-if (fgc)  g->ClearClipRectangle();
+  if ((*it).clip)  g->ClearClipRectangle();
+  }
 
 return;

trunk/SophyaPI/PI/pidrawer.cc

@@ -46 +46 @@
   SetLimits(-1, 1, -1, 1, kAxeDirLtoR, kAxeDirDownUp);
   limitsFixed = 0;
-  SetAxesFlags();   // Pas de trace d'axes par defaut 
+  SetAxesFlags(kAxesNone);   // Pas de trace d'axes par defaut 
   mDndfg = false;  // Pour controle de l'appel de Detach() si delete
 

trunk/SophyaPI/PI/pigraphps.cc

@@ -113 +113 @@
   //  mPSOut->DrawString((double)x,(double)y,s,mFCol,mFAtt,mFSize); /* $CHECK$ PIFontSize ?? */
   mPSOut->DrawString((double)x,(double)y,s,mFCol, myFont.GetFontName(),
-                     myFont.GetFontAtt(),  myFont.GetFontSize());
+                     myFont.GetFontAtt(),  myFont.GetFontSize()*0.9); /* $CHECK$  x 0.9 - Reza 4/11/99 */
 // Calculez la taille de la boite occupe par la fonte
 //  myFont.GetFontHeight(int& asc, int& desc)  Tres proche de myFont.GetFontSize() en principe
@@ -126 +126 @@
   //  mPSOut->DrawString((double)x,(double)y,s,mFCol,mFAtt,mFSize); /* $CHECK$ PIFontSize ?? */
   mPSOut->DrawString((double)x,(double)y,s,mFCol, myFont.GetFontName(), 
-                     myFont.GetFontAtt(),  myFont.GetFontSize());
+                     myFont.GetFontAtt(),  myFont.GetFontSize()*0.9);  /* $CHECK$  x 0.9 - Reza 4/11/99 */
 // Idem taille ici 
 return;

trunk/SophyaPI/PI/psfile.cc

@@ -719 +719 @@
     /* Choix des fontes */
     if ( (FontAtt != PI_NotDefFontAtt) && (FontAtt != mFontAtt) ) {
-      printf("PSFile::DrawString(%s) : FontAtt a change : %d %d \n", s, mFontAtt, FontAtt) ; 
+//DBG      printf("PSFile::DrawString(%s) : FontAtt a change : %d %d \n", s, mFontAtt, FontAtt) ; 
       mFontAtt = FontAtt;
       change = 1;
     }
     if ( (FontSize != PI_NotDefFontSize) && (FontSize != mFontSize) ) {
-      printf("PSFile::DrawString(%s) : FontSize a change : %d %d \n", s, mFontSize, FontSize) ; 
+//DBG      printf("PSFile::DrawString(%s) : FontSize a change : %d %d \n", s, mFontSize, FontSize) ; 
       mFontSize = (PIFontSize) FontSize;  // $CHECK$ EA ajoute le cast un peu au pif
       change = 1;
     }
     if( (FontName != mFontName) ) {
-      printf("PSFile::DrawString(%s) : FontName a change : %d %d \n", s, mFontName, FontName) ; 
+//DBG      printf("PSFile::DrawString(%s) : FontName a change : %d %d \n", s, mFontName, FontName) ; 
       mFontName = (PIFontName) FontName ; 
       change = 1 ;