diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-10-31 18:10:55 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-10-31 18:10:55 (GMT) |
| commit | 43bba56115c36895a28f8fe9278de7e5ba0e2e6f (patch) | |
| tree | 6fb0a63f32373f74cfa813decee3d60a29713065 /tksao/frame | |
| parent | 33a0f1a1e3753df8962d63df8cd73d1eb8bcb208 (diff) | |
| download | blt-43bba56115c36895a28f8fe9278de7e5ba0e2e6f.zip blt-43bba56115c36895a28f8fe9278de7e5ba0e2e6f.tar.gz blt-43bba56115c36895a28f8fe9278de7e5ba0e2e6f.tar.bz2 | |
update mask
Diffstat (limited to 'tksao/frame')
| -rw-r--r-- | tksao/frame/frame.C | 8 | ||||
| -rw-r--r-- | tksao/frame/framergb.C | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C index 371500d..3d8a409 100644 --- a/tksao/frame/frame.C +++ b/tksao/frame/frame.C @@ -214,7 +214,8 @@ unsigned char* Frame::fillMask(FitsMask* msk, int width, int height, unsigned char* img = new unsigned char[width*height*4]; memset(img,0,width*height*4); - FitsImage* currentMsk = msk->context()->fits; + Context* cc = msk->context(); + FitsImage* currentMsk = cc->fits; XColor* maskColor = msk->color(); int mark = msk->mark(); @@ -223,10 +224,11 @@ unsigned char* Frame::fillMask(FitsMask* msk, int width, int height, // basics FitsImage* sptr = currentMsk; - int mosaic = isMosaic(); + int mosaic = cc->isMosaic(); // variable double* mm = sptr->matrixToData(sys).mm(); + // waj FitsBound* params = sptr->getDataParams(context->secMode()); int srcw = sptr->width(); @@ -241,6 +243,7 @@ unsigned char* Frame::fillMask(FitsMask* msk, int width, int height, sptr = currentMsk; mm = sptr->matrixToData(sys).mm(); + // waj params = sptr->getDataParams(context->secMode()); srcw = sptr->width(); } @@ -268,6 +271,7 @@ unsigned char* Frame::fillMask(FitsMask* msk, int width, int height, if (sptr) { mm = sptr->matrixToData(sys).mm(); + // waj params = sptr->getDataParams(context->secMode()); srcw = sptr->width(); } diff --git a/tksao/frame/framergb.C b/tksao/frame/framergb.C index ee9947d..d39a4e1 100644 --- a/tksao/frame/framergb.C +++ b/tksao/frame/framergb.C @@ -770,7 +770,8 @@ void FrameRGB::getColorbarCmd() Tcl_AppendResult(interp, str.str().c_str(), NULL); } -void FrameRGB::getInfoCmd(const Vector& vv, Coord::InternalSystem ref, char* var) +void FrameRGB::getInfoCmd(const Vector& vv, Coord::InternalSystem ref, + char* var) { FrameBase::getInfoCmd(vv, ref, var); if (!currentContext->cfits) |