Skip to content

Commit

Permalink
whitespace improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Aug 4, 2016
1 parent 02b84bd commit 1c89c56
Show file tree
Hide file tree
Showing 7 changed files with 241 additions and 242 deletions.
34 changes: 17 additions & 17 deletions src/Base/Unit.cpp
View file
Expand Up @@ -450,23 +450,23 @@ QString Unit::getString(void) const

QString Unit::getTypeString(void) const
{
if(*this == Unit::Length ) return QString::fromLatin1("Length"); else
if(*this == Unit::Area ) return QString::fromLatin1("Area"); else
if(*this == Unit::Volume ) return QString::fromLatin1("Volume"); else
if(*this == Unit::Mass ) return QString::fromLatin1("Mass"); else
if(*this == Unit::Angle ) return QString::fromLatin1("Angle"); else
if(*this == Unit::Density ) return QString::fromLatin1("Density"); else
if(*this == Unit::TimeSpan ) return QString::fromLatin1("TimeSpan"); else
if(*this == Unit::Velocity ) return QString::fromLatin1("Velocity"); else
if(*this == Unit::Acceleration ) return QString::fromLatin1("Acceleration"); else
if(*this == Unit::Temperature ) return QString::fromLatin1("Temperature"); else
if(*this == Unit::ElectricCurrent ) return QString::fromLatin1("ElectricCurrent"); else
if(*this == Unit::AmountOfSubstance ) return QString::fromLatin1("AmountOfSubstance"); else
if(*this == Unit::LuminoseIntensity ) return QString::fromLatin1("LuminoseIntensity"); else
if(*this == Unit::Pressure ) return QString::fromLatin1("Pressure"); else
if(*this == Unit::Force ) return QString::fromLatin1("Force"); else
if(*this == Unit::Work ) return QString::fromLatin1("Work"); else
if(*this == Unit::Power ) return QString::fromLatin1("Power"); else
if(*this == Unit::Length ) return QString::fromLatin1("Length"); else
if(*this == Unit::Area ) return QString::fromLatin1("Area"); else
if(*this == Unit::Volume ) return QString::fromLatin1("Volume"); else
if(*this == Unit::Mass ) return QString::fromLatin1("Mass"); else
if(*this == Unit::Angle ) return QString::fromLatin1("Angle"); else
if(*this == Unit::Density ) return QString::fromLatin1("Density"); else
if(*this == Unit::TimeSpan ) return QString::fromLatin1("TimeSpan"); else
if(*this == Unit::Velocity ) return QString::fromLatin1("Velocity"); else
if(*this == Unit::Acceleration ) return QString::fromLatin1("Acceleration"); else
if(*this == Unit::Temperature ) return QString::fromLatin1("Temperature"); else
if(*this == Unit::ElectricCurrent ) return QString::fromLatin1("ElectricCurrent"); else
if(*this == Unit::AmountOfSubstance ) return QString::fromLatin1("AmountOfSubstance"); else
if(*this == Unit::LuminoseIntensity ) return QString::fromLatin1("LuminoseIntensity"); else
if(*this == Unit::Pressure ) return QString::fromLatin1("Pressure"); else
if(*this == Unit::Force ) return QString::fromLatin1("Force"); else
if(*this == Unit::Work ) return QString::fromLatin1("Work"); else
if(*this == Unit::Power ) return QString::fromLatin1("Power"); else
if(*this == Unit::ThermalConductivity ) return QString::fromLatin1("ThermalConductivity"); else
if(*this == Unit::ThermalExpansionCoefficient ) return QString::fromLatin1("ThermalExpansionCoefficient"); else
if(*this == Unit::SpecificHeat ) return QString::fromLatin1("SpecificHeat"); else
Expand Down
52 changes: 26 additions & 26 deletions src/Base/Unit.h
View file
Expand Up @@ -85,36 +85,36 @@ class BaseExport Unit
const UnitSignature & getSignature(void)const {return Sig;}
bool isEmpty(void)const;

QString getString(void) const;
QString getString(void) const;
/// get the type as an string such as "Area", "Length" or "Pressure".
QString getTypeString(void) const;
QString getTypeString(void) const;

/** Predefined Unit types. */
//@{
/// Length unit
static Unit Length;
/// Mass unit
static Unit Mass;
/// Angle
static Unit Angle;
static Unit Density;

static Unit Area;
static Unit Volume;
static Unit TimeSpan;
static Unit Velocity;
static Unit Acceleration;
static Unit Temperature;
static Unit ElectricCurrent;
static Unit AmountOfSubstance;
static Unit LuminoseIntensity;

static Unit Stress;
static Unit Pressure;
static Unit Force;
static Unit Work;
static Unit Power;
/// Length unit
static Unit Length;
/// Mass unit
static Unit Mass;
/// Angle
static Unit Angle;
static Unit Density;

static Unit Area;
static Unit Volume;
static Unit TimeSpan;
static Unit Velocity;
static Unit Acceleration;
static Unit Temperature;

static Unit ElectricCurrent;
static Unit AmountOfSubstance;
static Unit LuminoseIntensity;

static Unit Stress;
static Unit Pressure;
static Unit Force;
static Unit Work;
static Unit Power;

static Unit ThermalConductivity;
static Unit ThermalExpansionCoefficient;
Expand Down
18 changes: 9 additions & 9 deletions src/Base/UnitsSchemaInternal.cpp
View file
Expand Up @@ -40,7 +40,7 @@ using namespace Base;
QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString)
{
double UnitValue = std::abs(quant.getValue());
Unit unit = quant.getUnit();
Unit unit = quant.getUnit();

// now do special treatment on all cases seams nececarry:
if(unit == Unit::Length){ // Length handling ============================
Expand Down Expand Up @@ -93,13 +93,13 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
factor = 1.0;
}
}else if (unit == Unit::ThermalConductivity){
if (UnitValue < 1000){
unitString = QString::fromLatin1("W/mm/K");
factor = 1.0;
}else{
unitString = QString::fromLatin1("W/m/K");
factor = 1000.0;
}
if (UnitValue < 1000){
unitString = QString::fromLatin1("W/mm/K");
factor = 1.0;
}else{
unitString = QString::fromLatin1("W/m/K");
factor = 1000.0;
}
}else if (unit == Unit::ThermalExpansionCoefficient){
if(UnitValue < 0.001){
unitString = QString::fromLatin1("um/m/K");
Expand All @@ -111,7 +111,7 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
}else if (unit == Unit::SpecificHeat){
unitString = QString::fromLatin1("J/kg/K");
factor = 1000000.0;
}else if (unit == Unit::ThermalTransferCoefficient){
}else if (unit == Unit::ThermalTransferCoefficient){
unitString = QString::fromLatin1("W/m^2/K");
factor = 1.0;
}else if ((unit == Unit::Pressure) || (unit == Unit::Stress)){
Expand Down
67 changes: 33 additions & 34 deletions src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp
View file
Expand Up @@ -127,40 +127,39 @@ void ViewProviderFemConstraintContact::updateData(const App::Property* prop)
SbVec3f base(p->x, p->y, p->z);
SbVec3f dir(n->x, n->y, n->z);//normal

///Visual indication
//define separator
SoSeparator* sep = new SoSeparator();

//first move to correct postion
SoTranslation* trans = new SoTranslation();
SbVec3f newPos=base+scaledheight*dir*0.12;
trans->translation.setValue(newPos);
sep->addChild(trans);

//adjust orientation
SoRotation* rot = new SoRotation();
rot->rotation.setValue(SbRotation(SbVec3f(0,1,0),dir));
sep->addChild(rot);

//define color of shape
SoMaterial* myMaterial = new SoMaterial;
myMaterial->diffuseColor.set1Value(0,SbColor(1,1,1));//RGB
//myMaterial->diffuseColor.set1Value(1,SbColor(0,0,1));//possible to adjust sides separately
sep->addChild(myMaterial);

//draw a cube
SoCube* cbe = new SoCube();
cbe->depth.setValue(scaledlength*0.5);
cbe->height.setValue(scaledheight*0.25);
cbe->width.setValue(scaledwidth*0.75);
sep->addChild(cbe);
//translate postion
SoTranslation* trans2 = new SoTranslation();
trans2->translation.setValue(SbVec3f(0,0,0));
sep->addChild(trans2);


pShapeSep->addChild(sep);
///Visual indication
//define separator
SoSeparator* sep = new SoSeparator();

//first move to correct postion
SoTranslation* trans = new SoTranslation();
SbVec3f newPos=base+scaledheight*dir*0.12f;
trans->translation.setValue(newPos);
sep->addChild(trans);

//adjust orientation
SoRotation* rot = new SoRotation();
rot->rotation.setValue(SbRotation(SbVec3f(0,1,0),dir));
sep->addChild(rot);

//define color of shape
SoMaterial* myMaterial = new SoMaterial;
myMaterial->diffuseColor.set1Value(0,SbColor(1,1,1));//RGB
//myMaterial->diffuseColor.set1Value(1,SbColor(0,0,1));//possible to adjust sides separately
sep->addChild(myMaterial);

//draw a cube
SoCube* cbe = new SoCube();
cbe->depth.setValue(scaledlength*0.5);
cbe->height.setValue(scaledheight*0.25);
cbe->width.setValue(scaledwidth*0.75);
sep->addChild(cbe);
//translate postion
SoTranslation* trans2 = new SoTranslation();
trans2->translation.setValue(SbVec3f(0,0,0));
sep->addChild(trans2);

pShapeSep->addChild(sep);
n++;
}
}
Expand Down
112 changes: 56 additions & 56 deletions src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
View file
Expand Up @@ -126,65 +126,65 @@ void ViewProviderFemConstraintHeatflux::updateData(const App::Property* prop)
SbVec3f base(p->x, p->y, p->z);
SbVec3f dir(n->x, n->y, n->z);//normal

