Skip to content

DM-7147: fix region bugs as listed in DM-7147. #141

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 3 commits into from
Aug 11, 2016
Merged

DM-7147: fix region bugs as listed in DM-7147. #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
083b943
DM-7147: treat PHYSICAL and IMAGE, xxxp and xxxi the same.
Aug 8, 2016
29079aa
update the region highlight box on on multiple plots and make region …
Aug 11, 2016
a2a30fd
add region testing sample, test5.reg
Aug 11, 2016
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
3 changes: 3 additions & 0 deletions src/firefly/html/demo/ffapi-2images.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ <h3>Firefly - new API demo</h3>
};
firefly.showImage('image2_div', req2);

firefly.action.dispatchCreateRegionLayer('region2', 'Region Layer 2', null, ['image; box 200 200 72 72 0 # color=red'], ['image1', 'image2']);


}
}
</script>
Expand Down
50 changes: 46 additions & 4 deletions src/firefly/html/demo/ffapi-highlevel-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,12 @@
firefly.addXYPlot({QUERY_ID: 'oldSelectable'}, 'oldXyPlot1');
//-----< old xyplot api ------//

var regionAry = [
window.regionAry = [
/*
'global color=green dashlist=8 3 width=1 font="helvetica 10 normal normal" select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 rotate=0 source=1',
'J2000;point 202.41 47.262 # color=pink text="pt circle 1" point=circle',
'box (100p, 70p, 20p, 20p, 0) #color=red text={Physical coordinate - 1}',
'box (100i, 70i, 30i, 30i, 0) #color=orange text={Image coordinate -2}',
'line(202.414796 47.281999 202.423758 47.247072) # color=orange width=10 select=0 text={line 2}',
'text 30p 40p # color=pink text={text test 3} edit=0 highlite=0 font="BRAGGADOCIO 10 normal roman"',
'text 202.437691 47.234228{more text testing 4} # color=purple move=0',
Expand All @@ -252,7 +255,38 @@
'j2000;box(47.247072i, 180.445347i, 50p, 20p, 0) # color=blue width=6 text="box 12-3"',
'physical;-box point 12 12 # text="pt box 13"',
'j2000;polygon(202.564796, 47.281999,202.553758, 47.247072, 202.445347, 47.244296, 202.479687, 47.264027, 202.492153, 47.290841) # color=blue text="polygon 14" offsety=10 width=10 font="helvetica 16 bold"',
'point 202.45 47.2879 # color=cyan text="pt arrow 15" delete=0 point=arrow 20'
'point 202.45 47.2879 # color=cyan text="pt arrow 15" delete=0 point=arrow 20',
'IMAGE;box (160, 70, 20, 20, 0) #color=red text={IMAGE test - 1}',
'PHYSICAL;box (160, 70, 30, 30, 0) #color=orange text={PHYSICAL test -2}'
*/
'box (240, 220, 20, 20, 0) #color=red text={ ph1}',
'box (240i, 220i, 60i, 60i, 0) #color=orange text={ph2}',
'J2000;point 202.41 47.262 # color=pink text="pt circle 1" point=circle',
'IMAGE;box (360, 220, 20, 20, 0) #color=red text={ im1}',
'PHYSICAL;box (360, 220, 60, 60, 0) #color=orange text={ph3}'
];

window.regionAry2 = [
'J2000',
'boxcircle point 202.45 47.262 # color=red text="pt boxcircle 6" delete=0',
'physical;circle 80 140 20 # color=red offsetx=25 offsety=2 width=5 edit=0 text="circle 7"',
'annulus 13h30m16.41s +47d14m43.9s 30p 40p 50p # color=green text="hello" include=0 text="annulus 8"',
'physical;point 200 140 # color=yellow point=cross 20 text="pt cross 9" offsetx=10',
'physical;point 13h29m52.73s, +47d11m40.9s # color=purple point=diamond 15 text="pt diamond 10"',
'#circle(202.55556, 47.188286 , 20p) # color=blue text="text 11"',
'box(202.55556, 47.188286 ,20p,40p, 30p, 50p, 0) # color=red width=5 text="boxann 11"',
'box(202.52556,47.226286,0.0240,0.006,0) # color=green width=5 text="box 11-2"',
'image;box(100, 150, 50p, 20p, 2r) # color=magenta width=6 text="slanted box 12"',
'image;box(190.564796, 47.281999, 50p, 20p, 0) # color=red width=6 offsety=-15 text="box 12-1"',
'j2000;box(47.247072i, 180.445347i, 50p, 20p, 0) # color=blue width=6 text="box 12-3"',
'physical;-box point 12 12 # text="pt box 13"',
'j2000;polygon(202.564796, 47.281999,202.553758, 47.247072, 202.445347, 47.244296, 202.479687, 47.264027, 202.492153, 47.290841) # color=blue text="polygon 14" offsety=10 width=10 font="helvetica 16 bold"',
'point 202.45 47.2879 # color=cyan text="pt arrow 15" delete=0 point=arrow 20',
];

window.regionWithError = [
'image; box 280 200 72 72 # color=blue text={wrong syntax}',
'image; box 280 200 72 72 0 # color=cyan text={right syntax}'
];

var moreRegionAry = [
Expand All @@ -264,7 +298,7 @@
window.regions = [];
window.regionId = window.regions.length;

document.getElementById('regionLayerContent').value = regionAry.join('\n');
document.getElementById('regionLayerContent').value = window.regionAry.join('\n');
document.getElementById('moreRegionContent').value = moreRegionAry.join('\n');
//document.getElementById('createRegionId').placeholder = "Region_Plot_" + (window.regionId+1);
updateRegionLayerList();
Expand All @@ -279,6 +313,14 @@
document.getElementById('createRegionId').value = layerId;
}

if (window.regionId === 3) {
document.getElementById('regionLayerContent').value = window.regionWithError.join('\n');
} else if (window.regionId > 1) {
document.getElementById('regionLayerContent').value = window.regionAry2.join('\n');
} else {
document.getElementById('regionLayerContent').value = window.regionAry.join('\n');
}

var regionAry = document.getElementById('regionLayerContent').value.split('\n').filter(function(r) { return (r.length !== 0);});
window.regions.push(layerId);
updateRegionLayerList();
Expand Down Expand Up @@ -355,7 +397,7 @@
selectBox.getElementsByTagName('option')[0].selected = 'selected';
firefly.action.dispatchRemoveRegionEntry(selectedLayerId, removeRegions);
firefly.action.dispatchRemoveRegionEntry(selectedLayerId, removeRegions, window.ffViewer.dispatch);
}
};

