Changeset 1899 in Sophya for trunk/SophyaPI/PI/pigraphx.cc

Timestamp:

Feb 13, 2002, 12:03:15 PM (24 years ago)

Author:

ansari

Message:

Fin implementation trace texte vertical (PIGraphX, PIGraphPS, PSFile)
Debut de modification de gestion des Drawer (AutoDeleteOndetach, ...)

Reza 13/02/2002

File:

• trunk/SophyaPI/PI/pigraphx.cc (modified) (5 diffs)

trunk/SophyaPI/PI/pigraphx.cc

@@ -14 +14 @@
 
 /*  Variables globales pour modifier les GC  */
-#define NMAXCOL  24
+#define NMAXCOL  32
 static  PIXColor colpix[NMAXCOL];
 
@@ -491 +491 @@
   }
   XPutImage(dsx, pxm2, gcbm, ximg2, 0, 0, 0, 0, fh, sw);
+  GC gcvis;
   GC gcvs = XCreateGC (dsx, mWId, GCFunction | GCPlaneMask, &xgv);
   XCopyGC(dsx, DefGC(), ~0, gcvs); 
   XSetStipple(dsx, gcvs, pxm2);
   XSetFillStyle(dsx, gcvs, FillStippled);
+  if (imgs) {
+    gcvis = XCreateGC (dsx, mWId, GCFunction | GCPlaneMask, &xgv);
+    XCopyGC(dsx, DefGC(), ~0, gcvis); 
+    if (mBCol == PI_ColorFromMap)  XSetForeground(mDisp, gcvis, mBCfMap);
+    else  XSetForeground(mDisp, gcvis, colpix[mBCol]); 
+  }
   if (fgdown) {
-    XSetTSOrigin(dsx, gcvs, x, y);
-    XFillRectangle(dsx, mWId, gcvs, x, y, fh, sw);
+    XSetTSOrigin(dsx, gcvs, x-fdes, y);
+    if (imgs)  XFillRectangle(dsx, mWId, gcvis, x-fdes, y, fh, sw);
+    XFillRectangle(dsx, mWId, gcvs, x-fdes, y, fh, sw);
   }
   else {
-    XSetTSOrigin(dsx, gcvs, x-fh, y-sw);
-    XFillRectangle(dsx, mWId, gcvs, x-fh, y-sw, fh, sw);
+    XSetTSOrigin(dsx, gcvs, x-fasc, y-sw);
+    if (imgs) XFillRectangle(dsx, mWId, gcvis, x-fasc, y-sw, fh, sw);
+    XFillRectangle(dsx, mWId, gcvs, x-fasc, y-sw, fh, sw);
   }
   // Cleaning  
   XDestroyImage(ximg);
   XDestroyImage(ximg2);
+  XFreeGC(dsx, gcbm);
   XFreeGC(dsx, gcvs);
-  XFreeGC(dsx, gcbm);
+  if (imgs) XFreeGC(dsx, gcvis);
   XFreePixmap(dsx, pxm);                             
   XFreePixmap(dsx, pxm2);                            
@@ -517 +527 @@
 void PIGraphicX::SelForeground(PIColors col)
 {
+if (myLockFCol)  return;
 if (col == mFCol)  return;
 if ( (col < 0) || (col >= NMAXCOL))  return;
@@ -537 +548 @@
 void PIGraphicX::SelForeground(PIColorMap& cmap, int cid)
 {
+if (myLockFCol)  return;
 SelectFCol(cmap.Color(cid));
 }
@@ -849 +861 @@
   colpix[PI_DarkViolet] = mycol.pixel;
 
+mycol.red = 0;
+mycol.blue = 65000;
+mycol.green = 45000;
+if ( XAllocColor (mdsp, cmap, &mycol) )  colpix[PI_HighlightBlue] = mycol.pixel;
 
 /*  le GC pour DrawPixmap  */