Changeset 1850 in Sophya for trunk/SophyaPI/PIext/pihisto2d.h

Timestamp:

Jan 7, 2002, 4:56:32 PM (24 years ago)

Author:

cmv

Message:

1-/ correction bug init. sur TypScal (pb vu par Marc switch Lineaire/Log10)
2-/ Amelioration du widget d'options (clic souris 3)
3-/ reverse color map

cmv 7/1/2002

File:

• trunk/SophyaPI/PIext/pihisto2d.h (modified) (5 diffs)

trunk/SophyaPI/PIext/pihisto2d.h

@@ -18 +18 @@
 class PIHisto2D : public PIDrawer {
 public:
-                     PIHisto2D(Histo2D* histo, bool ad=false);
-  virtual            ~PIHisto2D();
-          void       UseColors(bool fg=false, CMapId cmap=CMAP_GREYINV32);
-          void       UseScale(unsigned short type=0,float logscale=10.);
-          void       UseDisplay(unsigned short type=0, float fnpt=0.5);
-          void       UseDyn(float hmin=1., float hmax=-1.);
-          void       UseFrac(float frmin=0.1, float frmax=0.9);
-          void       Print(int lp=0);
-  virtual void       Draw(PIGraphicUC* g,double xmin,double ymin,double xmax,double ymax);
-  virtual void       UpdateLimits();
-  virtual void       DrawStats(PIGraphicUC* g);
+  PIHisto2D(Histo2D* histo, bool ad=false);
+  virtual ~PIHisto2D();
 
-  inline Histo2D*       Histogram() { return(mHisto); }
-  inline bool           Color() { return(mFgCol); }
-  inline CMapId         ColMap() { return(mCmap); }
-  inline unsigned short TypScale() { return(mTypScal); }
-  inline unsigned short TypDisplay() { return(mTypDisp); }
-  inline float          FPoints() { return(mFPoints); }
-  inline float          HMax() { return(mHMax);}
-  inline float          HMin() { return(mHMin);}
-  inline float          FMax() { return(mFracMax);}
-  inline float          FMin() { return(mFracMin);}
-  inline float          LogScale() { return(mLogScale);}
+  void UseColors(bool fg=false,CMapId cmap=CMAP_GREYINV32,bool revcmap=false);
+  void UseScale(unsigned short type=0,float logscale=10.);
+  void UseDisplay(unsigned short type=0,float fnpt=0.5);
+  void UseDyn(float hmin=1.,float hmax=-1.);
+  void UseFrac(float frmin=0.1,float frmax=0.9);
+  void Print(int lp=0);
+
+  virtual void Draw(PIGraphicUC* g,double xmin,double ymin,double xmax,double ymax);
+  virtual void UpdateLimits();
+  virtual void DrawStats(PIGraphicUC* g);
+
+  inline Histo2D*       Histogram()   {return(mHisto);}
+  inline bool           Color()       {return(mFgCol);}
+  inline CMapId         ColMap()      {return(mCmap);}
+  inline bool           IsColMapRev() {return(mRevCmap);}
+  inline unsigned short TypScale()    {return(mTypScal);}
+  inline unsigned short TypDisplay()  {return(mTypDisp);}
+  inline float          FPoints()     {return(mFPoints);}
+  inline float          HMax()        {return(mHMax);}
+  inline float          HMin()        {return(mHMin);}
+  inline float          FMax()        {return(mFracMax);}
+  inline float          FMin()        {return(mFracMin);}
+  inline float          LogScale()    {return(mLogScale);}
 
 protected:
@@ -48 +51 @@
   Histo2D* mHisto;
   bool mAdDO;
-  bool mFgCol;
-  CMapId mCmap;
-  unsigned short mTypScal;
-  unsigned short mTypDisp;
-  float mFPoints;
+  bool mFgCol; CMapId mCmap; bool mRevCmap;
+  unsigned short mTypScal; float mLogScale;
+  unsigned short mTypDisp; float mFPoints;
   float mHMin,mHMax;
   float mFracMin,mFracMax;
-  float mLogScale;
 };
 
@@ -61 +61 @@
 class PIH2DWdg : public PIScDrawWdg {
 public:
-                     PIH2DWdg(PIContainerGen *par, const char *nom, int sx=300, int sy=300, 
-                              int px=0, int py=0);
-                     ~PIH2DWdg();
+  PIH2DWdg(PIContainerGen *par,const char *nom,int sx=300,int sy=300,int px=0,int py=0);
+  ~PIH2DWdg();
 
-  void               SetHisto(Histo2D* histo);
-  void               SetPIHisto(PIHisto2D* pih2);
-  inline PIHisto2D*  GetPIHisto() {return mPih;}
+  void SetHisto(Histo2D* histo);
+  void SetPIHisto(PIHisto2D* pih2);
 
-  virtual string     GetClickText(double x, double y); 
-  virtual void       ActivateSpecializedControls();   // Pour activer des controles specifiques
-  virtual void       But3Press(int x, int y);
+  inline PIHisto2D* GetPIHisto() {return mPih;}
+
+  virtual string GetClickText(double x, double y); 
+  virtual void   ActivateSpecializedControls(); // Pour activer des controles specifiques
+  virtual void   But3Press(int x, int y);
 
 protected:
   PIHisto2D*  mPih;
-
 };
 
@@ -81 +80 @@
 class H2WinArg : public PIWindow {
 public :
-               H2WinArg(PIH2DWdg *par);
-               ~H2WinArg();
-          void SetPIH2DWdg(PIH2DWdg* h2wdg);
-          void SetText();
-          void GetText();
-  virtual void Process(PIMessage msg, PIMsgHandler* sender, void* data=NULL);
+  H2WinArg(PIH2DWdg *par);
+  ~H2WinArg();
+
+  void SetPIH2DWdg(PIH2DWdg* h2wdg);
+  void SetText();
+
+  virtual void Process(PIMessage msg,PIMsgHandler* sender,void* data=NULL);
 
 protected:
@@ -97 +97 @@
   PIText    * mText[3];
   PIScale   * mPScal;
+  PICheckBox* mCkb;
 
-  bool mFgCol;
-  CMapId mCmap;
-  unsigned short mTypScal;
-  unsigned short mTypDisp;
-  float mFPoints;
+  bool mFgCol; CMapId mCmap; bool mRevCmap;
+  unsigned short mTypScal; float mLogScale;
+  unsigned short mTypDisp; float mFPoints;
   float mHMin,mHMax;
   float mFracMin,mFracMax;
-  float mLogScale;
 };