Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/molecule_pointcloud.cpp

    r71b20e rc72112  
    88#include "atom.hpp"
    99#include "config.hpp"
     10#include "info.hpp"
    1011#include "memoryallocator.hpp"
    1112#include "molecule.hpp"
    … …  
    3132};
    3233
    33 /** Return current atom in the list.
    34  * \return pointer to atom or NULL if none present
     34
     35/** PointCloud implementation of GoPoint
     36 * Uses atoms and STL stuff.
    3537 */
    36 TesselPoint *molecule::GetPoint() const
     38TesselPoint* molecule::GetPoint() const
    3739{
    38   if ((InternalPointer != start) && (InternalPointer != end))
    39     return InternalPointer;
    40   else
    41     return NULL;
     40  Info FunctionInfo(__func__);
     41  return (*InternalPointer);
    4242};
    4343
    44 /** Return pointer to one after last atom in the list.
    45  * \return pointer to end marker
    46  */
    47 TesselPoint *molecule::GetTerminalPoint() const
    48 {
    49   return end;
    50 };
    51 
    52 /** Return the greatest index of all atoms in the list.
    53  * \return greatest index
    54  */
    55 int molecule::GetMaxId() const
    56 {
    57   return last_atom;
    58 };
    59 
    60 /** Go to next atom.
    61  * Stops at last one.
     44/** PointCloud implementation of GoToNext.
     45 * Uses atoms and STL stuff.
    6246 */
    6347void molecule::GoToNext() const
    6448{
    65   if (InternalPointer != end)
    66     InternalPointer = InternalPointer->next;
     49  Info FunctionInfo(__func__);
     50  if (InternalPointer != atoms.end())
     51    InternalPointer++;
    6752};
    6853
    69 /** Go to previous atom.
    70  * Stops at first one.
    71  */
    72 void molecule::GoToPrevious() const
    73 {
    74   if (InternalPointer->previous != start)
    75     InternalPointer = InternalPointer->previous;
    76 };
    77 
    78 /** Goes to first atom.
     54/** PointCloud implementation of GoToFirst.
     55 * Uses atoms and STL stuff.
    7956 */
    8057void molecule::GoToFirst() const
    8158{
    82   InternalPointer = start->next;
     59  Info FunctionInfo(__func__);
     60  InternalPointer = atoms.begin();
    8361};
    8462
    85 /** Goes to last atom.
    86  */
    87 void molecule::GoToLast() const
    88 {
    89   InternalPointer = end->previous;
    90 };
    91 
    92 /** Checks whether we have any atoms in molecule.
    93  * \return true - no atoms, false - not empty
     63/** PointCloud implementation of IsEmpty.
     64 * Uses atoms and STL stuff.
    9465 */
    9566bool molecule::IsEmpty() const
    9667{
    97   return (start->next == end);
     68  Info FunctionInfo(__func__);
     69  return (empty());
    9870};
    9971
    100 /** Checks whether we are at the last atom
    101  * \return true - current atom is last one, false - is not last one
     72/** PointCloud implementation of IsLast.
     73 * Uses atoms and STL stuff.
    10274 */
    10375bool molecule::IsEnd() const
    10476{
    105   return (InternalPointer == end);
     77  Info FunctionInfo(__func__);
     78  return (InternalPointer == atoms.end());
    10679};
     80
     81int molecule::GetMaxId() const {
     82  return getAtomCount();
     83}
Note: See TracChangeset for help on using the changeset viewer.