ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/FAS/src/frame.h
(Generate patch)

Comparing trunk/FAS/src/frame.h (file contents):
Revision 82 by tim, Thu Aug 15 22:14:31 2002 UTC vs.
Revision 83 by tim, Fri Aug 16 15:30:40 2002 UTC

# Line 20 | Line 20
20   #include <iostream>
21   #include <vector>
22   #include <map>
23 < #include "extradata.h"
23 > #include <functional>
24 > #include <algorithm>
25 > //#include "extradata.h"
26  
27 +
28 +
29   using namespace std;
30  
31 < class TFrame
31 > class TFrame //: public TExtraDataList
32   {
33          protected:
34                  int _numAtom;
# Line 41 | Line 45 | class TFrame
45                  vector<float> _coor;
46                  vector<float> _velo;
47  
48 <    vector<TExtraData *>        _extraDataList;
48 > //    TExtraDataList    _extraDataList;
49  
50      void Clear();
51  
# Line 78 | Line 82 | class TFrame
82      void SetBoxLenX(float boxLenX) { _boxLen[0] = boxLenX;}
83      void SetBoxLenY(float boxLenY) { _boxLen[1] = boxLenY;}
84      void SetBoxLenZ(float boxLenZ) { _boxLen[2] = boxLenZ;}
85 <
85 > /*
86      void AddExtraData(TExtraData *extraData);
87      void RemoveExtraData(TExtraData *extraData);
88      TExtraData *GetExtraData(int extraDataType);
# Line 86 | Line 90 | class TFrame
90      vector<TExtraData *> &GetExraDataList() { return _extraDataList;}
91      void SetExraDataList(vector<TExtraData *> &extraDataList)
92                            { _extraDataList = extraDataList;}
93 <
93 > */
94                  void Reserve(int numAtom);
95  
96      void Init();
97  
98   };
99 +
100 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines