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

Timestamp:

Feb 10, 2002, 6:51:58 PM (24 years ago)

Author:

ansari

Message:

Optimisation implementation PIGraphX::DrawMarker - Reza 10/02/2002

File:

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

trunk/SophyaPI/PI/pigraphx.cc

@@ -38 +38 @@
 xgv.plane_mask = ~0;
 mDefGC = XCreateGC (PIXDisplay(), XtWindow(PIXtTopWdg()), GCFunction | GCPlaneMask, &xgv);
-
+mMrkGC = XCreateGC (PIXDisplay(), XtWindow(PIXtTopWdg()), GCFunction | GCPlaneMask, &xgv);
+mFgMrkGCOK = false;
 Init();
 }
@@ -55 +56 @@
 xgv.plane_mask = ~0;
 mDefGC = XCreateGC (mDisp, mWId, GCFunction | GCPlaneMask, &xgv);
+mMrkGC = XCreateGC (PIXDisplay(), XtWindow(PIXtTopWdg()), GCFunction | GCPlaneMask, &xgv);
+mFgMrkGCOK = false;
 Init();
 }
@@ -71 +74 @@
 SelMarker(1, PI_DotMarker);  
 mFCfMap = colpix[PI_Black];  mBCfMap = colpix[PI_White];
+mFgMrkGCOK = false;
 }
 
@@ -77 +81 @@
 {
 XFreeGC(mDisp, mDefGC);
+XFreeGC(mDisp, mMrkGC);
 }
 
@@ -238 +243 @@
 }
 
