Changeset 1569 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jul 6, 2001, 3:44:54 PM (24 years ago)

Author:

ansari

Message:

Gestion des attributs de nom de fontes - Reza 6/7/2001

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• pistdimgapp.cc (modified) (8 diffs)
• pistdimgapp.h (modified) (2 diffs)
• servnobjm.cc (modified) (7 diffs)
• servnobjm.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -748 +748 @@
 usage += ">> Lines:  defline normalline thinline thickline dashedline thindashedline \n";
 usage += "           thickdashedline dottedline thindottedline thickdottedline \n";
-usage += ">> Fonts:  deffont normalfont boldfont italicfont smallfont smallboldfont \n";
-usage += "           smallitalicfont bigfont bigboldfont bigitalicfont \n";
-usage += "           hugefont  hugeboldfont hugeitalicfont \n";
+usage += ">> Font Att: deffontatt normalfont boldfont italicfont bolditalicfont  \n";
+usage += "             smallfont smallboldfont smallitalicfont smallbolditalicfont \n";
+usage += "             bigfont bigboldfont bigitalicfont bigbolditalicfont \n";
+usage += "             hugefont  hugeboldfont hugeitalicfont hugebolditalicfont \n";
+usage += ">> Font Names: deffont courierfont helveticafont timesfont symbolfont  \n";
 usage += ">> Marker: dotmarker<T>  plusmarker<T>  crossmarker<T> circlemarker <T> \n";
 usage += "           fcirclemarker<T> boxmarker<T> fboxmarker<T> trianglemarker<T> \n";

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -200 +200 @@
 mFCol = mBCol = PI_NotDefColor;
 mLAtt = PI_NotDefLineAtt;
+mFName = PI_DefaultFont;   
 mFSz = PI_NotDefFontSize;
 mFAtt = PI_NotDefFontAtt;
@@ -523 +524 @@
 if (mLAtt != PI_NotDefLineAtt) scd->SetLineAtt(mLAtt);
 if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) scd->SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) scd->SetFont(mFName, scd->GetFontSz(), scd->GetFontAtt());
 if ( (mMrk != PI_NotDefMarker) && (mMSz >= 0) ) scd->SetMarkerAtt(mMSz, mMrk);
 if ( mCmapid != CMAP_OTHER ) scd->SetColMapId(mCmapid);
@@ -569 +571 @@
   scw->SetLimits(mXmin, mXmax, mYmin, mYmax);
 scw->SetAxesFlags(mAxesFlags);
+// Fonte de trace d'axe
+scw->BaseDrawer()->SetFont(mFName, mFSz, mFAtt);
 
 if (typeid(*scd) != typeid(PIHisto2D)) scw->AddScDrawer(scd, true);
@@ -577 +581 @@
   scw->SetTitles(title, t2);    
 }
+
 // scw->Refresh();   ? Pas necessaire  Reza 19/08/98, 05/05/99 $CHECK$ 
 mCurWin = win;
@@ -599 +604 @@
 if (mLAtt != PI_NotDefLineAtt) dr3->SetLineAtt(mLAtt);
 if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) dr3->SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) dr3->SetFont(mFName, dr3->GetFontSz(), dr3->GetFontAtt());
 if ( (mMrk != PI_NotDefMarker) && (mMSz >= 0) ) dr3->SetMarkerAtt(mMSz, mMrk);
 if ( mCmapid != CMAP_OTHER ) dr3->SetColMapId(mCmapid);
@@ -1407 +1413 @@
   mLAtt = lat;
 }
+
+/* --Methode-- */
+void PIStdImgApp::SetFontName(PIFontName fn)
+{
+  mFName = fn;
+}
+
 /* --Methode-- */
 void PIStdImgApp::SetFontAtt(PIFontSize fsz, PIFontAtt fat)
@@ -1455 +1468 @@
   mSBCol = mBCol;
   mSLAtt = mLAtt;
+  mSFName = mFName;
   mSFSz = mFSz;
   mSFAtt = mFAtt;
@@ -1482 +1496 @@
   mBCol = mSBCol;
   mLAtt = mSLAtt;
