Changeset 10 in Sophya

Timestamp:

Mar 8, 1996, 8:02:56 PM (30 years ago)

Author:

eros

Message:

Parametres bool refr (refresh) pour divers methodes de PIPixmap et

PIImage pour optimisation (Valeur par defaut = true) Reza

Location:

trunk/SophyaPI/PI

Files:

• pibwdgx.cc (modified) (1 diff)
• pidemo.cc (modified) (5 diffs)
• piimage.cc (modified) (7 diffs)
• piimage.h (modified) (1 diff)
• pipixmapgen.cc (modified) (1 diff)
• pipixmapgen.h (modified) (1 diff)

trunk/SophyaPI/PI/pibwdgx.cc

@@ -17 +17 @@
 #define NMAXFONTSZ  5
 static XFontStruct * fntst[NMAXFONTSZ][3];
-static int fntsz[NMAXFONTSZ] = {7,10,12,14,16};
+static int fntsz[NMAXFONTSZ] = {8,10,12,14,16};
 static  PIFontAtt fntatt[3] = { PI_RomanFont, PI_BoldFont, PI_ItalicFont }; 
 #define NMAXCOL  10

trunk/SophyaPI/PI/pidemo.cc

@@ -257 +257 @@
       if ( CurrentPIImage()) 
         {
-        CurrentPIImage()->SetZoom(1);
-        CurrentPIImage()->SetOffset(0, 0);
+        CurrentPIImage()->SetZoom(1, false);
+        CurrentPIImage()->SetOffset(0, 0, false);
         CurrentImgWin()->SetSize(CurrentImage()->XSize(), 
                                   CurrentImage()->YSize());
@@ -267 +267 @@
       if ( CurrentPIImage()) 
         {
-        CurrentPIImage()->SetZoom(2);
-        CurrentPIImage()->SetOffset(0, 0);
+        CurrentPIImage()->SetZoom(2, false);
+        CurrentPIImage()->SetOffset(0, 0, false);
         CurrentImgWin()->SetSize(CurrentImage()->XSize()*2, 
                                   CurrentImage()->YSize()*2);
@@ -277 +277 @@
       if ( CurrentPIImage()) 
         {
-        CurrentPIImage()->SetZoom(-2);
-        CurrentPIImage()->SetOffset(0, 0);
+        CurrentPIImage()->SetZoom(-2, false);
+        CurrentPIImage()->SetOffset(0, 0, false);
         CurrentImgWin()->SetSize(CurrentImage()->XSize()/2, 
                                   CurrentImage()->YSize()/2);
@@ -287 +287 @@
       if ( CurrentPIImage()) 
         {
-        CurrentPIImage()->SetZoom(4);
-        CurrentPIImage()->SetOffset(0, 0);
+        CurrentPIImage()->SetZoom(4, false);
+        CurrentPIImage()->SetOffset(0, 0, false);
         CurrentImgWin()->SetSize(CurrentImage()->XSize()*4, 
                                   CurrentImage()->YSize()*4);
@@ -297 +297 @@
       if ( CurrentPIImage()) 
         {
-        CurrentPIImage()->SetZoom(-4);
+        CurrentPIImage()->SetZoom(-4, false);
         CurrentPIImage()->SetOffset(0, 0);
         CurrentImgWin()->SetSize(CurrentImage()->XSize()/4, 

trunk/SophyaPI/PI/piimage.cc

@@ -49 +49 @@
 
 /* --Methode-- */
-void PIImage::SetImage(RzImage *pim)
+void PIImage::SetImage(RzImage *pim, bool refr)
 {
 
@@ -57 +57 @@
 if (img)
   {
-  SetSize(img->XSize(), img->YSize());
+//  SetSize(img->XSize(), img->YSize());
   SetPave();
   if (img->minPix>img->maxPix) img->CheckDyn();
-  SetLut(img->minPix, img->maxPix, kLutType_Lin, 1);
-  }
-//printf("Debug_SetImage: %ld %ld \n", (long)img, (long)lut);
-return;
-}
-
-
-/* --Methode-- */
-void PIImage::SetZoomWin(PIPixmap * zw) 
+  SetLut(img->minPix, img->maxPix, kLutType_Lin, 1, refr);
+  }
+return;
+}
+
+
+/* --Methode-- */
+void PIImage::SetZoomWin(PIPixmap * zw, bool refr) 
 {
 zow = zw;
-if (zow)  zow->SetColMap(GetColMapId());
-}
-
-
-
-/* --Methode-- */
-void PIImage::SetLut(float min, float max, int typlut, int lauto)
+if (zow && refr && img)
+  {
+  zow->SetColMap(GetColMapId(), false);
+  ComputeZoomPixmap();
+  }
+return;
+}
+
+
+
+/* --Methode-- */
+void PIImage::SetLut(float min, float max, int typlut, int lauto, bool refr)
 {
 if (lut) delete(lut);
@@ -99 +103 @@
 lut = new LUT(min, max, NbCol(), typlut);
 
-Apply();
-return;
-}
-
-
-/* --Methode-- */
-void PIImage::SetLut(LUT *clut)
+if (refr) Apply();
+return;
+}
+
+
+/* --Methode-- */
+void PIImage::SetLut(LUT *clut, bool refr)
 {
 LUT * olut = lut;
@@ -111 +115 @@
 if (olut) delete olut;
 
-Apply();
-return;
-}
-
-
-/* --Methode-- */
-void PIImage::SetZoom(int zm)
+if (refr) Apply();
+return;
+}
+
+
+/* --Methode-- */
+void PIImage::SetZoom(int zm, bool refr)
 {
 if ((zm == 0) || (zm == -1) )  zoom = 1;
@@ -124 +128 @@
 else zoom = zm;
 SetOffset();
-Apply();
-return;
-}
-
-/* --Methode-- */
-void PIImage::SetOffset(int ox, int oy)
+if (refr) Apply();
+return;
+}
+
+/* --Methode-- */
+void PIImage::SetOffset(int ox, int oy, bool refr)
 {
 if (img == NULL)  {offx = offy = 0;  return; }
@@ -137 +141 @@
 if (oy >= (img->YSize()-1))  oy = img->YSize()-2;
 offx = ox;  offy = oy;
-return;
-}
-
-/* --Methode-- */
-void PIImage::SetColMap(CMapId cmap)
-{
-PIPixmap::SetColMap(cmap);
-if (zow)  zow->SetColMap(cmap);
+if (refr) Apply();
+return;
+}
+
+/* --Methode-- */
+void PIImage::SetColMap(CMapId cmap, bool refr)
+{
+PIPixmap::SetColMap(cmap, refr);
+if (zow)  zow->SetColMap(cmap, refr);
 return;
 }