+
 /* --Methode-- */
 void PIGraphicX::DrawArc(PIGrCoord x0, PIGrCoord y0, PIGrCoord dx, PIGrCoord dy, 
@@ -262 +268 @@
 void PIGraphicX::DrawMarker(PIGrCoord x0, PIGrCoord y0)
 {
-float hmsz = mMrkSz/2;
-float dmsz = mMrkSz-hmsz;
-PIGrCoord x[11],y[11];
-int k;
-PILineAtt clatt;
-
-if (mMrk == PI_DotMarker)
+
+if (mMrk == PI_DotMarker) {
   XDrawPoint(mDisp, mWId, DefGC(), (int)x0, (int)y0);
-
+  return;
+}
 else  {
-  clatt = mLAtt;
-  SelLine(PI_ThinLine);
+  int x1,x2,y1,y2,r;
+  float hmsz = mMrkSz/2;
+  float dmsz = mMrkSz-hmsz;
+  XPoint pxp[12];
+  int k;
+  bool fgcgc = SetupMrkGC();
   switch (mMrk) {
     case  PI_PlusMarker :
-      DrawLine((float)x0-hmsz, y0, (float)x0+dmsz, y0);
-      DrawLine(x0, (float)y0-hmsz, x0, (float)y0+dmsz);
+      x1 = (float)x0-hmsz;   y1 = y0;
+      x2 = (float)x0+dmsz;   y2 = y1;
+      XDrawLine(XtDisplay (MyWdg()), mWId, mMrkGC, x1, y1, x2, y2);
+      x1 = x0;  y1 = (float)y0-hmsz;
+      x2 = x1;  y2 = (float)y0+dmsz;
+      XDrawLine(XtDisplay (MyWdg()), mWId, mMrkGC, x1, y1, x2, y2);
       break;
     case  PI_CrossMarker :
-      DrawLine((float)x0-hmsz, (float)y0-hmsz, (float)x0+dmsz, (float)y0+dmsz);
-      DrawLine((float)x0-hmsz, (float)y0+dmsz, (float)x0+dmsz, (float)y0-hmsz);
+      x1 = (float)x0-hmsz;   y1 = (float)y0-hmsz;
+      x2 = (float)x0+dmsz;   y2 = (float)y0+dmsz;
+      XDrawLine(XtDisplay (MyWdg()), mWId, mMrkGC, x1, y1, x2, y2);
+      XDrawLine(XtDisplay (MyWdg()), mWId, mMrkGC, x1, y2, x2, y1);
       break;  
     case PI_CircleMarker :
-      DrawCircle(x0, y0, hmsz);
-      break;
     case PI_FCircleMarker :
-      DrawFCircle(x0, y0, hmsz);
+      r = hmsz;
+      x1 = (int)x0-r;  y1 = (int)y0-r;
+      if (mMrk == PI_CircleMarker) 
+        XDrawArc(XtDisplay (MyWdg()), mWId, mMrkGC, x1, y1, 2*r, 2*r, 0, 360*64);
+      else XFillArc(XtDisplay (MyWdg()), mWId, mMrkGC, x1, y1, 2*r, 2*r, 0, 360*64);
       break;
     case PI_BoxMarker :
-      DrawBox((float)x0-hmsz, (float)y0-hmsz, mMrkSz, mMrkSz);
-      break;
     case PI_FBoxMarker :
-      DrawFBox((float)x0-hmsz, (float)y0-hmsz, mMrkSz, mMrkSz);
+      pxp[0].x = (int)x0-hmsz;  pxp[0].y = (int)y0-hmsz;
+      pxp[1].x = (int)x0+hmsz;  pxp[1].y = (int)y0-hmsz;
+      pxp[2].x = (int)x0+hmsz;  pxp[2].y = (int)y0+hmsz;
+      pxp[3].x = (int)x0-hmsz;  pxp[3].y = (int)y0+hmsz;
+      pxp[4].x = (int)x0-hmsz;  pxp[4].y = (int)y0-hmsz;
+      if (mMrk == PI_BoxMarker) MrkDrawPolygon(pxp, 5, false);
+      else MrkDrawFPolygon(pxp, 5, false);
       break;
     case  PI_TriangleMarker :
-      x[1] = mMrkSz; y[1] = 0; x[2] = -hmsz; y[2] = -mMrkSz; 
-      x[3] = -dmsz; y[3] = +mMrkSz; x[0] = (float)x0-hmsz; y[0] = (float)y0+hmsz;  
-      DrawPolygon(x, y, 4);
-      break;
     case  PI_FTriangleMarker :
-      x[1] = mMrkSz; y[1] = 0; x[2] = -hmsz; y[2] = -mMrkSz; 
-      x[3] = -dmsz; y[3] = +mMrkSz; x[0] = (float)x0-hmsz; y[0] = (float)y0+hmsz;  
-      DrawFPolygon(x, y, 4);
+      pxp[1].x = mMrkSz; pxp[1].y = 0; pxp[2].x = -hmsz; pxp[2].y = -mMrkSz;
+      pxp[3].x = -dmsz;  pxp[3].y = +mMrkSz; pxp[0].x = (float)x0-hmsz; pxp[0].y = (float)y0+hmsz;
+      if (mMrk == PI_TriangleMarker) MrkDrawPolygon(pxp, 4, true);
+      else MrkDrawFPolygon(pxp, 4, true);
       break;
     case  PI_StarMarker :
     case  PI_FStarMarker :
       for(k=0; k<10; k++) {
-        x[k] = (int)(starcoordx[k]*hmsz+(float)x0+0.5);
-        y[k] = (int)(starcoordy[k]*hmsz+(float)y0+0.5);
+        pxp[k].x = (int)(starcoordx[k]*hmsz+(float)x0+0.5);
+        pxp[k].y = (int)(starcoordy[k]*hmsz+(float)y0+0.5);
         }
-      x[10] = x[0];   y[10] = y[0];
-      if (mMrk == PI_StarMarker)  DrawPolygon(x, y, 11, false);
-      else DrawFPolygon(x, y, 11, false);
+      pxp[10].x = pxp[0].x;   pxp[10].y = pxp[0].y;
+      if (mMrk == PI_StarMarker)   MrkDrawPolygon(pxp, 11, false);
+      else  MrkDrawFPolygon(pxp, 11, false);
       break;
     default :
@@ -319 +334 @@
       break;
     }
-  SelLine(clatt);
+  if (fgcgc) mFgMrkGCOK = false;
   }
 
@@ -340 +355 @@
   if (n > NMXXPOINTS)  delete[] pxp;  
   }
-else for(i=0; i<n; i++) DrawMarker(x[i], y[i]);
-
+else { 
+  SetupMrkGC();
+  for(i=0; i<n; i++) DrawMarker(x[i], y[i]);
+  mFgMrkGCOK = false;
+}
 return;
 }
@@ -385 +403 @@
 return;
 }
+
+/* --Methode-- */
+bool PIGraphicX::SetupMrkGC()
+{
+if (mFgMrkGCOK) return(false);
+XCopyGC(mDisp, DefGC(), GCFunction|GCForeground|GCBackground|GCPlaneMask, mMrkGC); 
+XSetLineAttributes(mDisp, mMrkGC, 1, LineSolid, CapButt, JoinMiter);
+mFgMrkGCOK = true;
+return true;
+}
+
+/* --Methode-- */
+void PIGraphicX::MrkDrawPolygon(XPoint *pxp, int n, bool cinc)
+{
+
+if (n <= 0)  return;
+int mode = CoordModeOrigin;
+if (cinc) mode =  CoordModePrevious;
+XDrawLines(mDisp, mWId, mMrkGC, pxp, n, mode);
+
+return;
+}
+
+
+/* --Methode-- */
+void PIGraphicX::MrkDrawFPolygon(XPoint *pxp, int n, bool cinc)
+{
+int mode = CoordModeOrigin;
+if (cinc) mode =  CoordModePrevious;
+XFillPolygon(XtDisplay (MyWdg()), mWId, mMrkGC, pxp, n, 
+                        Complex, mode);
+return;
+}
+