summaryrefslogtreecommitdiffstats
path: root/tksao/frame
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-03-27 21:11:14 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-03-27 21:11:14 (GMT)
commit89ffa4a4bf0b10854c25503493fdeeb5235d128e (patch)
treef51e7639868a357dfe40e32d60dfc24cf35cec2b /tksao/frame
parente922c5712bba71325bac980dc54009549a593936 (diff)
downloadblt-89ffa4a4bf0b10854c25503493fdeeb5235d128e.zip
blt-89ffa4a4bf0b10854c25503493fdeeb5235d128e.tar.gz
blt-89ffa4a4bf0b10854c25503493fdeeb5235d128e.tar.bz2
fix updatePixamp
Diffstat (limited to 'tksao/frame')
-rw-r--r--tksao/frame/base.C72
-rw-r--r--tksao/frame/base.h6
-rw-r--r--tksao/frame/contour.C2
-rw-r--r--tksao/frame/marker.C8
4 files changed, 34 insertions, 54 deletions
diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index 78f2df7..c0fbfcd 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -141,10 +141,10 @@ Base::Base(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
centroidRadius = 10;
preserveMarkers = 0;
- markerGC = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
+ markerGC_ = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
- markerGCXOR = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
- XSetForeground(display, markerGCXOR, getColor("white"));
+ markerGCXOR_ = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
+ XSetForeground(display, markerGCXOR_, getColor("white"));
selectGCXOR = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
XSetForeground(display, selectGCXOR, getColor("white"));
@@ -152,8 +152,8 @@ Base::Base(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
grid = NULL;
gridGC_ = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
- contourGC = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
- XSetLineAttributes(display, contourGC, 1, LineSolid, CapButt, JoinMiter);
+ contourGC_ = XCreateGC(display, Tk_WindowId(tkwin), 0, NULL);
+ XSetLineAttributes(display, contourGC_, 1, LineSolid, CapButt, JoinMiter);
bgColorName = dupstr("white");
bgColor = getXColor("white");
@@ -222,11 +222,11 @@ Base::~Base()
if (maskColorName)
delete [] maskColorName;
- if (markerGC)
- XFreeGC(display, markerGC);
+ if (markerGC_)
+ XFreeGC(display, markerGC_);
- if (markerGCXOR)
- XFreeGC(display, markerGCXOR);
+ if (markerGCXOR_)
+ XFreeGC(display, markerGCXOR_);
if (selectGCXOR)
XFreeGC(display, selectGCXOR);
@@ -237,8 +237,8 @@ Base::~Base()
if (gridGC_)
XFreeGC(display, gridGC_);
- if (contourGC)
- XFreeGC(display, contourGC);
+ if (contourGC_)
+ XFreeGC(display, contourGC_);
if (bgColorName)
delete [] bgColorName;
@@ -1663,8 +1663,8 @@ void Base::updateGCs()
XSetClipRectangles(display, rotateGCXOR, 0, 0, rectWindow, 1, Unsorted);
// markerGC
- XSetClipRectangles(display, markerGC, 0, 0, rectWidget, 1, Unsorted);
- XSetClipRectangles(display, markerGCXOR, 0, 0, rectWindow, 1, Unsorted);
+ XSetClipRectangles(display, markerGC_, 0, 0, rectWidget, 1, Unsorted);
+ XSetClipRectangles(display, markerGCXOR_, 0, 0, rectWindow, 1, Unsorted);
// selectGC
x11Dash(selectGCXOR,1);
@@ -1674,7 +1674,7 @@ void Base::updateGCs()
XSetClipRectangles(display, gridGC_, 0, 0, rectWidget, 1, Unsorted);
// contourGC
- XSetClipRectangles(display, contourGC, 0, 0, rectWidget, 1, Unsorted);
+ XSetClipRectangles(display, contourGC_, 0, 0, rectWidget, 1, Unsorted);
}
void Base::updateMagnifier()
@@ -1921,10 +1921,14 @@ int Base::updatePixmap(const BBox& bb)
return TCL_OK;
}
+extern "C" {
+void TkUnixSetXftClipRegion(TkRegion clipRegion);
+};
+
void Base::updatePM(const BBox& bbox)
{
// bbox is in Canvas Coords
- cerr << bbox << endl;
+ // Gave up on only redrawing bbox, contours, and grid causes problems
if (DebugPerf)
cerr << "Base::updatePM()...";
@@ -1940,48 +1944,24 @@ void Base::updatePM(const BBox& bbox)
}
}
- if (bbox.isEmpty())
- return;
-
- BBox bb = bbox * canvasToWidget;
- int x0 = (int)bb.ll[0] > 0 ? (int)bb.ll[0] : 0;
- int y0 = (int)bb.ll[1] > 0 ? (int)bb.ll[1] : 0;
- int x1 = (int)bb.ur[0] < width ? (int)bb.ur[0] : width;
- int y1 = (int)bb.ur[1] < height ? (int)bb.ur[1] : height;
- int sx = x1-x0;
- int sy = y1-y0;
-
- if (DebugPerf)
- cerr << ' ' << x0 << ' ' << y0 << ' ' << x1 << ' ' << y1 << ' ';
-
- XCopyArea(display, basePixmap, pixmap, widgetGC, x0, y0, sx, sy, x0, y0);
+ XCopyArea(display, basePixmap, pixmap, widgetGC, 0, 0, width, height, 0, 0);
// contours
// needs to before markers if marker is filled
- currentContext->contourX11(pixmap, Coord::WIDGET, bb);
+ currentContext->contourX11(pixmap, Coord::WIDGET, BBox(0,0,width,height));
// markers
+ BBox bb = BBox(0,0,width,height) * widgetToCanvas;
if (showMarkers) {
- x11Markers(&catalogMarkers, bbox);
- x11Markers(&userMarkers, bbox);
+ x11Markers(&catalogMarkers, bb);
+ x11Markers(&userMarkers, bb);
}
- // x11Markers(&analysisMarkers, bbox);
+ // x11Markers(&analysisMarkers, bb);
// grid
// needs to be after markers if marker is filled
- if (grid) {
- BBox bb = bbox;
- XRectangle rr[1];
- Vector ss = bb.size();
-
- rr[0].x = (int)bb.ll[0];
- rr[0].y = (int)bb.ll[1];
- rr[0].width = (int)ss[0];
- rr[0].height = (int)ss[1];
-
- XSetClipRectangles(display, gridGC_, 0, 0, rr, 1, Unsorted);
+ if (grid)
grid->x11();
- }
// crosshair
if (useCrosshair)
diff --git a/tksao/frame/base.h b/tksao/frame/base.h
index 3421536..6bfba36 100644
--- a/tksao/frame/base.h
+++ b/tksao/frame/base.h
@@ -255,14 +255,14 @@ public:
float centroidRadius;
int preserveMarkers; // flag to indicate preserve between loads
- GC markerGC; // marker gc
- GC markerGCXOR; // marker xor gc
+ GC markerGC_; // marker gc
+ GC markerGCXOR_; // marker xor gc
GC selectGCXOR; // select gc
Grid* grid;
GC gridGC_;
- GC contourGC;
+ GC contourGC_;
char* bgColorName;
XColor* bgColor;
diff --git a/tksao/frame/contour.C b/tksao/frame/contour.C
index 71f9b25..5c2e11e 100644
--- a/tksao/frame/contour.C
+++ b/tksao/frame/contour.C
@@ -11,7 +11,7 @@ ContourLevel::ContourLevel(Base* pp, double lev, const char* cc, int ww,
int dd, int* dl)
{
parent_ = pp;
- gc_ = parent_->contourGC;
+ gc_ = parent_->contourGC_;
level_ = lev;
colorName_ = dupstr(cc);
diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C
index 3ca7da0..d38077d 100644
--- a/tksao/frame/marker.C
+++ b/tksao/frame/marker.C
@@ -77,8 +77,8 @@ Marker::Marker(Base* p, const Vector& ctr, double ang)
comment = dupstr("");
display = parent->display;
- gc = parent->markerGC;
- gcxor = parent->markerGCXOR;
+ gc = parent->markerGC_;
+ gcxor = parent->markerGCXOR_;
for (int ii=0; ii<XMLNUMCOL; ii++)
XMLCol[ii] = NULL;
@@ -132,8 +132,8 @@ Marker::Marker(Base* p, const Vector& ctr,
comment = dupstr(c);
display = parent->display;
- gc = parent->markerGC;
- gcxor = parent->markerGCXOR;
+ gc = parent->markerGC_;
+ gcxor = parent->markerGCXOR_;
for (int ii=0; ii<XMLNUMCOL; ii++)
XMLCol[ii] = NULL;