Skip to content

Dm 4484 marker tool - create drawing layer for marker tool #104

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 10 commits into from
Jun 17, 2016
Merged

Dm 4484 marker tool - create drawing layer for marker tool #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
60613d1
DM-4484-MarkerTool implement drawlayer for marker
Jun 9, 2016
f2e8a90
fixed bug in saving active DrawLayer
robyww Jun 10, 2016
454ca43
add drawlayerId to payload
Jun 10, 2016
64897a9
Merge branch 'DM-4484-MarkerTool' of https://github.com/Caltech-IPAC/…
Jun 10, 2016
5d2bf58
add function document
Jun 11, 2016
66ac489
add MarkerToolUI and Marker drawObj
Jun 15, 2016
3c90775
clean up for marker tool
Jun 16, 2016
9a7d066
change region text description in world coordinate
Jun 16, 2016
0a90cb4
update the marker title in layer control popup. update the cursor whe…
Jun 16, 2016
89181d7
improve the accuracy of resizing and relocating the marker while vari…
Jun 17, 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
15 changes: 11 additions & 4 deletions src/firefly/js/core/ReduxFlux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ import DrawLayerCntlr, {makeDetachLayerActionCreator,
distanceToolEndActionCreator,
regionCreateLayerActionCreator,
regionDeleteLayerActionCreator,
regionUpdateEntryActionCreator} from '../visualize/DrawLayerCntlr.js';
regionUpdateEntryActionCreator,
markerToolStartActionCreator,
markerToolMoveActionCreator,
markerToolEndActionCreator,
markerToolCreateLayerActionCreator} from '../visualize/DrawLayerCntlr.js';
import MultiViewCntlr, {IMAGE_MULTI_VIEW_KEY} from '../visualize/MultiViewCntlr.js';
import ComponentCntlr, {DIALOG_OR_COMPONENT_KEY} from '../core/ComponentCntlr.js';
import {masterSaga} from './MasterSaga.js';
Expand All @@ -51,7 +55,7 @@ import Catalog from '../drawingLayers/Catalog.js';
import WebGrid from '../drawingLayers/WebGrid.js';

import RegionPlot from '../drawingLayers/RegionPlot.js';

import MarkerTool from '../drawingLayers/MarkerTool.js';
import {showExampleDialog} from '../ui/ExampleDialog.jsx';

//==============
Expand All @@ -75,7 +79,7 @@ const actionCreators = new Map();

const drawLayerFactory= DrawLayerFactory.makeFactory(ActiveTarget,SelectArea,DistanceTool,
PointSelection, StatsPoint, NorthUpCompass,
Catalog, WebGrid, RegionPlot);
Catalog, WebGrid, RegionPlot, MarkerTool);



Expand Down Expand Up @@ -133,7 +137,10 @@ actionCreators.set(XYPlotCntlr.LOAD_PLOT_DATA, XYPlotCntlr.loadPlotData);

actionCreators.set(DrawLayerCntlr.SELECT_AREA_END, selectAreaEndActionCreator);
actionCreators.set(DrawLayerCntlr.DT_END, distanceToolEndActionCreator);

actionCreators.set(DrawLayerCntlr.MARKER_START, markerToolStartActionCreator);
actionCreators.set(DrawLayerCntlr.MARKER_MOVE, markerToolMoveActionCreator);
actionCreators.set(DrawLayerCntlr.MARKER_END, markerToolEndActionCreator);
actionCreators.set(DrawLayerCntlr.MARKER_CREATE, markerToolCreateLayerActionCreator);

actionCreators.set(DrawLayerCntlr.REGION_CREATE_LAYER, regionCreateLayerActionCreator);
actionCreators.set(DrawLayerCntlr.REGION_DELETE_LAYER, regionDeleteLayerActionCreator);
Expand Down
Loading