Changeset 1503 in Sophya

Timestamp:

May 21, 2001, 3:09:26 PM (24 years ago)

Author:

ansari

Message:

Implementation de la possibilite d'inverser l'indexage des ColorMap - Reza 21/5/2001

Location:

trunk/SophyaPI/PI

Files:

• lut.cc (modified) (4 diffs)
• lut.h (modified) (2 diffs)
• picmap.cc (modified) (2 diffs)
• picmap.h (modified) (1 diff)
• picmapgen.cc (modified) (2 diffs)
• picmapgen.h (modified) (2 diffs)
• picmapview.cc (modified) (2 diffs)
• picmapview.h (modified) (1 diff)
• picmapx.cc (modified) (1 diff)
• picmapx.h (modified) (1 diff)
• piimage.cc (modified) (2 diffs)
• piimage.h (modified) (1 diff)
• piimgtools.cc (modified) (4 diffs)
• piimgtools.h (modified) (1 diff)
• pipixmapgen.cc (modified) (2 diffs)
• pipixmapgen.h (modified) (1 diff)
• piversion.h (modified) (1 diff)

trunk/SophyaPI/PI/lut.cc

@@ -25 +25 @@
 if (bornes == NULL)  return;
 type = typ;  nLevel = nlev;
+table = NULL;  
+tablenbin = 0;
 SetLut(min, max, typ);
-table = NULL;  
-ComputeTable(ntable);
 return;
 }
@@ -40 +40 @@
 
 /* --Methode-- */
-void LUT::SetLut(double min, double max, int typ)
+void LUT::SetLut(double min, double max, int typ, int ntable)
 {
 
@@ -83 +83 @@
   }
 else  bornes[0] = 0.5*(min+max);
+ComputeTable((ntable > nLevel) ? ntable : tablenbin);
 return; 
 }
@@ -110 +111 @@
 void LUT::ComputeTable(int nt)
 {
-if (nt < 0) nt = 16*(nLevel+2);
+if (nt <= 0) nt = 16*(nLevel+2);
 else if (nt < (nLevel+2))  nt = (nLevel+2);
+tablenbin = nt;
 table = new unsigned short [nt-2];
 tablebinwidth = (Max()-Min())/(nt-2);

trunk/SophyaPI/PI/lut.h

@@ -19 +19 @@
 public:
   
-  LUT(double min, double max, unsigned short ncol=16, int typ=kLutType_Lin, int ntable=-1);
+  LUT(double min, double max, unsigned short ncol=16, int typ=kLutType_Lin, int ntable=0);
   ~LUT();
-  void SetLut(double min, double max, int typ=0);
+  void SetLut(double min, double max, int typ=kLutType_Lin, int ntable=0);
   void Print();
   unsigned short Apply(double x);
@@ -43 +43 @@
   int nLevel;
   double * bornes;
+  int tablenbin;
   unsigned short * table;
   double tablebinwidth;

trunk/SophyaPI/PI/picmap.cc

@@ -76 +76 @@
   if ( (num < 0) || (num >= MXMAPIDS) )  num = 0;
   return (MapNoms[num]) ;
+}
+
+int PIColorMap::ColorMapId2Num(PIColorMap const & cmap)
+{
+  for(int k=0; k<MXMAPIDS; k++) 
+    if (cmap.Type() == MapIds[k])  return(k);
+  return(-1);
 }
 
@@ -182 +189 @@
 
 PIColorMap::PIColorMap(PIColorMap& cm)
+: PIColorMapNative()
 {
+  ReverseColorIndex(cm.IsColorIndexReversed());
   CopyFrom(&cm);
   mCTId = cm.mCTId;

trunk/SophyaPI/PI/picmap.h

@@ -53 +53 @@
   static CMapId GetStandardColorMapId(int num);
   static string GetStandardColorMapName(int num);
+  static int    ColorMapId2Num(PIColorMap const & cmap);
 
 protected:

trunk/SophyaPI/PI/picmapgen.cc

@@ -13 +13 @@
   mNCol = 0;
   mType = -1;
+  ReverseColorIndex(false);
 }
 PIColorMapGen::PIColorMapGen(int id, int nc, string const& nom)
