Changeset 075729 for molecuilder/src/World.cpp
- Timestamp:
- Apr 27, 2010, 2:25:42 PM (15 years ago)
- Children:
- 90c4460
- Parents:
- 1561e2 (diff), 2bc713 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
molecuilder/src/World.cpp
r1561e2 r075729 59 59 } 60 60 61 // system 62 63 double * World::getDomain() { 64 return cell_size; 65 } 66 67 void World::setDomain(double * matrix) 68 { 69 70 } 71 72 char * World::getDefaultName() { 73 return defaultName; 74 } 75 76 void World::setDefaultName(char * name) 77 { 78 delete[](defaultName); 79 const int length = strlen(name); 80 defaultName = new char[length+2]; 81 if (length < MAXSTRINGSIZE) 82 strncpy(defaultName, name, length); 83 else 84 strcpy(defaultName, "none"); 85 }; 86 87 61 88 /******************** Methods to change World state *********************/ 62 89 … … 86 113 } 87 114 115 double *World::cell_size = NULL; 116 char *World::defaultName = NULL; 88 117 89 118 atom *World::createAtom(){ … … 96 125 return res; 97 126 } 127 98 128 99 129 int World::registerAtom(atom *atom){ … … 243 273 molecules_deprecated(new MoleculeListClass(this)) 244 274 { 275 cell_size = new double[6]; 276 cell_size[0] = 20.; 277 cell_size[1] = 0.; 278 cell_size[2] = 20.; 279 cell_size[3] = 0.; 280 cell_size[4] = 0.; 281 cell_size[5] = 20.; 282 defaultName = new char[MAXSTRINGSIZE]; 283 strcpy(defaultName, "none"); 245 284 molecules_deprecated->signOn(this); 246 285 } … … 249 288 { 250 289 molecules_deprecated->signOff(this); 290 delete[] cell_size; 291 delete[] defaultName; 251 292 delete molecules_deprecated; 252 293 delete periode;
Note:
See TracChangeset
for help on using the changeset viewer.