Skip to content

DM-5192 Implement Python API to support Firefly actions. #130

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

DM-5192 Implement Python API to support Firefly actions. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
97eddc8
Implement Python API to support Firefly actions., move python and tes…
Jul 22, 2016
37fcc23
add function to start the footprint and marker's position at that of …
Aug 2, 2016
45566fb
remove region description parsing to be after the drawing layer is cr…
Aug 4, 2016
055c944
update Python to comply with PEP8 styling and naming.
Aug 5, 2016
f4d9c22
update python API code to comply with PEP8 styling and naming convent…
Aug 8, 2016
bec77ca
clean up some push action related definition and codes for python API.
Aug 8, 2016
e31f63b
revert back to previous commit
Aug 8, 2016
b4dcf18
update jupyter file
Aug 8, 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
543 changes: 0 additions & 543 deletions src/fftools/python/display/FireflyClient.py
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/firefly/java/edu/caltech/ipac/firefly/data/ServerParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,24 +144,8 @@ public class ServerParams {
public static final String JSON_DEEP= "jsonDeep";
public static final String ACTION= "action";

public static final String VIS_PUSH_CREATE_ID= "createID";
public static final String VIS_PUSH_FITS= "pushFits";
public static final String VIS_PUSH_REG= "pushRegion";
public static final String VIS_PUSH_REMOVE_REG= "pushRemoveRegion";
public static final String VIS_PUSH_REG_DATA= "pushRegionData";
public static final String VIS_PUSH_REMOVE_REG_DATA= "pushRemoveRegionData";
public static final String VIS_PUSH_TABLE= "pushTable";
public static final String VIS_PUSH_XYPLOT= "pushXYPlot";
public static final String VIS_PUSH_EXT= "pushExt";
public static final String VIS_QUERY_ACTION= "queryAction";
public static final String VIS_PUSH_WPR= "pushWPR";
public static final String VIS_PUSH_ALIVE_CHECK= "pushAliveCheck";
public static final String VIS_PUSH_ALIVE_COUNT= "pushAliveCount";
public static final String VIS_PUSH_PAN= "pushPan";
public static final String VIS_PUSH_ZOOM= "pushZoom";
public static final String VIS_PUSH_RANGE_VALUES= "pushRangeValues";
public static final String VIS_PUSH_ADD_MASK= "pushAddMask";
public static final String VIS_PUSH_REMOVE_MASK= "pushRemoveMask";
public static final String VIS_PUSH_ACTION= "pushAction";


Expand Down
17 changes: 0 additions & 17 deletions src/firefly/java/edu/caltech/ipac/firefly/server/ServerCommandAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,26 +133,9 @@ private static void initCommand() {

_cmdMap.put(ServerParams.RESOLVE_NAME, new ResolveServerCommands.ResolveName());

// _cmdMap.put(ServerParams.VIS_PUSH_CREATE_ID, new PushCommands.GetPushID());
_cmdMap.put(ServerParams.VIS_PUSH_FITS, new PushCommands.PushFITS());
_cmdMap.put(ServerParams.VIS_PUSH_REG, new PushCommands.PushRegionFile());
_cmdMap.put(ServerParams.VIS_PUSH_REMOVE_REG, new PushCommands.PushRemoveRegionFile());
_cmdMap.put(ServerParams.VIS_PUSH_REG_DATA, new PushCommands.PushRegionData());
_cmdMap.put(ServerParams.VIS_PUSH_REMOVE_REG_DATA, new PushCommands.PushRemoveRegionData());
_cmdMap.put(ServerParams.VIS_PUSH_TABLE, new PushCommands.PushTable());
_cmdMap.put(ServerParams.VIS_PUSH_XYPLOT, new PushCommands.PushXYPlot());
_cmdMap.put(ServerParams.VIS_PUSH_EXT, new PushCommands.PushExtension());
_cmdMap.put(ServerParams.VIS_PUSH_ALIVE_CHECK, new PushCommands.PushAliveCheck());
_cmdMap.put(ServerParams.VIS_PUSH_ALIVE_COUNT, new PushCommands.PushAliveCount());
_cmdMap.put(ServerParams.VIS_PUSH_PAN, new PushCommands.PushPan());
_cmdMap.put(ServerParams.VIS_PUSH_ZOOM, new PushCommands.PushZoom());
_cmdMap.put(ServerParams.VIS_PUSH_RANGE_VALUES, new PushCommands.PushRangeValues());
_cmdMap.put(ServerParams.VIS_PUSH_ADD_MASK, new PushCommands.PushAddMask());
_cmdMap.put(ServerParams.VIS_PUSH_REMOVE_MASK, new PushCommands.PushRemoveMask());
_cmdMap.put(ServerParams.VIS_PUSH_ACTION, new PushCommands.PushAction());
// _cmdMap.put(ServerParams.VIS_QUERY_ACTION, new PushCommands.QueryAction());
// _cmdMap.put(ServerParams.VIS_PUSH_WPR, new PushCommands.PushFITS());


// maybe temporary
_cmdMap.put(ServerParams.STATIC_JSON_DATA, new JsonDataCommands.StaticJsonData());
Expand Down
118 changes: 0 additions & 118 deletions src/firefly/java/edu/caltech/ipac/firefly/server/vispush/PushJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,124 +33,6 @@ private static void fireEvent(String data, Name evName) {

}

public static boolean pushFits(WebPlotRequest wpr) {
fireEvent(wpr.toString(), Name.PUSH_WEB_PLOT_REQUEST);
return true;
}

public static boolean pushExtension(String sreqId,
String plotId,
String extType,
String title,
String image,
String toolTip) {
ServerRequest r = new ServerRequest(sreqId);
r.setParam(ServerParams.EXT_TYPE, extType);
r.setParam(ServerParams.TITLE, title);
r.setParam(ServerParams.PLOT_ID, plotId);
if (image != null) r.setParam(ServerParams.IMAGE, image);
if (toolTip != null) r.setParam(ServerParams.IMAGE, toolTip);
fireEvent(r.toString(), Name.PUSH_FITS_COMMAND_EXT);
return true;
}

public static boolean pushPan(String plotId,
String xStr,
String yStr) {
ServerRequest r = new ServerRequest(plotId);
r.setParam(ServerParams.SCROLL_X, xStr);
r.setParam(ServerParams.SCROLL_Y, yStr);
fireEvent(r.toString(), Name.PUSH_PAN);
return true;
}

public static boolean pushZoom(String plotId, String zFactStr) {
ServerRequest r = new ServerRequest(plotId);
r.setParam(ServerParams.ZOOM_FACTOR, zFactStr);
fireEvent(r.toString(), Name.PUSH_ZOOM);
return true;
}

public static boolean pushRangeValues(String plotId, RangeValues rv) {
ServerRequest r = new ServerRequest(plotId);
r.setParam(ServerParams.RANGE_VALUES, rv.toString());
fireEvent(r.toString(), Name.PUSH_RANGE_VALUES);
return true;
}


public static boolean pushTable(ServerRequest req) {
fireEvent(req.toString(), Name.PUSH_TABLE_FILE);
return true;
}

public static boolean pushXYPlot(ServerRequest r) {
fireEvent(r.toString(), Name.PUSH_XYPLOT_FILE);
return true;
}



//================================
//========== Region Stuff
//================================

public static boolean pushRegionFile(String fileName, String id, String plotIdAry) {
ServerRequest r = new ServerRequest(id);
r.setParam(ServerParams.FILE, fileName);
if (plotIdAry!=null) r.setParam(ServerParams.PLOT_ID, plotIdAry);
fireEvent(r.toString(), Name.PUSH_REGION_FILE);
return true;
}

public static boolean pushRemoveRegionFile(String id, String plotIdAry) {
ServerRequest r = new ServerRequest(id);
if (plotIdAry!=null) r.setParam(ServerParams.PLOT_ID, plotIdAry);
fireEvent(r.toString(), Name.PUSH_REMOVE_REGION_FILE);
return true;
}

public static boolean pushRemoveRegionData(String id, String data) {
ServerRequest r = new ServerRequest(id);
r.setParam(ServerParams.DS9_REGION_DATA, data);
fireEvent(r.toString(), Name.REMOVE_REGION_DATA);
return true;
}


public static boolean pushRegionData(String title, String id, String data, String plotIdAry) {
ServerRequest r = new ServerRequest(id);
r.setParam(ServerParams.TITLE, title);
r.setParam(ServerParams.DS9_REGION_DATA, data);
if (plotIdAry!=null) r.setParam(ServerParams.PLOT_ID, plotIdAry);
fireEvent(r.toString(), Name.PUSH_REGION_DATA);
return true;
}

public static boolean pushAddMask(String maskId,
int bitNumber,
int imageNumber,
String color,
String bitDesc,
String fileKey,
String plotIdStr) {
ServerRequest r = new ServerRequest(maskId);
r.setParam(ServerParams.BIT_NUMBER,bitNumber+"");
r.setParam(ServerParams.IMAGE_NUMBER,imageNumber+"");
r.setParam(ServerParams.COLOR,color);
r.setParam(ServerParams.BIT_DESC,bitDesc);
r.setParam(ServerParams.FILE,fileKey);
r.setParam(ServerParams.PLOT_ID,plotIdStr);
fireEvent(r.toString(), Name.PUSH_ADD_MASK);
return true;
}


public static boolean pushRemoveMask(String maskId) {
ServerRequest r = new ServerRequest(maskId);
fireEvent(r.toString(), Name.PUSH_REMOVE_MASK);
return true;
}

/**
* Get the active count. If 0 keep trying for try time milliseconds.
Expand Down
Loading