Ignore:
Timestamp:
Feb 25, 2010, 11:15:22 AM (16 years ago)
Author:
Tillmann Crueger <crueger@…>
Children:
f467c6
Parents:
536380 (diff), 2e6496 (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.
Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

Location:
molecuilder/src/Actions
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/Actions/Process.cpp

    r536380 r1614a17  
    3838
    3939int Process::getCurrStep(){
     40  OBSERVE;
    4041  return currStep;
     42}
     43
     44void Process::setCurrStep(int _currStep){
     45  currStep = _currStep;
    4146}
    4247
    … …  
    4752    return 0;
    4853}
     54
    4955int Process::getMaxSteps(){
    5056  return maxSteps;
    5157}
    5258
     59void Process::setMaxSteps(int _maxSteps){
     60  maxSteps = _maxSteps;
     61}
    5362
    5463void Process::start(){
    … …  
    6978  starts = false;
    7079}
     80
    7181void Process::step(){
    7282  OBSERVE;
    7383  currStep++;
    7484}
     85
    7586void Process::stop(){
    7687  stops = true;

  • molecuilder/src/Actions/Process.hpp

    r536380 r1614a17  
    2929  bool  doesStop();
    3030  int   getCurrStep();
     31  void  setCurrStep(int _currStep);
    3132  float getDoneRatio();
    3233  int   getMaxSteps();
     34  void  setMaxSteps(int _maxSteps);
    3335
    3436protected:
Note: See TracChangeset for help on using the changeset viewer.