@@ -19 +20 @@
   mNCol = nc;
   mType = id;
+  ReverseColorIndex(false);  
 }
 

trunk/SophyaPI/PI/picmapgen.h

@@ -24 +24 @@
 
   virtual PIColor GetColor(int n)=0;
+  inline void  ReverseColorIndex(bool fg=false)
+               { mFlagReversedIndex = fg; }
+  inline bool  IsColorIndexReversed() const
+               { return(mFlagReversedIndex); } 
   virtual bool AllocColor(PIColor const& col, int index)=0;
   virtual void FreeColors()=0;     // Desalloue les couleurs
 
-  virtual long   TotNbColors()=0;   // Donne le nombre total de couleurs disponibles
+  virtual long  TotNbColors()=0;    // Donne le nombre total de couleurs disponibles
   virtual int   NbAllocColors()=0;  // Nb de couleurs deja allouees 
 protected:
@@ -37 +41 @@
   int    mType;
   string mNom;
-  
+  bool   mFlagReversedIndex;
 };
 

trunk/SophyaPI/PI/picmapview.cc

@@ -76 +76 @@
     return;
     }
-  if ( cmap && (cmp->Type() == cmap->Type()) && (cmp->Type() != CMAP_OTHER) 
-       && ((vmin-min) < 1.e-69) &&  ((vmin-min) > -1.e-69) &&
-       ((vmax-max) < 1.e-69) &&  ((vmax-max) > -1.e-69) )  return;
+  if ( cmap && (cmp->Type() == cmap->Type()) && (cmp->Type() != CMAP_OTHER)
+       && (cmp->IsColorIndexReversed() == cmap->IsColorIndexReversed())
+       && (fabs(vmin-min) < 1.e-69)  && (fabs(vmax-max) > -1.e-69) )  return;
   if (cmap) delete cmap;
   cmap = new PIColorMap(*cmp);
@@ -87 +87 @@
 
 /* --Methode-- */
-void PICMapView::SetColMapId(CMapId cmapid, double min, double max, bool refr)
+void PICMapView::SetColMapId(CMapId cmapid, bool revidx, double min, double max, bool refr)
 {
-  if ( cmap && (cmapid == cmap->Type()) && (cmapid != CMAP_OTHER) 
-       && ((vmin-min) < 1.e-69) &&  ((vmin-min) > -1.e-69) &&
+  if ( cmap && (cmapid == cmap->Type()) && (cmapid != CMAP_OTHER) &&
+       (cmap->IsColorIndexReversed() == revidx) &&
+       ((vmin-min) < 1.e-69) &&  ((vmin-min) > -1.e-69) &&
        ((vmax-max) < 1.e-69) &&  ((vmax-max) > -1.e-69) )  return;
   if (cmap) delete cmap;
   cmap = new PIColorMap(cmapid);
+  cmap->ReverseColorIndex(revidx);
   vmin = min;  vmax = max;
   if (refr)  Refresh();  

trunk/SophyaPI/PI/picmapview.h

@@ -24 +24 @@
 
   void            SetColMap(PIColorMap* cmp=NULL, double min=1., double max=-1., bool refr=true);
-  void            SetColMapId(CMapId cmapid, double min=1., double max=-1., bool refr=true);
+  void            SetColMapId(CMapId cmapid, bool revidx, double min, double max, bool refr);
+  inline void     SetColMapId(CMapId cmapid, double min=1., double max=-1., bool refr=true)
+                  { SetColMapId(cmapid, false, min, max, refr); }
 
 // Traitement des evenements   

trunk/SophyaPI/PI/picmapx.cc

@@ -53 +53 @@
   return(picr);
   }
-return(mColRGB[n]);
+if (mFlagReversedIndex) return(mColRGB[NCol()-n-1]);
+else return(mColRGB[n]);
 }
 

trunk/SophyaPI/PI/picmapx.h