///Temperature indication
//define separator
SoSeparator* sep = new SoSeparator();

///draw a temp gauge,with sphere and a cylinder
//first move to correct postion
SoTranslation* trans = new SoTranslation();
SbVec3f newPos=base+scaledradius*dir*0.7;
trans->translation.setValue(newPos);
sep->addChild(trans);

//adjust orientation
SoRotation* rot = new SoRotation();
rot->rotation.setValue(SbRotation(SbVec3f(0,1,0),dir));
sep->addChild(rot);

//define color of shape
SoMaterial* myMaterial = new SoMaterial;
myMaterial->diffuseColor.set1Value(0,SbColor(0.65,0.1,0.25));//RGB
//myMaterial->diffuseColor.set1Value(1,SbColor(.1,.1,.1));//possible to adjust sides separately
sep->addChild(myMaterial);

//draw a sphere
SoSphere* sph = new SoSphere();
sph->radius.setValue(scaledradius*0.75);
sep->addChild(sph);
//translate postion
SoTranslation* trans2 = new SoTranslation();
trans2->translation.setValue(SbVec3f(0,scaledheight*0.375,0));
sep->addChild(trans2);
//draw a cylinder
SoCylinder* cyl = new SoCylinder();
cyl->height.setValue(scaledheight*0.5);
cyl->radius.setValue(scaledradius*0.375);
sep->addChild(cyl);
//translate postion
SoTranslation* trans3 = new SoTranslation();
trans3->translation.setValue(SbVec3f(0,scaledheight*0.375,0));
sep->addChild(trans3);
//define color of shape
SoMaterial *myMaterial2 = new SoMaterial;
myMaterial2->diffuseColor.set1Value(0,SbColor(1,1,1));//RGB
sep->addChild(myMaterial2);
//draw a cylinder
SoCylinder* cyl2 = new SoCylinder();
cyl2->height.setValue(scaledheight*0.25);
cyl2->radius.setValue(scaledradius*0.375);
sep->addChild(cyl2);
///Temperature indication
//define separator
SoSeparator* sep = new SoSeparator();

