Changeset e7e088 for molecuilder

Timestamp:

Feb 25, 2010, 10:18:50 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

bb89b9

Parents:

5bf941

Message:

Added Descriptor that allows querying of atoms by their type

Location:

molecuilder/src

Files:

• Descriptors/AtomDescriptor_impl.hpp (modified) (2 diffs)
• Descriptors/AtomIdDescriptor.cpp (modified) (3 diffs)
• Descriptors/AtomIdDescriptor_impl.hpp (modified) (2 diffs)
• Descriptors/AtomTypeDescriptor.cpp (added)
• Descriptors/AtomTypeDescriptor.hpp (added)
• Descriptors/AtomTypeDescriptor_impl.hpp (added)
• Legacy/oldmenu.cpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• atom_atominfo.cpp (modified) (2 diffs)
• atom_atominfo.hpp (modified) (1 diff)

molecuilder/src/Descriptors/AtomDescriptor_impl.hpp

@@ +1 @@
+#ifndef ATOMDESCRIPTOR_IMPL_HPP
+#define ATOMDESCRIPTOR_IMPL_HPP
+
 /************************ Declarations of implementation Objects ************************/
 
@@ -70 +73 @@
   AtomDescriptor::impl_ptr arg;
 };
+
+#endif //ATOMDESCRIPTOR_IMPL_HPP

molecuilder/src/Descriptors/AtomIdDescriptor.cpp

@@ -22 +22 @@
 
 bool AtomIdDescriptor_impl::predicate(std::pair<int,atom*> atom) {
-  return atom.second->getId()==id;
+  return atom.first==id;
 }
 
@@ -29 +29 @@
 }
 
-#if 0
-
-// so far the lookuptable for Atoms-by-id does not work, since atoms don't get an ID upon creation.
-// instead of this we rely on walking through all atoms.
-
-atom *AtomIdDescriptor::find(){
+atom *AtomIdDescriptor_impl::find(){
   map<int,atom*> atoms = getAtoms();
   map<int,atom*>::iterator res = atoms.find(id);
@@ -40 +35 @@
 }
 
-vector<atom*> AtomIdDescriptor::findAll(){
+vector<atom*> AtomIdDescriptor_impl::findAll(){
   atom *res = find();
   return (res)?(vector<atom*>(1,res)):(vector<atom*>());
 }
-
-#endif

molecuilder/src/Descriptors/AtomIdDescriptor_impl.hpp

@@ +1 @@
+#ifndef ATOMIDDESCRIPTOR_IMPL_HPP
+#define ATOMIDDESCRIPTOR_IMPL_HPP
+
 #include "Descriptors/AtomDescriptor_impl.hpp"
 
@@ -10 +13 @@
 
 protected:
-#if 0
-  atom *find();
-  std::vector<atom*> findAll();
-#endif
+  virtual atom *find();
+  virtual std::vector<atom*> findAll();
 private:
   int id;
 };
+
+#endif //ATOMIDDESCRIPTOR_IMPL_HPP

molecuilder/src/Legacy/oldmenu.cpp

@@ -737 +737 @@
         Log() << Verbose(0) << "New element by atomic number Z: ";
         cin >> Z;
-        first->type = periode->FindElement(Z);
+        first->setType(Z);
         Log() << Verbose(0) << "Atom " << first->nr << "'s element is " << first->type->name << "." << endl;
       }

molecuilder/src/Makefile.am

@@ -29 +29 @@
 LEGACYHEADER = Legacy/oldmenu.hpp
 
-DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp Descriptors/AtomIdDescriptor.cpp
-DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp Descriptors/AtomIdDescriptor.hpp
+DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp Descriptors/AtomIdDescriptor.cpp Descriptors/AtomTypeDescriptor.cpp
+DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp Descriptors/AtomIdDescriptor.hpp Descriptors/AtomTypeDescriptor.hpp
 
 SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${PATTERNSOURCE} ${UISOURCE} ${DESCRIPTORSOURCE} ${LEGACYSOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp info.cpp leastsquaremin.cpp linkedcell.cpp lists.cpp log.cpp logger.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp World.cpp 

molecuilder/src/atom_atominfo.cpp

@@ -6 +6 @@
  */
 
+#include "periodentafel.hpp"
+#include "World.hpp"
 #include "atom_atominfo.hpp"
 
@@ -18 +20 @@
 };
 
+element *AtomInfo::getType(){
+  return type;
+}
+
+void AtomInfo::setType(element* _type) {
+  type = _type;
+}
+
+void AtomInfo::setType(int Z) {
+  element *elem = World::get()->getPeriode()->FindElement(Z);
+  setType(elem);
+}

molecuilder/src/atom_atominfo.hpp

@@ -37 +37 @@
   ~AtomInfo();
 
+  element *getType();
+  void setType(element *);
+  void setType(int);
+
 private:
 };