Skip to content

Commit

Permalink
- Replaced tab characters with 2 spaces (mostly in C sources since Ec…
Browse files Browse the repository at this point in the history
…lipse/MDT usually manages to avoid using tabs)

$ svn diff Compiler/ | grep ^- | grep -v ^--- | wc -l
4771
$ svn diff c_runtime/ | grep ^- | grep -v ^--- | wc -l
13365
$ svn diff OMNotebook/ | grep ^- | grep -v ^--- | wc -l
17341
$ svn diff OMShell/ | grep ^- | grep -v ^--- | wc -l
582


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7662 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Jan 7, 2011
1 parent 66b0b7a commit a03358f
Show file tree
Hide file tree
Showing 113 changed files with 19,712 additions and 19,712 deletions.
1,222 changes: 611 additions & 611 deletions OMNotebook/3Dpkg/SimulationData.cpp

Large diffs are not rendered by default.

170 changes: 85 additions & 85 deletions OMNotebook/3Dpkg/SimulationData.h
Expand Up @@ -59,92 +59,92 @@

namespace IAEX
{
class SimulationKeypoint {
public:
SimulationKeypoint(double time);
SimulationKeypoint();
~SimulationKeypoint(void);

void setTime(double time);
void addVar(QString name, float value);
QHash<QString, float> vars;
double time;
QString toString(void);

private:
};

class SimulationObject {
public:
// SimulationObject(QString type, QString posVar, QString dirVar, SoSeparator *parent);
SimulationObject(QString type, QString name, QString params, SoSeparator *parent);
SimulationObject(SoSeparator *parent);
~SimulationObject(void);

QString getName();
QString getPosVar();
void setPosVar(QString val);
QString getDirVar();
void setDirVar(QString val);
QString getType();
void setType(QString val);
SoSeparator* getParent();
void setParent(SoSeparator *val);
SbColor* parseColor(QString coldef);

void setPosition(SbVec3f pos);
void setRotationDir(SbRotation dir);
void setScale(SbVec3f scale);
void setOffset(SbVec3f offset);

bool hasPosition;
bool hasRotation;
bool hasSize;
bool hasOffset;

SoTranslation *translation;
SoRotation *rotation;
SoScale *scale;
SoTranslation *offset;

private:
QString name;
QString type;
QString posVar;
QString dirVar;
QString modelfilename;
QString shape;

SbColor *color;
SoSeparator *objectGroup;
class SimulationKeypoint {
public:
SimulationKeypoint(double time);
SimulationKeypoint();
~SimulationKeypoint(void);

void setTime(double time);
void addVar(QString name, float value);
QHash<QString, float> vars;
double time;
QString toString(void);

private:
};

class SimulationObject {
public:
// SimulationObject(QString type, QString posVar, QString dirVar, SoSeparator *parent);
SimulationObject(QString type, QString name, QString params, SoSeparator *parent);
SimulationObject(SoSeparator *parent);
~SimulationObject(void);

QString getName();
QString getPosVar();
void setPosVar(QString val);
QString getDirVar();
void setDirVar(QString val);
QString getType();
void setType(QString val);
SoSeparator* getParent();
void setParent(SoSeparator *val);
SbColor* parseColor(QString coldef);

void setPosition(SbVec3f pos);
void setRotationDir(SbRotation dir);
void setScale(SbVec3f scale);
void setOffset(SbVec3f offset);

bool hasPosition;
bool hasRotation;
bool hasSize;
bool hasOffset;

SoTranslation *translation;
SoRotation *rotation;
SoScale *scale;
SoTranslation *offset;

private:
QString name;
QString type;
QString posVar;
QString dirVar;
QString modelfilename;
QString shape;

SbColor *color;
SoSeparator *objectGroup;
SoSeparator *parent;
};

class SimulationData {
public:
SimulationData(void);
~SimulationData(void);

void parse(QString filename);
void clear(void);
int size(void);
float get_start_time(void);
float get_end_time(void);
void setFrame(float);
SoSeparator *getSceneGraph() { return visroot_; }
void addKeypoint(SimulationKeypoint *);
void addObject(QString type, QString name, QString params);
void viewAll(SbViewportRegion vpr);


private:
SoSeparator *visroot_;
SoPerspectiveCamera *cam_;
QList<SimulationKeypoint *> *keyPoints_;
QList<SimulationObject> *objects_;
float start_time;
float end_time;
};
};

class SimulationData {
public:
SimulationData(void);
~SimulationData(void);

void parse(QString filename);
void clear(void);
int size(void);
float get_start_time(void);
float get_end_time(void);
void setFrame(float);
SoSeparator *getSceneGraph() { return visroot_; }
void addKeypoint(SimulationKeypoint *);
void addObject(QString type, QString name, QString params);
void viewAll(SbViewportRegion vpr);


private:
SoSeparator *visroot_;
SoPerspectiveCamera *cam_;
QList<SimulationKeypoint *> *keyPoints_;
QList<SimulationObject> *objects_;
float start_time;
float end_time;
};
}

#endif
Expand Down

0 comments on commit a03358f

Please sign in to comment.