diff options
Diffstat (limited to 'src/bltGrElemLine.C')
-rw-r--r-- | src/bltGrElemLine.C | 67 |
1 files changed, 1 insertions, 66 deletions
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index ce946c8..dbb0d99 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -76,7 +76,7 @@ typedef struct { typedef enum { SYMBOL_NONE, SYMBOL_SQUARE, SYMBOL_CIRCLE, SYMBOL_DIAMOND, SYMBOL_PLUS, SYMBOL_CROSS, SYMBOL_SPLUS, SYMBOL_SCROSS, SYMBOL_TRIANGLE, SYMBOL_ARROW, - SYMBOL_BITMAP, SYMBOL_IMAGE + SYMBOL_BITMAP } SymbolType; typedef struct { @@ -293,8 +293,6 @@ typedef struct { // Defs static void DestroySymbol(Display *display, Symbol *symbolPtr); -static void ImageChangedProc(ClientData clientData, int x, int y, int w, int h, - int imageWidth, int imageHeight); typedef double (DistanceProc)(int x, int y, Point2d *p, Point2d *q, Point2d *t); static void InitLinePen(Graph* graphPtr, LinePen* penPtr); static void ResetLine(LineElement* elemPtr); @@ -411,20 +409,6 @@ static int SymbolSetProc(ClientData clientData, Tcl_Interp* interp, } } - // image - { - Element* elemPtr = (Element*)widgRec; - - Tk_Image tkImage = - Tk_GetImage(interp, tkwin, string, ImageChangedProc, elemPtr); - if (tkImage) { - DestroySymbol(Tk_Display(tkwin), symbolPtr); - symbolPtr->image = tkImage; - symbolPtr->type = SYMBOL_IMAGE; - return TCL_OK; - } - } - // bitmap { Tcl_Obj **objv; @@ -920,17 +904,6 @@ static void DestroySymbol(Display *display, Symbol *symbolPtr) symbolPtr->type = SYMBOL_NONE; } -static void ImageChangedProc(ClientData clientData, - int x, int y, int w, int h, - int imageWidth, int imageHeight) -{ - Element* elemPtr = (Element*)clientData; - Graph* graphPtr = elemPtr->obj.graphPtr; - elemPtr->flags |= MAP_ITEM; - graphPtr->flags |= CACHE_DIRTY; - Blt_EventuallyRedrawGraph(graphPtr); -} - /* * Reset the number of points and segments, in case there are no segments or * points @@ -2912,44 +2885,6 @@ static void DrawSymbols(Graph* graphPtr, Drawable drawable, } break; - case SYMBOL_IMAGE: - { - int w, h; - int dx, dy; - - Tk_SizeOfImage(penPtr->symbol.image, &w, &h); - - dx = w / 2; - dy = h / 2; - if (elemPtr->symbolInterval > 0) { - Point2d *pp, *endp; - - for (pp = symbolPts, endp = pp + nSymbolPts; pp < endp; pp++) { - if (DRAW_SYMBOL(elemPtr)) { - int x, y; - - x = Round(pp->x) - dx; - y = Round(pp->y) - dy; - Tk_RedrawImage(penPtr->symbol.image, 0, 0, w, h, - drawable, x, y); - } - elemPtr->symbolCounter++; - } - } else { - Point2d *pp, *endp; - - for (pp = symbolPts, endp = pp + nSymbolPts; pp < endp; pp++) { - int x, y; - - x = Round(pp->x) - dx; - y = Round(pp->y) - dy; - Tk_RedrawImage(penPtr->symbol.image, 0, 0, w, h, - drawable, x, y); - } - } - } - break; - case SYMBOL_BITMAP: { Pixmap bitmap, mask; |