@@ -155 +160 @@
 if (zow != NULL) 
   {
-  zow->SetColMap(GetColMapId());
+  zow->SetColMap(GetColMapId(), false);
   ComputeZoomPixmap();
   }

trunk/SophyaPI/PI/piimage.h

@@ -41 +41 @@
   ~PIImage();
 
-  void SetImage(RzImage *pim);
-  void SetZoomWin(PIPixmap * zw);
+  void SetImage(RzImage *pim, bool refr=true);
+  void SetZoomWin(PIPixmap * zw, bool refr=true);
   inline void SetTextWin(PILabel * tw) { txw = tw; };
 
-  void SetLut(float min, float max, 
-             int typlut=kLutType_Lin, int lauto=0);
-  void SetLut(LUT *clut);
-  void SetZoom(int zm);
+  void SetLut(float min, float max, int typlut=kLutType_Lin,
+              int lauto=0, bool refr=true);
+  void SetLut(LUT *clut, bool refr=true);
 
-  void SetOffset(int ox, int oy);
+  void SetZoom(int zm, bool refr=true);
+  void SetOffset(int ox, int oy, bool refr=true);
 
-  virtual void SetColMap(CMapId cmap);
+  virtual void SetColMap(CMapId cmap, bool refr=true);
 
   inline RzImage * Image() { return(img); }

trunk/SophyaPI/PI/pipixmapgen.cc

@@ -29 +29 @@
 
 /* --Methode-- */
-void PIPixmapGen::SetPixmap(unsigned char *pix, int sx, int sy)
+void PIPixmapGen::SetPixmap(unsigned char *pix, int sx, int sy, bool refr)
 {
 pixmap = pix; nx = sx; ny = sy;
-Refresh();   
+if (refr) Refresh();   
 }
 
 
 /* --Methode-- */
-void PIPixmapGen::SetColMap(CMapId cmapid)
+void PIPixmapGen::SetColMap(CMapId cmapid, bool refr)
 {
-  if (cmap) delete cmap;
-  cmap = new PIColorMap(cmapid);
-  Refresh();  
+if (cmap) delete cmap;
+cmap = new PIColorMap(cmapid);
+if (refr)  Refresh();  
 }
 

trunk/SophyaPI/PI/pipixmapgen.h

@@ -20 +20 @@
   virtual long    kind() {return ClassId; }
 
-  virtual void  SetPixmap(unsigned char *pix, int sx, int sy);
-  void          SetColMap(CMapId cmapid);
+  virtual void  SetPixmap(unsigned char *pix, int sx, int sy, bool refr=true);
+  void          SetColMap(CMapId cmapid, bool refr=true);
   inline CMapId GetColMapId() { return (cmap->Type()); }; 
   inline int    NbCol() { return(cmap->NCol()); };