Changeset 1504 in Sophya for trunk/SophyaPI/PIext

Timestamp:

May 21, 2001, 3:12:51 PM (24 years ago)

Author:

ansari

Message:

ajout option graphique revcmap pour inverser l'indexage des ColorMap - Reza 21/5/2001

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• piaversion.h (modified) (1 diff)
• pistdimgapp.cc (modified) (5 diffs)
• pistdimgapp.h (modified) (2 diffs)
• servnobjm.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -753 +753 @@
 usage += "                midas_bluewhite midas_redwhite \n";
 usage += "                rainbow16 \n";
+usage += "   revcmap : This flag reverses ColorMap indexing \n";
 usage += ">> ZoomFactors: defzoom zoomx1 zoomx2 zoomx3 zoomx4 zoomx5 \n";
 usage += "                               zoom/2 zoom/3 zoom/4 zoom/5 \n";

trunk/SophyaPI/PIext/piaversion.h

@@ -2 +2 @@
 #define PIAPPVERSION_H_SEEN
 
-#define PIAPP_VERSIONNUMBER  3.01
+#define PIAPP_VERSIONNUMBER  3.02
 
 #endif

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -204 +204 @@
 mMrk = PI_NotDefMarker;
 mCmapid = CMAP_OTHER;
+mRevCmap = false; 
 mZoom = 0;
 mAxesFlags = kBoxAxes | kExtTicks | kLabels;
@@ -489 +490 @@
 pii->SetCMapWin(cmapv, false);
 pii->SetZoom(zm, false);
-if ( mCmapid != CMAP_OTHER ) pii->SetColMapId(mCmapid, false);
+if ( mCmapid != CMAP_OTHER ) pii->SetColMapId(mCmapid, mRevCmap, false);
 pii->ShowCursor(true);
 pii->SetUserData(NULL, oid);
@@ -1417 +1418 @@
   mMrk = mrk;
 }
-/* --Methode-- */
-void PIStdImgApp::SetColMapId(CMapId cid)
-{
-  mCmapid = cid;
-}
+
 /* --Methode-- */
 void PIStdImgApp::SetZoomAtt(int zoom)
@@ -1462 +1459 @@
   mSMrk = mMrk;
   mSCmapid = mCmapid;
+  mSRevCmap = mRevCmap;
   mSZoom = mZoom;
   mSAxesFlags = mAxesFlags;
@@ -1488 +1486 @@
   mMrk = mSMrk;
   mCmapid = mSCmapid;
+  mRevCmap = mSRevCmap;
   mZoom = mSZoom;
   mAxesFlags = mSAxesFlags;

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -99 +99 @@
                       PIFontAtt fat=PI_NotDefFontAtt);
      void  SetMarkerAtt(int sz=-1, PIMarker mrk=PI_NotDefMarker);
-     void  SetColMapId(CMapId cid=CMAP_OTHER);
+     inline void  SetColMapId(CMapId cid=CMAP_OTHER) { mCmapid = cid; }
+     inline void  SetReverseColMapFlag(bool fg=false) { mRevCmap = fg; }
      void  SetZoomAtt(int zoom=0);
      void  SetAxesAtt(unsigned int axfl=kBoxAxes | kExtTicks | kLabels);
@@ -175 +176 @@
     PIMarker     mMrk,mSMrk;  
     CMapId       mCmapid, mSCmapid;
+    bool         mRevCmap, mSRevCmap;
     int          mZoom, mSZoom;
     unsigned int mAxesFlags, mSAxesFlags;

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1368 +1368 @@
   mImgapp->SetMarkerAtt();
   mImgapp->SetColMapId();
+  mImgapp->SetReverseColMapFlag();
   mImgapp->SetZoomAtt();
   mImgapp->SetAxesAtt();
@@ -1430 +1431 @@
   if ( ( grt[k] == "notit" ) || ( grt[k] == "notitle" ) )
     { mImgapp->SetAutoAddTitle(false); fgsrgr = true;  continue; }
+
+  // Inversion d'indexage de ColorMap
+  if (grt[k] == "revcmap") 
+    { mImgapp->SetReverseColMapFlag(true); fgsrgr = true;  continue; }
 
   // Si c'est une couleur