suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new units schema: Building Euro (everything in centimeters, areas/volumes in meters)

Browse Source
This commit is contained in:
Yorik van Havre 2016-05-25 19:10:48 -03:00
parent 33c9b9d0dd
commit ee9452a8ee
No known key found for this signature in database
GPG Key ID: 4C7794EF1595A813
6 changed files with 127 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/CMakeLists.txt
View File

@ -166,6 +166,8 @@ SET(FreeCADBase_UNITAPI_SRCS
UnitsSchemaMKS.cpp
UnitsSchemaImperial1.h
UnitsSchemaImperial1.cpp
UnitsSchemaCentimeters.h
UnitsSchemaCentimeters.cpp
Quantity.h
Quantity.cpp
QuantityPyImp.cpp

4
src/Base/UnitsApi.cpp
View File

@ -31,7 +31,8 @@
#include "UnitsApi.h"
#include "UnitsSchemaInternal.h"
#include "UnitsSchemaImperial1.h"
#include "UnitsSchemaMKS.h"
#include "UnitsSchemaMKS.h"
#include "UnitsSchemaCentimeters.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
@ -90,6 +91,7 @@ void UnitsApi::setSchema(UnitSystem s)
case SI2 : UserPrefSystem = new UnitsSchemaMKS(); break;
case Imperial1: UserPrefSystem = new UnitsSchemaImperial1(); break;
case ImperialDecimal: UserPrefSystem = new UnitsSchemaImperialDecimal(); break;
case Centimeters: UserPrefSystem = new UnitsSchemaCentimeters(); break;
default : UserPrefSystem = new UnitsSchemaInternal(); s = SI1; break;
}

3
src/Base/UnitsSchema.h
View File

@ -39,7 +39,8 @@ enum UnitSystem {
SI1 = 0 , /** internal (mm,kg,s) SI system (http://en.wikipedia.org/wiki/International_System_of_Units) */
SI2 = 1 , /** MKS (m,kg,s) SI system */
Imperial1 = 2, /** the Imperial system (http://en.wikipedia.org/wiki/Imperial_units) */
ImperialDecimal = 3 /** Imperial with length in inch only */
ImperialDecimal = 3, /** Imperial with length in inch only */
Centimeters = 4 /** All lengths in centimeters, areas and volumes in square/cubic meters */
} ;

59
src/Base/UnitsSchemaCentimeters.cpp Normal file
View File

@ -0,0 +1,59 @@
/***************************************************************************
* Copyright (c) 2016 Yorik van Havre <yorik@uncreated.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifdef __GNUC__
# include <unistd.h>
#endif
#include <QString>
#include "Exception.h"
#include "UnitsApi.h"
#include "UnitsSchemaCentimeters.h"
#include <cmath>
using namespace Base;
QString UnitsSchemaCentimeters::schemaTranslate(Base::Quantity quant,double &factor,QString &unitString)
{
Unit unit = quant.getUnit();
if(unit == Unit::Length){
// all length units in centimeters
unitString = QString::fromLatin1("cm");
factor = 10.0;
}else if (unit == Unit::Area){
// all area units in square meters
unitString = QString::fromLatin1("m^2");
factor = 1000000.0;
}else if (unit == Unit::Volume){
// all area units in cubic meters
unitString = QString::fromLatin1("m^3");
factor = 1000000000.0;
}else{
// default action for all cases without special treatment:
unitString = quant.getUnit().getString();
factor = 1.0;
}
return QString::fromUtf8("%L1 %2").arg(quant.getValue() / factor).arg(unitString);
}

46
src/Base/UnitsSchemaCentimeters.h Normal file
View File

@ -0,0 +1,46 @@
/***************************************************************************
* Copyright (c) 2016 Yorik van Havre <yorik@uncreated.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef BASE_UNITSSCHEMACENTIMETERS_H
#define BASE_UNITSSCHEMACENTIMETERS_H
#include <string>
#include <QString>
#include "UnitsSchema.h"
namespace Base {
/**
* The UnitSchema class
*/
class UnitsSchemaCentimeters: public UnitsSchema
{
public:
virtual QString schemaTranslate(Base::Quantity quant,double &factor,QString &unitString);
};
} // namespace Base
#endif // BASE_UNITSSCHEMACENTIMETERS_H

25
src/Gui/DlgSettingsUnits.ui
View File

@ -41,16 +41,21 @@
<string>MKS (m/kg/s/degree)</string>
</property>
</item>
<item>
<property name="text">
<string>US customary (in/lb)</string>
</property>
</item>
<item>
<property name="text">
<string>Imperial decimal (in/lb)</string>
</property>
</item>
<item>
<property name="text">
<string>US customary (in/lb)</string>
</property>
</item>
<item>
<property name="text">
<string>Imperial decimal (in/lb)</string>
</property>
</item>
<item>
<property name="text">
<string>Building Euro (cm/m²/m³)</string>
</property>
</item>
</widget>
</item>
</layout>