+  mFName = mSFName;
   mFSz = mSFSz;
   mFAtt = mSFAtt;

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -96 +96 @@
                      PIColors bg=PI_NotDefColor);
      void  SetLineAtt(PILineAtt lat=PI_NotDefLineAtt);
+     void  SetFontName(PIFontName fn=PI_DefaultFont);
      void  SetFontAtt(PIFontSize fsz=PI_NotDefFontSize,
                       PIFontAtt fat=PI_NotDefFontAtt);
@@ -171 +172 @@
     PIColors     mFCol, mBCol, mSFCol, mSBCol;
     PILineAtt    mLAtt, mSLAtt;
+    PIFontName   mFName, mSFName;
     PIFontSize   mFSz, mSFSz;
     PIFontAtt    mFAtt, mSFAtt;

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1365 +1365 @@
   mImgapp->SetColAtt();
   mImgapp->SetLineAtt();
+  mImgapp->SetFontName();
   mImgapp->SetFontAtt();
   mImgapp->SetMarkerAtt();
@@ -1446 +1447 @@
   if (it != GrAfonts.end())  { mImgapp->SetFontAtt((PIFontSize)((*it).second.a2), (PIFontAtt)((*it).second.a1) ); 
                                fgsrgr = true;  continue; }
+  // Si c'est un nom de fontes
+  it = GrAfontNames.find(grt[k]);
+  if (it != GrAfontNames.end()) { mImgapp->SetFontName((PIFontName)((*it).second.a1));
+                                 fgsrgr = true;  continue; }
   // Si c'est un attribut de markers
   it = GrAmarkers.find(grt[k]);
@@ -1534 +1539 @@
 GrAlines["thickdottedline"] = gi;
 
-// Les fontes 
+// Noms de fontes
+gi.a2 = 0;
+gi.a1 = PI_DefaultFont;
+GrAfontNames["deffont"] = gi;
+gi.a1 = PI_CourierFont;
+GrAfontNames["courierfont"] = gi;
+gi.a1 = PI_HelveticaFont;
+GrAfontNames["helveticafont"] = gi;
+gi.a1 = PI_TimesFont;
+GrAfontNames["timesfont"] = gi;
+gi.a1 = PI_SymbolFont;
+GrAfontNames["symbolfont"] = gi;
+
+// Attributs de fontes 
 gi.a2 = PI_NotDefFontSize;
 gi.a1 = PI_NotDefFontAtt;
-GrAfonts["deffont"] = gi;
-
+GrAfontNames["deffontatt"] = gi;
 gi.a2 = PI_NormalSizeFont;
 gi.a1 = PI_RomanFont;
@@ -1546 +1563 @@
 gi.a1 = PI_ItalicFont;
 GrAfonts["italicfont"] = gi;
+gi.a1 = PI_BoldItalicFont;
+GrAfonts["bolditalicfont"] = gi;
 gi.a2 = PI_SmallSizeFont;
 gi.a1 = PI_RomanFont;
@@ -1553 +1572 @@
 gi.a1 = PI_ItalicFont;
 GrAfonts["smallitalicfont"] = gi;
+gi.a1 = PI_BoldItalicFont;
+GrAfonts["smallbolditalicfont"] = gi;
 gi.a2 = PI_BigSizeFont;
 gi.a1 = PI_RomanFont;
@@ -1560 +1581 @@
 gi.a1 = PI_ItalicFont;
 GrAfonts["bigitalicfont"] = gi;
+gi.a1 = PI_BoldItalicFont;
+GrAfonts["bigbolditalicfont"] = gi;
 gi.a2 = PI_HugeSizeFont;
 gi.a1 = PI_RomanFont;
@@ -1567 +1590 @@
 gi.a1 = PI_ItalicFont;
 GrAfonts["hugeitalicfont"] = gi;
+gi.a1 = PI_BoldItalicFont;
+GrAfonts["hugebolditalicfont"] = gi;
 
 

trunk/SophyaPI/PIext/servnobjm.h

@@ -140 +140 @@
   GrAttNames GrAmarkers;
   GrAttNames GrAfonts;
+  GrAttNames GrAfontNames;
   GrAttNames GrAcmap;  
   GrAttNames GrAzoom;