- Timestamp:
- Aug 30, 2006, 7:01:05 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/scripts/units.tcl
r515 r520 496 496 Rappture::Units::define deg -type angle -metric no 497 497 Rappture::Units::define rad -type angle -metric no 498 Rappture::Units::define deg->rad {deg*(3.1415926535897931/180.00)} {rad*(180.00/3.1415926535897931)} -
trunk/src/Makefile.in
r511 r520 94 94 cp $<.dylib $(RP_INSTALL_BASE)/lib; \ 95 95 cp $<.a $(RP_INSTALL_BASE)/lib; \ 96 cp $(CORE_SRC)/*.h $(RP_INSTALL_BASE)/include; \97 cp $(CEE_SRC)/*.h $(RP_INSTALL_BASE)/include; \98 96 else \ 99 97 cp -d $<.so* $(RP_INSTALL_BASE)/lib; \ 100 98 cp -d $<.a $(RP_INSTALL_BASE)/lib; \ 101 cp $(CORE_SRC)/*.h $(RP_INSTALL_BASE)/include; \ 102 cp $(CEE_SRC)/*.h $(RP_INSTALL_BASE)/include; \ 103 fi 99 fi 100 cp $(CORE_SRC)/*.h $(RP_INSTALL_BASE)/include; \ 101 cp $(CEE_SRC)/*.h $(RP_INSTALL_BASE)/include; \ 102 cp $(FORT_SRC)/*.h $(RP_INSTALL_BASE)/include; \ 104 103 105 104 #### libRpObjects ######################################################## -
trunk/src/core/RpUnits.cc
r515 r520 22 22 static RpUnitsPreset loader; 23 23 24 // convert function flags 25 const int RpUnits::UNITS_OFF = 0; 26 const int RpUnits::UNITS_ON = 1; 27 24 28 /**********************************************************************/ 25 29 // METHOD: define() -
trunk/src/core/RpUnits.h
r511 r520 39 39 #define RP_TYPE_MISC "misc" 40 40 41 42 41 // should the define function: 43 42 // 1. compare portions of inStr to unit names that have previously … … 289 288 public: 290 289 290 // constant static class variables 291 // flags to tell how convert should return the value 292 static const int UNITS_OFF; 293 static const int UNITS_ON; 294 291 295 // users member fxns 292 296 std::string getUnits() const; -
trunk/src/core/rappture.h
r511 r520 9 9 // include xml parser headers 10 10 #include "RpLibrary.h" 11 #include " ../cee/RpLibraryCInterface.h"12 #include " ../fortran/RpLibraryFInterface.h"11 #include "RpLibraryCInterface.h" 12 #include "RpLibraryFInterface.h" 13 13 14 14 // include units headers 15 15 #include "RpUnits.h" 16 #include " ../cee/RpUnitsCInterface.h"17 #include " ../fortran/RpUnitsFInterface.h"16 #include "RpUnitsCInterface.h" 17 #include "RpUnitsFInterface.h" 18 18 19 19 // include base objects 20 /* 20 21 #include "RpAbout.h" 21 22 #include "RpBoolean.h" … … 25 26 #include "RpString.h" 26 27 #include "RpValue.h" 28 */ -
trunk/src/matlab/Makefile.in
r508 r520 44 44 MATLAB_COMP_ARGS = RpMatlabInterface.cc $(MEX_INCLS) $(MEX_OPTS) 45 45 46 RpMatlab: 46 RpMatlab: rpLib.mexglx \ 47 rpLibXml.mexglx \ 48 rpLibElement.mexglx \ 49 rpLibElementAsObject.mexglx \ 50 rpLibElementAsType.mexglx \ 51 rpLibElementAsComp.mexglx \ 52 rpLibElementAsId.mexglx \ 53 rpLibChildren.mexglx \ 54 rpLibChildrenByType.mexglx \ 55 rpLibGet.mexglx \ 56 rpLibGetString.mexglx \ 57 rpLibGetDouble.mexglx \ 58 rpLibPut.mexglx \ 59 rpLibPutString.mexglx \ 60 rpLibPutDouble.mexglx \ 61 rpLibNodeComp.mexglx \ 62 rpLibNodeType.mexglx \ 63 rpLibNodeId.mexglx \ 64 rpLibResult.mexglx \ 65 rpUnitsDefineUnit.mexglx \ 66 rpUnitsGetUnits.mexglx \ 67 rpUnitsGetUnitsName.mexglx \ 68 rpUnitsGetExponent.mexglx \ 69 rpUnitsGetBasis.mexglx \ 70 rpUnitsFind.mexglx \ 71 rpUnitsMakeMetric.mexglx \ 72 rpUnitsConvert.mexglx \ 73 rpUnitsConvertStr.mexglx \ 74 rpUnitsConvertObjStr.mexglx \ 75 rpUnitsConvertDbl.mexglx \ 76 rpUnitsConvertObjDbl.mexglx \ 77 rpAddPresets.mexglx 78 79 80 81 rpLib.mexglx: 47 82 $(MEX) rpLib.cc $(MATLAB_COMP_ARGS) 83 rpLibXml.mexglx: 48 84 $(MEX) rpLibXml.cc $(MATLAB_COMP_ARGS) 85 rpLibElement.mexglx: 49 86 $(MEX) rpLibElement.cc $(MATLAB_COMP_ARGS) 87 rpLibElementAsObject.mexglx: 50 88 $(MEX) rpLibElementAsObject.cc $(MATLAB_COMP_ARGS) 89 rpLibElementAsType.mexglx: 51 90 $(MEX) rpLibElementAsType.cc $(MATLAB_COMP_ARGS) 91 rpLibElementAsComp.mexglx: 52 92 $(MEX) rpLibElementAsComp.cc $(MATLAB_COMP_ARGS) 93 rpLibElementAsId.mexglx: 53 94 $(MEX) rpLibElementAsId.cc $(MATLAB_COMP_ARGS) 95 rpLibChildren.mexglx: 54 96 $(MEX) rpLibChildren.cc $(MATLAB_COMP_ARGS) 97 rpLibChildrenByType.mexglx: 55 98 $(MEX) rpLibChildrenByType.cc $(MATLAB_COMP_ARGS) 99 100 #rpLibChildrenAsObject.mexglx: 56 101 #$(MEX) rpChildrenAsObject.cc $(MATLAB_COMP_ARGS) 102 #rpLibChildrenAsType.mexglx: 57 103 #$(MEX) rpChildrenAsType.cc $(MATLAB_COMP_ARGS) 104 #rpLibChildrenAsComp.mexglx: 58 105 #$(MEX) rpChildrenAsComp.cc $(MATLAB_COMP_ARGS) 106 #rpLibChildrenAsId.mexglx: 59 107 #$(MEX) rpChildrenAsId.cc $(MATLAB_COMP_ARGS) 108 109 rpLibGet.mexglx: 60 110 $(MEX) rpLibGet.cc $(MATLAB_COMP_ARGS) 111 rpLibGetString.mexglx: 61 112 $(MEX) rpLibGetString.cc $(MATLAB_COMP_ARGS) 113 rpLibGetDouble.mexglx: 62 114 $(MEX) rpLibGetDouble.cc $(MATLAB_COMP_ARGS) 115 rpLibPut.mexglx: 63 116 $(MEX) rpLibPut.cc $(MATLAB_COMP_ARGS) 117 rpLibPutString.mexglx: 64 118 $(MEX) rpLibPutString.cc $(MATLAB_COMP_ARGS) 119 rpLibPutDouble.mexglx: 65 120 $(MEX) rpLibPutDouble.cc $(MATLAB_COMP_ARGS) 121 rpLibNodeComp.mexglx: 66 122 $(MEX) rpLibNodeComp.cc $(MATLAB_COMP_ARGS) 123 rpLibNodeType.mexglx: 67 124 $(MEX) rpLibNodeType.cc $(MATLAB_COMP_ARGS) 125 rpLibNodeId.mexglx: 68 126 $(MEX) rpLibNodeId.cc $(MATLAB_COMP_ARGS) 127 rpLibResult.mexglx: 69 128 $(MEX) rpLibResult.cc $(MATLAB_COMP_ARGS) 129 rpUnitsDefineUnit.mexglx: 70 130 $(MEX) rpUnitsDefineUnit.cc $(MATLAB_COMP_ARGS) 131 #rpDefineConv.mexglx: 71 132 #$(MEX) rpDefineConv.cc $(MATLAB_COMP_ARGS) 133 rpUnitsGetUnits.mexglx: 72 134 $(MEX) rpUnitsGetUnits.cc $(MATLAB_COMP_ARGS) 135 rpUnitsGetUnitsName.mexglx: 73 136 $(MEX) rpUnitsGetUnitsName.cc $(MATLAB_COMP_ARGS) 137 rpUnitsGetExponent.mexglx: 74 138 $(MEX) rpUnitsGetExponent.cc $(MATLAB_COMP_ARGS) 139 rpUnitsGetBasis.mexglx: 75 140 $(MEX) rpUnitsGetBasis.cc $(MATLAB_COMP_ARGS) 141 rpUnitsFind.mexglx: 76 142 $(MEX) rpUnitsFind.cc $(MATLAB_COMP_ARGS) 143 rpUnitsMakeMetric.mexglx: 77 144 $(MEX) rpUnitsMakeMetric.cc $(MATLAB_COMP_ARGS) 145 rpUnitsConvert.mexglx: 78 146 $(MEX) rpUnitsConvert.cc $(MATLAB_COMP_ARGS) 147 rpUnitsConvertStr.mexglx: 79 148 $(MEX) rpUnitsConvertStr.cc $(MATLAB_COMP_ARGS) 149 rpUnitsConvertObjStr.mexglx: 80 150 $(MEX) rpUnitsConvertObjStr.cc $(MATLAB_COMP_ARGS) 151 rpUnitsConvertDbl.mexglx: 81 152 $(MEX) rpUnitsConvertDbl.cc $(MATLAB_COMP_ARGS) 153 rpUnitsConvertObjDbl.mexglx: 82 154 $(MEX) rpUnitsConvertObjDbl.cc $(MATLAB_COMP_ARGS) 155 rpAddPresets.mexglx: 83 156 $(MEX) rpAddPresets.cc $(MATLAB_COMP_ARGS) 84 157 -
trunk/src/octave/Makefile.in
r508 r520 38 38 OCT_INCLS = $(INCL_OCTAVE) $(INCL_CORE) $(INCL_RP_DEPS) 39 39 OCTAVE_COMP_ARGS = $(OCT_INCLS) $(LIB_RAPPTURE) $(LIB_SCEW_FLAG) 40 RpOctave: 40 RpOctave: rpAddPresets.oct \ 41 rpLib.oct \ 42 rpLibChildrenByType.oct \ 43 rpLibChildren.oct \ 44 rpLibElementAsComp.oct \ 45 rpLibElementAsId.oct \ 46 rpLibElementAsObject.oct \ 47 rpLibElementAsType.oct \ 48 rpLibElement.oct \ 49 rpLibGet.oct \ 50 rpLibGetString.oct \ 51 rpLibGetDouble.oct \ 52 rpLibNodeComp.oct \ 53 rpLibNodeId.oct \ 54 rpLibNodeType.oct \ 55 rpLibPut.oct \ 56 rpLibPutDouble.oct \ 57 rpLibPutSingle.oct \ 58 rpLibResult.oct \ 59 rpLibXml.oct \ 60 rpUnitsConvert.oct \ 61 rpUnitsConvertDbl.oct \ 62 rpUnitsConvertStr.oct \ 63 rpUnitsConvertObjDbl.oct \ 64 rpUnitsConvertObjStr.oct \ 65 rpUnitsDefineUnit.oct \ 66 rpUnitsFind.oct \ 67 rpUnitsGetBasis.oct \ 68 rpUnitsGetExponent.oct \ 69 rpUnitsGetUnits.oct \ 70 rpUnitsGetUnitsName.oct \ 71 rpUnitsGetMakeMetric.oct 72 73 rpAddPresets.oct: 41 74 $(OCT) rpAddPresets.cc $(OCTAVE_COMP_ARGS) 75 rpLib.oct: 42 76 $(OCT) rpLib.cc $(OCTAVE_COMP_ARGS) 77 rpLibChildrenByType.oct: 43 78 $(OCT) rpLibChildrenByType.cc $(OCTAVE_COMP_ARGS) 79 rpLibChildren.oct: 44 80 $(OCT) rpLibChildren.cc $(OCTAVE_COMP_ARGS) 81 rpLibElementAsComp.oct: 45 82 $(OCT) rpLibElementAsComp.cc $(OCTAVE_COMP_ARGS) 83 rpLibElementAsId.oct: 46 84 $(OCT) rpLibElementAsId.cc $(OCTAVE_COMP_ARGS) 85 rpLibElementAsObject.oct: 47 86 $(OCT) rpLibElementAsObject.cc $(OCTAVE_COMP_ARGS) 87 rpLibElementAsType.oct: 48 88 $(OCT) rpLibElementAsType.cc $(OCTAVE_COMP_ARGS) 89 rpLibElement.oct: 49 90 $(OCT) rpLibElement.cc $(OCTAVE_COMP_ARGS) 91 rpLibGet.oct: 50 92 $(OCT) rpLibGet.cc $(OCTAVE_COMP_ARGS) 93 rpLibGetString.oct: 51 94 $(OCT) rpLibGetString.cc $(OCTAVE_COMP_ARGS) 95 rpLibGetDouble.oct: 52 96 $(OCT) rpLibGetDouble.cc $(OCTAVE_COMP_ARGS) 97 rpLibNodeComp.oct: 53 98 $(OCT) rpLibNodeComp.cc $(OCTAVE_COMP_ARGS) 99 rpLibNodeId.oct: 54 100 $(OCT) rpLibNodeId.cc $(OCTAVE_COMP_ARGS) 101 rpLibNodeType.oct: 55 102 $(OCT) rpLibNodeType.cc $(OCTAVE_COMP_ARGS) 103 rpLibPut.oct: 56 104 $(OCT) rpLibPut.cc $(OCTAVE_COMP_ARGS) 105 rpLibPutDouble.oct: 57 106 $(OCT) rpLibPutDouble.cc $(OCTAVE_COMP_ARGS) 107 rpLibPutSingle.oct: 58 108 $(OCT) rpLibPutString.cc $(OCTAVE_COMP_ARGS) 109 rpLibResult.oct: 59 110 $(OCT) rpLibResult.cc $(OCTAVE_COMP_ARGS) 111 rpLibXml.oct: 60 112 $(OCT) rpLibXml.cc $(OCTAVE_COMP_ARGS) 113 rpUnitsConvert.oct: 61 114 $(OCT) rpUnitsConvert.cc $(OCTAVE_COMP_ARGS) 115 rpUnitsConvertDbl.oct: 62 116 $(OCT) rpUnitsConvertDbl.cc $(OCTAVE_COMP_ARGS) 117 rpUnitsConvertStr.oct: 63 118 $(OCT) rpUnitsConvertStr.cc $(OCTAVE_COMP_ARGS) 119 rpUnitsConvertObjDbl.oct: 64 120 $(OCT) rpUnitsConvertObjDbl.cc $(OCTAVE_COMP_ARGS) 121 rpUnitsConvertObjStr.oct: 65 122 $(OCT) rpUnitsConvertObjStr.cc $(OCTAVE_COMP_ARGS) 123 rpUnitsDefineUnit.oct: 66 124 $(OCT) rpUnitsDefineUnit.cc $(OCTAVE_COMP_ARGS) 125 rpUnitsFind.oct: 67 126 $(OCT) rpUnitsFind.cc $(OCTAVE_COMP_ARGS) 127 rpUnitsGetBasis.oct: 68 128 $(OCT) rpUnitsGetBasis.cc $(OCTAVE_COMP_ARGS) 129 rpUnitsGetExponent.oct: 69 130 $(OCT) rpUnitsGetExponent.cc $(OCTAVE_COMP_ARGS) 131 rpUnitsGetUnits.oct: 70 132 $(OCT) rpUnitsGetUnits.cc $(OCTAVE_COMP_ARGS) 133 rpUnitsGetUnitsName.oct: 71 134 $(OCT) rpUnitsGetUnitsName.cc $(OCTAVE_COMP_ARGS) 135 rpUnitsGetMakeMetric.oct: 72 136 $(OCT) rpUnitsMakeMetric.cc $(OCTAVE_COMP_ARGS) 73 137
Note: See TracChangeset
for help on using the changeset viewer.