plotRemote= function() {
firefly.getViewer().showImage({plotId: 'xxq',
Expand Down
51 changes: 29 additions & 22 deletions src/firefly/js/drawingLayers/RegionPlot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {MouseState} from '../visualize/VisMouseSync.js';
import DrawOp from '../visualize/draw/DrawOp.js';
import DrawLayerCntrl, {dispatchModifyCustomField,
dispatchAddRegionEntry,
dispatchRemoveRegionEntry} from '../visualize/DrawLayerCntlr.js';
dispatchRemoveRegionEntry, dlRoot} from '../visualize/DrawLayerCntlr.js';

import {get, isEmpty} from 'lodash';

Expand Down Expand Up @@ -125,7 +125,17 @@ function highlightChange(mouseStatePayload) {
const sId = window.setInterval( () => {
if (done) {
window.clearInterval(sId);
dispatchModifyCustomField(TYPE_ID, {highlightedRegion: closestObj}, false);

// set the highlight region on current drawLayer,
// unset the highlight on other drawLayer if a highlight is found for current layer

dlRoot().drawLayerAry.forEach( (dl) => {
if (dl.drawLayerId === drawLayer.drawLayerId) {
dispatchModifyCustomField(dl.drawLayerId, {highlightedRegion: closestObj}, plotId, false);
} else if (closestObj) {
dispatchModifyCustomField(dl.drawLayerId, {highlightedRegion: null}, plotId, false);
}
});
}

for (let i = 0; i < maxChunk; i++ ) {
Expand Down Expand Up @@ -157,30 +167,27 @@ function highlightChange(mouseStatePayload) {
* @returns {*}
*/
function getLayerChanges(drawLayer, action) {
const {changes, regionId, regionChanges } = action.payload;
const {changes, regionId, regionChanges, drawLayerId } = action.payload;

if (drawLayerId && drawLayerId !== drawLayer.drawLayerId) return null;
var dd = Object.assign({}, drawLayer.drawData);

switch (action.type) {
case DrawLayerCntlr.MODIFY_CUSTOM_FIELD:
/*
if (changes && changes.regions) { // this should not happen
dd[DataTypes.HIGHLIGHT_DATA] = null;
dd[DataTypes.DATA] = null;
if (drawLayer.highlightedRegion) drawLayer.highlightedRegion = null;
} else */
if (changes && changes.highlightedRegion) {
dd[DataTypes.HIGHLIGHT_DATA] = null;
if (drawLayer.highlightedRegion) drawLayer.highlightedRegion.highlight = 0;
changes.highlightedRegion.highlight = 1;
} else if (changes) {
dd[DataTypes.HIGHLIGHT_DATA] = null;
if (drawLayer.highlightedRegion) {
drawLayer.highlightedRegion.highlight = 0; // un-highlight the last one
drawLayer.highlightedRegion = null;
}
}

return Object.assign({}, changes, {drawData: dd});
if (changes) {
dd[DataTypes.HIGHLIGHT_DATA] = null;
if (!changes.highlightedRegion) {
if (drawLayer.highlightedRegion) {
drawLayer.highlightedRegion.highlight = 0; // un-highlight the last selected region
drawLayer.highlightedRegion = null;
}
} else {
if (drawLayer.highlightedRegion) drawLayer.highlightedRegion.highlight = 0;
changes.highlightedRegion.highlight = 1;

}
}
return Object.assign({}, changes, {drawData: dd});
case DrawLayerCntrl.REGION_ADD_ENTRY:
if (regionId === drawLayer.drawLayerId && regionChanges) {
dd[DataTypes.DATA] = addRegionsToData(drawLayer, dd[DataTypes.DATA], regionChanges);
Expand Down
1 change: 1 addition & 0 deletions src/firefly/js/visualize/draw/PointDataObj.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ export function makeHighlightPointDataObj(drawObj, cc) {
0.0, ShapeDataObj.UnitType.ARCSEC, false);

makeShapeHighlightRenderOptions( rectObj );
rectObj.isAHighlight = { from: drawObj, plotImageId: cc.plotImageId};
return rectObj;
}

Expand Down
9 changes: 9 additions & 0 deletions src/firefly/js/visualize/draw/ShapeDataObj.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {TextLocation, Style, DEFAULT_FONT_SIZE} from './DrawingDef.js';
import Point, {makeScreenPt, makeViewPortPt, makeOffsetPt, makeWorldPt, makeImagePt} from '../Point.js';
import {toRegion} from './ShapeToRegion.js';
import {getDrawobjArea, isScreenPtInRegion, makeHighlightShapeDataObj} from './ShapeHighlight.js';
import {makeHighlightPointDataObj, POINT_DATA_OBJ} from './PointDataObj.js';
import CsysConverter from '../CsysConverter.js';
import {has, isNil, get, set} from 'lodash';

Expand Down Expand Up @@ -233,6 +234,14 @@ var draw= {
},

draw(drawObj,ctx,drawTextAry,plot,def,vpPtM,onlyAddToPath) {
if (has(drawObj, 'isAHighlight') && drawObj.isAHighlight.plotImageId !== plot.plotImageId) {
var fromObj = get(drawObj.isAHighlight, 'from');

if (fromObj) {
drawObj = (fromObj.type === POINT_DATA_OBJ) ? makeHighlightPointDataObj(fromObj, plot):
makeHighlightShapeDataObj(fromObj, plot, drawObj.isAHighlight.def);
}
}
var drawParams= makeDrawParams(drawObj,def);
drawShape(drawObj,ctx,drawTextAry,plot,drawParams,onlyAddToPath);
},
Expand Down
2 changes: 2 additions & 0 deletions src/firefly/js/visualize/draw/ShapeHighlight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,8 @@ export function makeHighlightShapeDataObj(drawObj, cc, def = {}) {
var rectObj = ShapeDataObj.makeRectangleByCenter(wcenter, w, h, ShapeDataObj.UnitType.PIXEL, 0.0, ShapeDataObj.UnitType.ARCSEC, false);

makeShapeHighlightRenderOptions( rectObj );

rectObj.isAHighlight = { from: drawObj, plotImageId: cc.plotImageId, def};
return rectObj;
}

23 changes: 12 additions & 11 deletions src/firefly/js/visualize/region/RegionDrawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,10 @@ function drawRegionAnnulus(regionObj) {
* @param options region properties
* @param propChkAry property cheeck list
* @param a rotation angle
* @param isOnWorld
* @returns {*}
*/
function drawOneBox(w, h, a, wp, options, propChkAry) {
function drawOneBox(w, h, a, wp, options, propChkAry, isOnWorld) {
var unit = regionUnitToDrawObj(w.unit);
var angleUnit = regionUnitToDrawObj(a.unit);
var width, height, angle;
Expand Down Expand Up @@ -368,7 +369,7 @@ function drawOneBox(w, h, a, wp, options, propChkAry) {
angleUnit = ShapeDataObj.UnitType.ARCSEC;
}

var dObj = ShapeDataObj.makeRectangleByCenter(wp, width, height, unit, angle, angleUnit, wp.type === Point.W_PT);
var dObj = ShapeDataObj.makeRectangleByCenter(wp, width, height, unit, angle, angleUnit, isOnWorld);

updateDrawobjProp(propChkAry, options, dObj);
return dObj;
Expand All @@ -387,7 +388,7 @@ function drawRegionBox(regionObj) {
regionObj.angle,
regionObj.wpAry[0],
regionObj.options,
allProps);
allProps, regionObj.isOnWorld);

dObj.textLoc = DEFAULT_TEXTLOC[RegionType.box.key];
return [dObj];
Expand All @@ -406,7 +407,7 @@ function drawRegionBoxAnnulus(regionObj) {
regionObj.angle,
regionObj.wpAry[0],
regionObj.options,
commonProps);
commonProps, regionObj.isOnWorld);
var boxannulusObj = ShapeDataObj.makeBoxAnnulus(regionObj.wpAry[0],
dimAry(regionObj.dimensionAry, firstObj.unitType),
firstObj.unitType,
Expand All @@ -419,7 +420,7 @@ function drawRegionBoxAnnulus(regionObj) {
boxannulusObj = Object.assign(boxannulusObj, pick(firstObj, commonProps));

var moreObj = regionObj.dimensionAry.reverse().slice(1).map((d) => {
var nextObj = drawOneBox(d.width, d.height, regionObj.angle, regionObj.wpAry[0], regionObj.options, []);
var nextObj = drawOneBox(d.width, d.height, regionObj.angle, regionObj.wpAry[0], regionObj.options, [], regionObj.isOnWorld);

return Object.assign(nextObj, pick(firstObj, commonProps));
});
Expand Down Expand Up @@ -488,9 +489,10 @@ function drawRegionPolygon(regionObj) {
* @param options region properties
* @param propChkAry property cheeck list
* @param a rotation angle
* @param isOnWorld
* @returns {*}
*/
function drawOneEllipse(r1, r2, a, wp, options, propChkAry) {
function drawOneEllipse(r1, r2, a, wp, options, propChkAry, isOnWorld) {
var unit = regionUnitToDrawObj(r1.unit);
var angleUnit = regionUnitToDrawObj(a.unit);
var radius1, radius2, angle;
Expand All @@ -508,7 +510,6 @@ function drawOneEllipse(r1, r2, a, wp, options, propChkAry) {
} else {
radius1 = r1.value;
radius2 = r2.value;
// angle = 0.0;
}

// DS9 angle is counterclockwise, canvas angle is clockwise
Expand All @@ -519,7 +520,7 @@ function drawOneEllipse(r1, r2, a, wp, options, propChkAry) {
angleUnit = ShapeDataObj.UnitType.ARCSEC;
}

var dObj = ShapeDataObj.makeEllipse(wp, radius1, radius2, unit, angle, angleUnit, wp.type === Point.W_PT);
var dObj = ShapeDataObj.makeEllipse(wp, radius1, radius2, unit, angle, angleUnit, isOnWorld);

updateDrawobjProp(propChkAry, options, dObj);
return dObj;
Expand All @@ -538,7 +539,7 @@ function drawRegionEllipse(regionObj) {
regionObj.angle,
regionObj.wpAry[0],
regionObj.options,
allProps);
allProps, regionObj.isOnWorld);

dObj.textLoc = DEFAULT_TEXTLOC[RegionType.ellipse.key];
return [dObj];
Expand All @@ -556,7 +557,7 @@ function drawRegionEllipseAnnulus(regionObj) {
regionObj.angle,
regionObj.wpAry[0],
regionObj.options,
commonProps);
commonProps, regionObj.isOnWorld);
var ellipseannObj = ShapeDataObj.makeEllipseAnnulus(regionObj.wpAry[0],
dimAry(regionObj.dimensionAry, firstObj.unitType),
firstObj.unitType,
Expand All @@ -569,7 +570,7 @@ function drawRegionEllipseAnnulus(regionObj) {
ellipseannObj = Object.assign(ellipseannObj, pick(firstObj, commonProps));

var moreObj = regionObj.dimensionAry.reverse().slice(1).map((d) => {
var nextObj = drawOneEllipse(d.width, d.height, regionObj.angle, regionObj.wpAry[0], regionObj.options, []);
var nextObj = drawOneEllipse(d.width, d.height, regionObj.angle, regionObj.wpAry[0], regionObj.options, [], regionObj.isOnWorld);

return Object.assign(nextObj, pick(firstObj, commonProps));
});
Expand Down
Loading