Changeset 203 in Sophya for trunk/SophyaPI

Timestamp:

Feb 26, 1999, 3:18:56 PM (27 years ago)

Author:

ercodmgr

Message:

amelioration trace axes, rz+cmv 26/2/99

Location:

trunk/SophyaPI/PIext

Files:

• pihisto.cc (modified) (3 diffs)
• pistdimgapp.cc (modified) (5 diffs)
• pistdimgapp.h (modified) (2 diffs)
• servnobjm.cc (modified) (3 diffs)
• servnobjm.h (modified) (1 diff)

trunk/SophyaPI/PIext/pihisto.cc

@@ -42 +42 @@
   bool oktrace = false;
   if (!mHisto)  return;  
+
   if (mMrk != PI_NotDefMarker || mHisto->ClassId() == HProf::classId ) {
     // Marqeurs definis OU HBProf => marqueurs+Erreurs si il y en a
@@ -92 +93 @@
     }
   }
+  // A faire a la fin - DrawStats change l'attribut de ligne 
   DrawStats(g);
 }
@@ -99 +101 @@
 {
   if (!mHisto) return;
-  if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
+  //  if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
+  g->SelLine(PI_ThinLine);
   float cellHeight = (YMax() - YMin()) * 0.05;
   float cellWidth  = (XMax() - XMin()) * 0.23;

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -188 +188 @@
 mCmapid = CMAP_OTHER;
 mZoom = 0;
+mAxesFlags = kBoxAxes | kExtTicks | kLabels;
 SaveGraphicAtt();
 
@@ -440 +441 @@
 scw->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 scw->SetUserData(NULL, flag);
+scw->SetAxesFlags(mAxesFlags);
+
 if (!h2d) scw->AddScDrawer(scd, true);
 else ((PIH2DWdg*)scw)->SetPIHisto((PIHisto2D*)scd);
@@ -1139 +1142 @@
   mZoom = zoom;
 }
+/* --Methode-- */
+void PIStdImgApp::SetAxesAtt(unsigned int axfl)
+{
+  mAxesFlags = axfl; 
+}
 
 /* --Methode-- */
@@ -1152 +1160 @@
   mSCmapid = mCmapid;
   mSZoom = mZoom;
+  mSAxesFlags = mAxesFlags;
 }
 
@@ -1166 +1175 @@
   mCmapid = mSCmapid;
   mZoom = mSZoom;
-}
+  mAxesFlags = mSAxesFlags;
+}

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -91 +91 @@
      void  SetColMapId(CMapId cid=CMAP_OTHER);
      void  SetZoomAtt(int zoom=0);
+     void  SetAxesAtt(unsigned int axfl=kBoxAxes | kExtTicks | kLabels);
 // Pour sauvegarder-restauration de  l'etat des attributs graphiques
      void  SaveGraphicAtt();   
@@ -156 +157 @@
     CMapId       mCmapid, mSCmapid;
     int          mZoom, mSZoom;
+    unsigned int mAxesFlags, mSAxesFlags;
 
     PIMessage mFCMsg;  // Message for processing FileOpen

trunk/SophyaPI/PIext/servnobjm.cc

@@ -456 +456 @@
   it = GrAzoom.find(grt[k]);
   if (it != GrAzoom.end())  { mImgapp->SetZoomAtt( (*it).second.a1 );  fgsrgr = true; continue; }  
+  // Si c'est un attribut d'axe
+  it = GrAaxes.find(grt[k]);
+  if (it != GrAaxes.end())  { mImgapp->SetAxesAtt( (*it).second.a1 );  fgsrgr = true; continue; }  
   
   }  
@@ -754 +757 @@
 GrAcmap["colbr128"] = gi;
 
-// Les tables de couleurs 
+// La valeur de zoom
 gi.a2 = 0;
 gi.a1 = 0;
@@ -776 +779 @@
 gi.a1 = -5;
 GrAzoom["zoom/5"] = gi;
-                 
-}
+
+// Attributs d'axes
+gi.a2 = 0;
+gi.a1 = (int)(kBoxAxes | kExtTicks | kLabels);
+GrAaxes["stdaxes"] = gi;
+GrAaxes["defaxes"] = gi;
+GrAaxes["boxaxes"] = gi;
+gi.a1 = (int)kAxesDflt;
+GrAaxes["simpleaxes"] = gi;
+gi.a1 = (int)(kBoxAxes | kExtTicks | kLabels | kGridOn);
+GrAaxes["boxaxesgrid"] = gi;
+
+gi.a1 = (int)(kBoxAxes | kTicks | kLabels | kMinTicks | kMajTicks);
+GrAaxes["fineaxes"] = gi;
+ gi.a1 = (int)(kBoxAxes | kTicks | kLabels | kMinTicks | kMajTicks | kGridOn);
+GrAaxes["grid"] = gi;
+GrAaxes["fineaxesgrid"] = gi;
+                
+}

trunk/SophyaPI/PIext/servnobjm.h

@@ -57 +57 @@
   GrAttNames GrAcmap;  
   GrAttNames GrAzoom;  
+  GrAttNames GrAaxes;  
 
   PDynLinkMgr * dynlink;  // shared-lib lib.so