///draw a temp gauge,with sphere and a cylinder
//first move to correct postion
SoTranslation* trans = new SoTranslation();
SbVec3f newPos=base+scaledradius*dir*0.7f;
trans->translation.setValue(newPos);
sep->addChild(trans);

//adjust orientation
SoRotation* rot = new SoRotation();
rot->rotation.setValue(SbRotation(SbVec3f(0,1,0),dir));
sep->addChild(rot);

//define color of shape
SoMaterial* myMaterial = new SoMaterial;
myMaterial->diffuseColor.set1Value(0,SbColor(0.65f,0.1f,0.25f));//RGB
//myMaterial->diffuseColor.set1Value(1,SbColor(.1,.1,.1));//possible to adjust sides separately
sep->addChild(myMaterial);

//draw a sphere
SoSphere* sph = new SoSphere();
sph->radius.setValue(scaledradius*0.75);
sep->addChild(sph);
//translate postion
SoTranslation* trans2 = new SoTranslation();
trans2->translation.setValue(SbVec3f(0,scaledheight*0.375,0));
sep->addChild(trans2);
//draw a cylinder
SoCylinder* cyl = new SoCylinder();
cyl->height.setValue(scaledheight*0.5);
cyl->radius.setValue(scaledradius*0.375);
sep->addChild(cyl);
//translate postion
SoTranslation* trans3 = new SoTranslation();
trans3->translation.setValue(SbVec3f(0,scaledheight*0.375,0));
sep->addChild(trans3);
//define color of shape
SoMaterial *myMaterial2 = new SoMaterial;
myMaterial2->diffuseColor.set1Value(0,SbColor(1,1,1));//RGB
sep->addChild(myMaterial2);
//draw a cylinder
SoCylinder* cyl2 = new SoCylinder();
cyl2->height.setValue(scaledheight*0.25);
cyl2->radius.setValue(scaledradius*0.375);
sep->addChild(cyl2);
//translate postion
SoTranslation* trans4 = new SoTranslation();
trans4->translation.setValue(SbVec3f(0,-scaledheight*0.375,0));
sep->addChild(trans4);
SoTranslation* trans4 = new SoTranslation();
trans4->translation.setValue(SbVec3f(0,-scaledheight*0.375,0));
sep->addChild(trans4);
//draw a cylinder
SoCylinder* cyl3 = new SoCylinder();
cyl3->height.setValue(scaledheight*0.05);
cyl3->radius.setValue(scaledradius*1);
sep->addChild(cyl3);
SoCylinder* cyl3 = new SoCylinder();
cyl3->height.setValue(scaledheight*0.05);
cyl3->radius.setValue(scaledradius*1);
sep->addChild(cyl3);

pShapeSep->addChild(sep);
pShapeSep->addChild(sep);

n++;
}
Expand Down

0 comments on commit 1c89c56

Please sign in to comment.