Changeset 1905 in Sophya for trunk/SophyaPI/PIGcont/picntools.cc

Timestamp:

Feb 18, 2002, 11:41:28 PM (24 years ago)

Author:

ansari

Message:

Adaptation a l'introduction de la classe PIGraphicAtt - Reza 18/02/2002

File:

• trunk/SophyaPI/PIGcont/picntools.cc (modified) (7 diffs)

trunk/SophyaPI/PIGcont/picntools.cc

@@ -313 +313 @@
 mOpt[7]->AppendItem("Small FontSz", 802);
 mOpt[7]->AppendItem("Normal FontSz", 803);
-mOpt[7]->AppendItem("Big FontSz", 804);
+mOpt[7]->AppendItem("Large FontSz", 804);
 mOpt[7]->AppendItem("Huge FontSz", 805);
 mOpt[7]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
@@ -441 +441 @@
                                PI_ItalicFont, PI_BoldItalicFont };
 static PIFontSize fntsz[6] = { PI_NotDefFontSize, PI_TinySizeFont, PI_SmallSizeFont, 
-                               PI_NormalSizeFont, PI_BigSizeFont, PI_HugeSizeFont };
+                               PI_NormalSizeFont, PI_LargeSizeFont, PI_HugeSizeFont };
 
 /* --Methode-- */
@@ -487 +487 @@
 
 int ii,jj,kk;
-PIColors fc = dr->GetFgColAtt();
+PIColors fc = dr->GetGraphicAtt().GetFgColor();
 for(kk=0; kk<MYNMXCOLORS; kk++) 
   if (fc == cols[kk])  { mOpt[0]->SetValue(100+kk);  break; }    
-CMapId cmi = dr->GetColMapId();
+CMapId cmi = dr->GetGraphicAtt().GetColMapId();
 if (cmi == CMAP_OTHER)  mOpt[1]->SetValue(200);
 else for(kk=0; kk<PIColorMap::NumberStandardColorMaps(); kk++)
   if (cmi == PIColorMap::GetStandardColorMapId(kk)) { mOpt[1]->SetValue(201+kk);  break; }  
-PIMarker mk = dr->GetMarker();   
+PIMarker mk = dr->GetGraphicAtt().GetMarker();   
 for(kk=0; kk<12; kk++) 
   if (mk == mrk[kk])   { mOpt[2]->SetValue(300+kk);  break; }
-kk = dr->GetMarkerSz();
+kk = dr->GetGraphicAtt().GetMarkerSz();
 if (kk < 1)  kk = 1;
 if (kk > 15) kk = 15;
 if (kk%2 == 0) kk++;
 mOpt[3]->SetValue(400+kk);
-PIFontName fnm = dr->GetFontName();
-PIFontAtt fat = dr->GetFontAtt();
-PIFontSize fsz = dr->GetFontSz();
+PIFontName fnm = dr->GetGraphicAtt().GetFontName();
+PIFontAtt fat = dr->GetGraphicAtt().GetFontAtt();
+PIFontSize fsz = dr->GetGraphicAtt().GetFontSz();
 for(ii=0; ii<5; ii++)
   if (fnm ==  fntname[ii]) break;
@@ -519 +519 @@
 mOpt[7]->SetValue(800+jj);
 
-PILineAtt lat = dr->GetLineAtt();
+PILineAtt lat = dr->GetGraphicAtt().GetLineAtt();
 for(kk=0; kk<10; kk++)
   if (lat == line[kk])   { mOpt[5]->SetValue(600+kk);  break; }
@@ -635 +635 @@
   k = mOpt[0]->GetValue()-100; // -> COULEUR 
   if ( (k < 0) || (k >= MYNMXCOLORS) )  k = 0;
-  mCurCDrw->SetColAtt(cols[k]);
+  mCurCDrw->GetGraphicAtt().SetColAtt(cols[k]);
   double zmin=0;
   double zmax=1.;
@@ -645 +645 @@
   k = mOpt[1]->GetValue()-200; // --> COLOR MAP 
   if (k == 0){
-    mCurCDrw->SetColMapId(CMAP_OTHER);
+    mCurCDrw->GetGraphicAtt().SetColMapId(CMAP_OTHER);
     
   }else{
-    mCurCDrw->SetColMapId(PIColorMap::GetStandardColorMapId(k-1));
+    mCurCDrw->GetGraphicAtt().SetColMapId(PIColorMap::GetStandardColorMapId(k-1));
     cmapv->SetColMapId(PIColorMap::GetStandardColorMapId(k-1),false, zmin , zmax,true);
   }
@@ -655 +655 @@
   kk =  mOpt[3]->GetValue()-400; // marker SIZE
   if ( (kk < 1) || (kk > 27) )  kk = 1;
-  mCurCDrw->SetMarkerAtt(kk, mrk[k]);
+  mCurCDrw->GetGraphicAtt().SetMarkerAtt(kk, mrk[k]);
 
   ii =  (mOpt[4]->GetValue()-500);
   jj =  (mOpt[6]->GetValue()-700);
   kk =  (mOpt[7]->GetValue()-800);
-  mCurCDrw->SetFont(fntname[ii], fntsz[kk], fntatt[jj]);
+  mCurCDrw->GetGraphicAtt().SetFontAtt(fntname[ii], fntsz[kk], fntatt[jj]);
 
   k =  mOpt[5]->GetValue()-600;
   if ( (k < 0) || (k > 9) )  k = 0;
-  mCurCDrw->SetLineAtt(line[k]);
+  mCurCDrw->GetGraphicAtt().SetLineAtt(line[k]);
 
   if (refr)