Skip to content

Commit 1fe1f3f

Browse files
authored
Merge pull request #130 from Caltech-IPAC/DM-5192-PyAPI
DM-5192 Implement Python API to support Firefly actions.
2 parents 2c6c0d9 + b4dcf18 commit 1fe1f3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1929
-1062
lines changed

src/fftools/python/display/FireflyClient.py

Lines changed: 0 additions & 543 deletions
This file was deleted.

src/firefly/java/edu/caltech/ipac/firefly/data/ServerParams.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -144,24 +144,8 @@ public class ServerParams {
144144
public static final String JSON_DEEP= "jsonDeep";
145145
public static final String ACTION= "action";
146146

147-
public static final String VIS_PUSH_CREATE_ID= "createID";
148-
public static final String VIS_PUSH_FITS= "pushFits";
149-
public static final String VIS_PUSH_REG= "pushRegion";
150-
public static final String VIS_PUSH_REMOVE_REG= "pushRemoveRegion";
151-
public static final String VIS_PUSH_REG_DATA= "pushRegionData";
152-
public static final String VIS_PUSH_REMOVE_REG_DATA= "pushRemoveRegionData";
153-
public static final String VIS_PUSH_TABLE= "pushTable";
154-
public static final String VIS_PUSH_XYPLOT= "pushXYPlot";
155-
public static final String VIS_PUSH_EXT= "pushExt";
156-
public static final String VIS_QUERY_ACTION= "queryAction";
157-
public static final String VIS_PUSH_WPR= "pushWPR";
158147
public static final String VIS_PUSH_ALIVE_CHECK= "pushAliveCheck";
159148
public static final String VIS_PUSH_ALIVE_COUNT= "pushAliveCount";
160-
public static final String VIS_PUSH_PAN= "pushPan";
161-
public static final String VIS_PUSH_ZOOM= "pushZoom";
162-
public static final String VIS_PUSH_RANGE_VALUES= "pushRangeValues";
163-
public static final String VIS_PUSH_ADD_MASK= "pushAddMask";
164-
public static final String VIS_PUSH_REMOVE_MASK= "pushRemoveMask";
165149
public static final String VIS_PUSH_ACTION= "pushAction";
166150

167151

src/firefly/java/edu/caltech/ipac/firefly/server/ServerCommandAccess.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,26 +133,9 @@ private static void initCommand() {
133133

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

136-
// _cmdMap.put(ServerParams.VIS_PUSH_CREATE_ID, new PushCommands.GetPushID());
137-
_cmdMap.put(ServerParams.VIS_PUSH_FITS, new PushCommands.PushFITS());
138-
_cmdMap.put(ServerParams.VIS_PUSH_REG, new PushCommands.PushRegionFile());
139-
_cmdMap.put(ServerParams.VIS_PUSH_REMOVE_REG, new PushCommands.PushRemoveRegionFile());
140-
_cmdMap.put(ServerParams.VIS_PUSH_REG_DATA, new PushCommands.PushRegionData());
141-
_cmdMap.put(ServerParams.VIS_PUSH_REMOVE_REG_DATA, new PushCommands.PushRemoveRegionData());
142-
_cmdMap.put(ServerParams.VIS_PUSH_TABLE, new PushCommands.PushTable());
143-
_cmdMap.put(ServerParams.VIS_PUSH_XYPLOT, new PushCommands.PushXYPlot());
144-
_cmdMap.put(ServerParams.VIS_PUSH_EXT, new PushCommands.PushExtension());
145136
_cmdMap.put(ServerParams.VIS_PUSH_ALIVE_CHECK, new PushCommands.PushAliveCheck());
146137
_cmdMap.put(ServerParams.VIS_PUSH_ALIVE_COUNT, new PushCommands.PushAliveCount());
147-
_cmdMap.put(ServerParams.VIS_PUSH_PAN, new PushCommands.PushPan());
148-
_cmdMap.put(ServerParams.VIS_PUSH_ZOOM, new PushCommands.PushZoom());
149-
_cmdMap.put(ServerParams.VIS_PUSH_RANGE_VALUES, new PushCommands.PushRangeValues());
150-
_cmdMap.put(ServerParams.VIS_PUSH_ADD_MASK, new PushCommands.PushAddMask());
151-
_cmdMap.put(ServerParams.VIS_PUSH_REMOVE_MASK, new PushCommands.PushRemoveMask());
152138
_cmdMap.put(ServerParams.VIS_PUSH_ACTION, new PushCommands.PushAction());
153-
// _cmdMap.put(ServerParams.VIS_QUERY_ACTION, new PushCommands.QueryAction());
154-
// _cmdMap.put(ServerParams.VIS_PUSH_WPR, new PushCommands.PushFITS());
155-
156139

157140
// maybe temporary
158141
_cmdMap.put(ServerParams.STATIC_JSON_DATA, new JsonDataCommands.StaticJsonData());

src/firefly/java/edu/caltech/ipac/firefly/server/vispush/PushJob.java

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -33,124 +33,6 @@ private static void fireEvent(String data, Name evName) {
3333

3434
}
3535

36-
public static boolean pushFits(WebPlotRequest wpr) {
37-
fireEvent(wpr.toString(), Name.PUSH_WEB_PLOT_REQUEST);
38-
return true;
39-
}
40-
41-
public static boolean pushExtension(String sreqId,
42-
String plotId,
43-
String extType,
44-
String title,
45-
String image,
46-
String toolTip) {
47-
ServerRequest r = new ServerRequest(sreqId);
48-
r.setParam(ServerParams.EXT_TYPE, extType);
49-
r.setParam(ServerParams.TITLE, title);
50-
r.setParam(ServerParams.PLOT_ID, plotId);
51-
if (image != null) r.setParam(ServerParams.IMAGE, image);
52-
if (toolTip != null) r.setParam(ServerParams.IMAGE, toolTip);
53-
fireEvent(r.toString(), Name.PUSH_FITS_COMMAND_EXT);
54-
return true;
55-
}
56-
57-
public static boolean pushPan(String plotId,
58-
String xStr,
59-
String yStr) {
60-
ServerRequest r = new ServerRequest(plotId);
61-
r.setParam(ServerParams.SCROLL_X, xStr);
62-
r.setParam(ServerParams.SCROLL_Y, yStr);
63-
fireEvent(r.toString(), Name.PUSH_PAN);
64-
return true;
65-
}
66-
67-
public static boolean pushZoom(String plotId, String zFactStr) {
68-
ServerRequest r = new ServerRequest(plotId);
69-
r.setParam(ServerParams.ZOOM_FACTOR, zFactStr);
70-
fireEvent(r.toString(), Name.PUSH_ZOOM);
71-
return true;
72-
}
73-
74-
public static boolean pushRangeValues(String plotId, RangeValues rv) {
75-
ServerRequest r = new ServerRequest(plotId);
76-
r.setParam(ServerParams.RANGE_VALUES, rv.toString());
77-
fireEvent(r.toString(), Name.PUSH_RANGE_VALUES);
78-
return true;
79-
}
80-
81-
82-
public static boolean pushTable(ServerRequest req) {
83-
fireEvent(req.toString(), Name.PUSH_TABLE_FILE);
84-
return true;
85-
}
86-
87-
public static boolean pushXYPlot(ServerRequest r) {
88-
fireEvent(r.toString(), Name.PUSH_XYPLOT_FILE);
89-
return true;
90-
}
91-
92-
93-
94-
//================================
95-
//========== Region Stuff
96-
//================================
97-
98-
public static boolean pushRegionFile(String fileName, String id, String plotIdAry) {
99-
ServerRequest r = new ServerRequest(id);
100-
r.setParam(ServerParams.FILE, fileName);
101-
if (plotIdAry!=null) r.setParam(ServerParams.PLOT_ID, plotIdAry);
102-
fireEvent(r.toString(), Name.PUSH_REGION_FILE);
103-
return true;
104-
}
105-
106-
public static boolean pushRemoveRegionFile(String id, String plotIdAry) {
107-
ServerRequest r = new ServerRequest(id);
108-
if (plotIdAry!=null) r.setParam(ServerParams.PLOT_ID, plotIdAry);
109-
fireEvent(r.toString(), Name.PUSH_REMOVE_REGION_FILE);
110-
return true;
111-
}
112-
113-
public static boolean pushRemoveRegionData(String id, String data) {
114-
ServerRequest r = new ServerRequest(id);
115-
r.setParam(ServerParams.DS9_REGION_DATA, data);
116-
fireEvent(r.toString(), Name.REMOVE_REGION_DATA);
117-
return true;
118-
}
119-
120-
121-
public static boolean pushRegionData(String title, String id, String data, String plotIdAry) {
122-
ServerRequest r = new ServerRequest(id);
123-
r.setParam(ServerParams.TITLE, title);
124-
r.setParam(ServerParams.DS9_REGION_DATA, data);
125-
if (plotIdAry!=null) r.setParam(ServerParams.PLOT_ID, plotIdAry);
126-
fireEvent(r.toString(), Name.PUSH_REGION_DATA);
127-
return true;
128-
}
129-
130-
public static boolean pushAddMask(String maskId,
131-
int bitNumber,
132-
int imageNumber,
133-
String color,
134-
String bitDesc,
135-
String fileKey,
136-
String plotIdStr) {
137-
ServerRequest r = new ServerRequest(maskId);
138-
r.setParam(ServerParams.BIT_NUMBER,bitNumber+"");
139-
r.setParam(ServerParams.IMAGE_NUMBER,imageNumber+"");
140-
r.setParam(ServerParams.COLOR,color);
141-
r.setParam(ServerParams.BIT_DESC,bitDesc);
142-
r.setParam(ServerParams.FILE,fileKey);
143-
r.setParam(ServerParams.PLOT_ID,plotIdStr);
144-
fireEvent(r.toString(), Name.PUSH_ADD_MASK);
145-
return true;
146-
}
147-
148-
149-
public static boolean pushRemoveMask(String maskId) {
150-
ServerRequest r = new ServerRequest(maskId);
151-
fireEvent(r.toString(), Name.PUSH_REMOVE_MASK);
152-
return true;
153-
}
15436

15537
/**
15638
* Get the active count. If 0 keep trying for try time milliseconds.

0 commit comments

Comments
 (0)