Skip to content

DM-10461: Fixed: wcs match a little off for almost north plots #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2017
Merged

DM-10461: Fixed: wcs match a little off for almost north plots #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/firefly/js/visualize/CsysConverter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,8 @@ export class CysConverter {

// convert image workspace to screen
const zFact= this.zoomFactor;
retPt.x= Math.floor(imageWorkspaceX*zFact);
retPt.y= Math.floor((this.dataHeight - imageWorkspaceY) *zFact);
retPt.x= imageWorkspaceX*zFact;
retPt.y= (this.dataHeight - imageWorkspaceY) *zFact;
}


Expand All @@ -499,8 +499,8 @@ export class CysConverter {
makeSPtFromIWPt(iwpt, altZoomLevel) {
if (!iwpt) return null;
const zoom= altZoomLevel || this.zoomFactor;
return makeScreenPt(Math.floor(iwpt.x*zoom),
Math.floor((this.dataHeight - iwpt.y) *zoom) );
return makeScreenPt(iwpt.x*zoom,
(this.dataHeight - iwpt.y) *zoom );
}


Expand Down
3 changes: 2 additions & 1 deletion src/firefly/js/visualize/task/WcsMatchTask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,9 @@ function rotateToMatch(pv, masterPv, flipY) {
const masterPlot= primePlot(masterPv);
if (!plot) return;
const masterRot= masterPv.rotation * (flipY ? -1 : 1);
const targetRotation= ((getRotationAngle(masterPlot)+ masterRot) -
var targetRotation= ((getRotationAngle(masterPlot)+ masterRot) -
(getRotationAngle(plot))) * (flipY ? 1 : -1);
if (targetRotation<0) targetRotation+= 360;
dispatchRotate({
plotId: plot.plotId,
rotateType: RotateType.ANGLE,
Expand Down