@@ -13 +13 @@
   virtual ~PIColorMapX();
 
+  // Fonction Color() est definie afin de permettre l'optimisation - affichage d'image, etc...
   inline PIXColor  Color(int index) 
-    { return ((index < mNCol) ? mColors[index] : 0); } ;
+    { return (((index < mNCol)&&(index>=0)) ? 
+              mColors[(mFlagReversedIndex)?mNCol-index-1:index] : 0); } ;
 
   virtual PIColor GetColor(int n);

trunk/SophyaPI/PI/piimage.cc

@@ -484 +484 @@
 
 /* --Methode-- */
-float PIImage::GetZoomF()
+float PIImage::GetZoomF() const 
 {
 if (zoom >= 1)  return((float)zoom);
@@ -548 +548 @@
 
 /* --Methode-- */
-void PIImage::SetColMapId(CMapId cmapid, bool refr)
+void PIImage::SetColMapId(CMapId cmapid, bool revidx, bool refr)
 {
 if ( (cmapid == CMAP_GREY32) || (cmapid == CMAP_GREYINV32) || 
      (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->SetColAtt(PI_Red);
 else mdrw->SetColAtt(PI_Turquoise);
-PIPixmap::SetColMapId(cmapid, refr);
-if (zow)  zow->SetColMapId(cmapid, refr);
-if (gvw)  gvw->SetColMapId(cmapid, refr);
-if (cmvw) cmvw->SetColMapId(cmapid, Lut()->Min(), Lut()->Max(), refr);
+PIPixmap::SetColMapId(cmapid, revidx, refr);
+if (zow)  zow->SetColMapId(cmapid, revidx, refr);
+if (gvw)  gvw->SetColMapId(cmapid, revidx, refr);
+if (cmvw) cmvw->SetColMapId(cmapid, revidx, Lut()->Min(), Lut()->Max(), refr);
 return;
 }

trunk/SophyaPI/PI/piimage.h

@@ -58 +58 @@
   void SetZoom(int zm, bool refr=true);
   void SetZoomF(float fzm, bool refr=true);
-  float GetZoomF();
+  float GetZoomF() const ;
+  inline int GetZoom() const { return (zoom); }
 
 // Changement de table de couleur
   virtual void SetColMap(PIColorMap* cmp, bool refr=true);
-  virtual void SetColMapId(CMapId cmapid, bool refr=true);
+  virtual void SetColMapId(CMapId cmapid, bool revidx, bool refr);
+  inline  void SetColMapId(CMapId cmapid, bool refr=true)
+               { SetColMapId(cmapid, false, refr); }
 
 // Positionnement image - pave

trunk/SophyaPI/PI/piimgtools.cc

@@ -174 +174 @@
 for(kcc=nsct3; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) 
 mOptzc[0]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(), 201+kcc);
-
-mOptzc[0]->SetValue(203);
+// On ajoute un CheckItem pour inverser les index de table de couleur
+mOptzc[0]->Menu()->AppendCheckItem("Reverse CMap", 299);
+
+mOptzc[0]->SetValue(203);  mLastCol = 203;
 mOptzc[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
@@ -297 +299 @@
 PIWindow::Show();
 mpii = PIImage::CurrentPIImage();
-if (mpii == NULL)  return;
+if (mpii == NULL) {
+  mOptzc[0]->Menu()->SetStateMsg(299, false);
+  mOptzc[0]->SetValue(203);  mLastCol = 203;
+  mOptzc[1]->SetValue(101);
+  mOptCut->SetValue(303);
+  return;
+}
 min_lut = mpii->Lut()->Min();
 max_lut = mpii->Lut()->Max();
@@ -313 +321 @@
 mSc[0]->SetValue(0);
 mSc[1]->SetValue(0);
-mOptzc[0]->SetValue(203);
-mOptzc[1]->SetValue(101);
+
+// Pour mettre a jour le menu de la table de couleur
+mOptzc[0]->Menu()->SetStateMsg(299, mpii->GetColMap()->IsColorIndexReversed());
+int cmnum = PIColorMap::ColorMapId2Num(mpii->GetColMapId());
+mLastCol =  (cmnum < 0) ? 203 : 201+cmnum;
+mOptzc[0]->SetValue(mLastCol);
+
+// Pour le facteur de zoom
+mOptzc[1]->SetValue(mpii->GetZoom()+100);
+
 mOptCut->SetValue(303);
 return;
@@ -453 +469 @@
 if ((msg <= 110) && (msg >= 90))  // Zoom
   PIImage::CurrentPIImage()->SetZoom((int)(msg-100), true);
-else if ((msg > 200) && (msg < 299)) // Changement de couleur 
-  PIImage::CurrentPIImage()->SetColMapId(PIColorMap::GetStandardColorMapId(msg-201), true);
+else if (msg == 299) { // Revert CMap index 
+  mOptzc[0]->SetValue(mLastCol);
+}
+else if ((msg > 200) && (msg < 299)) { // Changement de couleur 
+  //  bool irev = PIImage::CurrentPIImage()->GetColMap()->IsColorIndexReversed();
+  bool revidx = mOptzc[0]->Menu()->GetStateMsg(299);
+  //  cout << " DBG PIImgTools::Process() revidx= " ;
+  //  if (revidx) cout << " TRUE " ;
+  //  else cout << " FALSE " ;
+  //  if (irev) cout << " Img::RevIdx= TRUE " << endl;
+  //  else cout << " Img::RevIdx= FALSE " << endl;
+  PIImage::CurrentPIImage()->SetColMapId(PIColorMap::GetStandardColorMapId(msg-201), revidx, true);
+  mLastCol = msg;
+}
 
 // Cuts

trunk/SophyaPI/PI/piimgtools.h

@@ -39 +39 @@
   PIOptMenu* mOptzc[2];
   PIMenu* mCasc[5];
+  PIMessage mLastCol;
+
 // Pour expand et compress
   PIButton* mButsz[5];

trunk/SophyaPI/PI/pipixmapgen.cc

@@ -121 +121 @@
 {
 if (!cmp)  return;
-if ( (cmp->Type() == cmap->Type()) && (cmp->Type() != CMAP_OTHER) ) return;
+if ( (cmp->Type() == cmap->Type()) && (cmp->Type() != CMAP_OTHER) 
+     && (cmp->IsColorIndexReversed() == cmap->IsColorIndexReversed()) ) return;
 if (cmap) delete cmap;
 cmap = new PIColorMap(*cmp);
@@ -128 +129 @@
 
 /* --Methode-- */
-void PIPixmapGen::SetColMapId(CMapId cmapid, bool refr)
+void PIPixmapGen::SetColMapId(CMapId cmapid, bool revidx, bool refr)
 {
-if (!cmap || (cmap->Type() != cmapid) || (cmapid == CMAP_OTHER) ) {  
+if (!cmap || (cmap->Type() != cmapid) || (cmapid == CMAP_OTHER) 
+    || (cmap->IsColorIndexReversed() != revidx) ) {  
   if (cmap) delete cmap;
   cmap = new PIColorMap(cmapid);
+  cmap->ReverseColorIndex(revidx);
   }
 if (refr)  Refresh();  

trunk/SophyaPI/PI/pipixmapgen.h

@@ -26 +26 @@
 
   virtual void  SetColMap(PIColorMap* cmp, bool refr=true);
-  virtual void  SetColMapId(CMapId cmapid, bool refr=true);
+  virtual void  SetColMapId(CMapId cmapid, bool revidx, bool refr);
+  inline  void  SetColMapId(CMapId cmapid, bool refr=true)
+                { SetColMapId(cmapid, false, refr); }
 
   inline PIColorMap* GetColMap() { return cmap; }

trunk/SophyaPI/PI/piversion.h

@@ -2 +2 @@
 #define PIVERSION_H_SEEN
 
-#define PI_VERSIONNUMBER  2.80
+#define PI_VERSIONNUMBER  2.85
 
 #endif