- Timestamp:
- Feb 9, 2010, 8:24:35 PM (16 years ago)
- Location:
- branches/eam_branches/20091201/ppViz
- Files:
-
- 3 copied
-
. (copied) (copied from trunk/ppViz ) (1 prop)
-
src/ppVizPattern (copied) (copied from trunk/ppViz/src/ppVizPSF )
-
src/ppVizPattern/ppVizPatternData.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFData.c ) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/20091201/ppViz
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/eam_branches/20091113/ppViz 26119-26255 /branches/pap/ppViz 26320
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternData.c
r26827 r26837 7 7 #include <psmodules.h> 8 8 9 #include "ppVizP SF.h"9 #include "ppVizPattern.h" 10 10 11 11 // Destructor 12 static void vizP SFDataFree(ppVizPSFData *data // Data to free12 static void vizPatternDataFree(ppVizPatternData *data // Data to free 13 13 ) 14 14 { 15 psFree(data->psfName); 16 psFree(data->sourcesName); 15 psFree(data->patternName); 17 16 psFree(data->outRoot); 18 17 psFree(data->config); … … 21 20 22 21 23 ppVizP SFData *ppVizPSFDataAlloc(void)22 ppVizPatternData *ppVizPatternDataAlloc(void) 24 23 { 25 ppVizP SFData *data = psAlloc(sizeof(ppVizPSFData)); // Processing data, to return26 psMemSetDeallocator(data, (psFreeFunc)vizP SFDataFree);24 ppVizPatternData *data = psAlloc(sizeof(ppVizPatternData)); // Processing data, to return 25 psMemSetDeallocator(data, (psFreeFunc)vizPatternDataFree); 27 26 28 data->psfName = NULL; 29 data->sourcesName = NULL; 30 data->fakeNum = 0; 31 data->fakeMag = NAN; 27 data->patternName = NULL; 32 28 data->outRoot = NULL; 33 29 data->config = NULL; 34 data->minFlux = NAN;35 data->size = 0;36 data->x = NAN;37 data->y = NAN;38 30 39 31 return data; … … 41 33 42 34 43 ppVizP SFData *ppVizPSFDataInit(int *argc, char **argv)35 ppVizPatternData *ppVizPatternDataInit(int *argc, char **argv) 44 36 { 45 37 PS_ASSERT_PTR_NON_NULL(argc, NULL); 46 38 PS_ASSERT_PTR_NON_NULL(argv, NULL); 47 39 48 ppVizP SFData *data = ppVizPSFDataAlloc(); // Processing data, to return49 data->config = pmConfigRead(argc, argv, PPVIZP SF_RECIPE);40 ppVizPatternData *data = ppVizPatternDataAlloc(); // Processing data, to return 41 data->config = pmConfigRead(argc, argv, PPVIZPATTERN_RECIPE); 50 42 if (!data->config) { 51 43 psError(PS_ERR_UNKNOWN, false, "Unable to read configuration.");
Note:
See TracChangeset
for help on using the changeset viewer.
