Skip to content

Commit 13f10f6

Browse files
SteveMaas1978SteveMaas1978
committed
FEBioStudio: Moved LinearRegression and MathParser to MathLib. Moved convert.h to GLWLib. Cleaned up some include directives.
git-svn-id: https://gforge.sci.utah.edu/svn/MRLProjects/FEBioStudio@12545 b505bdfe-9d5c-0410-8600-697d5fc8e487
1 parent d05eb75 commit 13f10f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+232
-235
lines changed

‎FEBioStudio/CurveEditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <QMessageBox>
66
#include <QPainter>
77
#include "DlgFormula.h"
8-
#include <MeshTools/MathParser.h>
8+
#include <MathLib/MathParser.h>
99
#include <FEMLib/FESurfaceLoad.h>
1010
#include <MeshTools/FEMultiMaterial.h>
1111

‎FEBioStudio/DlgFormula.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <QGridLayout>
88
#include <QValidator>
99
#include <QMessageBox>
10-
#include <MeshTools/MathParser.h>
10+
#include <MathLib/MathParser.h>
1111

1212
CDlgFormula::CDlgFormula(QWidget* parent) : QDialog(parent)
1313
{

‎FEBioStudio/DlgSettings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "PropertyListForm.h"
1414
#include "PropertyListView.h"
1515
#include "CColorButton.h"
16-
#include <PostLib/convert.h>
16+
#include <GLWLib/convert.h>
1717
#include <PostLib/Palette.h>
1818

1919
//-----------------------------------------------------------------------------

‎FEBioStudio/DlgWidgetProps.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <GLWLib/GLWidget.h>
1717
#include "CIntInput.h"
1818
#include "CColorButton.h"
19-
#include "PostLib/convert.h"
19+
#include "GLWLib/convert.h"
2020
#include "MainWindow.h"
2121

2222
class CFontWidget : public QGroupBox

‎FEBioStudio/GraphWindow.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include "version.h"
2424
#include <QValidator>
2525
#include <QComboBox>
26-
#include <PostLib/LinearRegression.h>
26+
#include <MathLib/LinearRegression.h>
2727
#include "CColorButton.h"
28-
#include <PostLib/convert.h>
28+
#include <GLWLib/convert.h>
2929
#include "PostDoc.h"
3030

3131
OptionsUi::OptionsUi(CGraphWidget* graph, QWidget* parent) : CPlotTool(parent)

‎FEBioStudio/GraphWindow.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <QMainWindow>
3-
#include <MeshTools/MathParser.h>
3+
#include <MathLib/MathParser.h>
44
#include "PlotWidget.h"
55
#include "Document.h"
66

‎FEBioStudio/ModelPropsPanel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <QComboBox>
2222
#include "CColorButton.h"
2323
#include "MeshInfoPanel.h"
24-
#include <PostLib/convert.h>
24+
#include <GLWLib/convert.h>
2525
#include <MeshTools/GGroup.h>
2626
#include "Command.h"
2727

‎FEBioStudio/ObjectPanel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <QMenu>
99
#include "CColorButton.h"
1010
#include <GeomLib/GObject.h>
11-
#include <PostLib/convert.h>
11+
#include <GLWLib/convert.h>
1212
#include "MainWindow.h"
1313
#include "Document.h"
1414

‎FEBioStudio/PropertyList.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <QtCore/QVariant>
3-
#include <PostLib/convert.h>
3+
#include <GLWLib/convert.h>
44
#include <MathLib/math3d.h>
55

66
class Param;

‎FEMLib/FEAnalysisStep.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#include <MeshTools/FEModel.h>
33
#include <MeshTools/FERigidConstraint.h>
44
#include <MeshTools/FEProject.h>
5-
#include <FEMLib/FEInitialCondition.h>
6-
#include <FEMLib/FESurfaceLoad.h>
7-
#include <FEMLib/FEMKernel.h>
8-
#include <FEMLib/FEInterface.h>
5+
#include "FEInitialCondition.h"
6+
#include "FESurfaceLoad.h"
7+
#include "FEMKernel.h"
8+
#include "FEInterface.h"
99
#include <FSCore/FSObjectList.h>
1010

1111
int FEStep::m_ncount = 0;

‎FEMLib/FEBoundaryCondition.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
2-
2+
#include "FEStepComponent.h"
33
#include "MeshTools/FEGroup.h"
4-
#include "FEMLib/FEStepComponent.h"
54
#include "MeshTools/FEItemListBuilder.h"
65
#include <list>
76
using namespace std;

‎FEMLib/FEConnector.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "FEMLib/FEStepComponent.h"
2+
#include "FEStepComponent.h"
33
#include "MeshTools/FEItemListBuilder.h"
44
#include "MeshTools/GMaterial.h"
55
#include <list>

‎FEMLib/FEInterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "FEMLib/FEStepComponent.h"
2+
#include "FEStepComponent.h"
33
#include "MeshTools/FEItemListBuilder.h"
44
#include "MeshTools/GMaterial.h"
55
#include <list>

‎FSCore/Archive.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <stdio.h>
33
#include <string.h>
44
#include <MathLib/math3d.h>
5-
#include <FSCore/color.h>
5+
#include "color.h"
66
#include "CallTracer.h"
77
#include <stack>
88
#include <list>

‎GLWLib/GLWidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "GLWidget.h"
1616
#include <assert.h>
17-
#include "PostLib/convert.h"
17+
#include "convert.h"
1818
using namespace Post;
1919

2020
//-----------------------------------------------------------------------------

‎PostLib/convert.h ‎GLWLib/convert.h

File renamed without changes.

‎PostLib/LinearRegression.cpp ‎MathLib/LinearRegression.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "stdafx.h"
22
#include "LinearRegression.h"
3-
#include <MathLib/math3d.h>
3+
#include "math3d.h"
44
#include <assert.h>
55

66
bool LinearRegression(const vector<pair<double, double> >& data, pair<double, double>& res)

‎PostLib/LinearRegression.h ‎MathLib/LinearRegression.h

File renamed without changes.

‎MeshTools/MathParser.cpp ‎MathLib/MathParser.cpp

File renamed without changes.

‎MeshTools/MathParser.h ‎MathLib/MathParser.h

File renamed without changes.

‎MeshLib/FEElement.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#include "FEElement.h"
22
#include "FEElementLibrary.h"
3-
#include <MeshLib/tet4.h>
4-
#include <MeshLib/penta6.h>
5-
#include <MeshLib/penta15.h>
6-
#include <MeshLib/hex8.h>
7-
#include <MeshLib/pyra5.h>
8-
#include <MeshLib/tet10.h>
9-
#include <MeshLib/tet15.h>
10-
#include <MeshLib/tet20.h>
11-
#include <MeshLib/hex20.h>
12-
#include <MeshLib/hex27.h>
3+
#include "tet4.h"
4+
#include "penta6.h"
5+
#include "penta15.h"
6+
#include "hex8.h"
7+
#include "pyra5.h"
8+
#include "tet10.h"
9+
#include "tet15.h"
10+
#include "tet20.h"
11+
#include "hex20.h"
12+
#include "hex27.h"
1313

1414
//=============================================================================
1515
// FEElement_

‎MeshLib/FEMesh.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "FEMesh.h"
22
#include <GeomLib/GObject.h>
3-
#include <MeshLib/triangulate.h>
3+
#include "triangulate.h"
44
#include "FESurfaceMesh.h"
55
#include "MeshMetrics.h"
6-
#include <MeshLib/FENodeElementList.h>
7-
#include <MeshLib/FENodeFaceList.h>
8-
#include <MeshLib/FENodeEdgeList.h>
6+
#include "FENodeElementList.h"
7+
#include "FENodeFaceList.h"
8+
#include "FENodeEdgeList.h"
99
#include <algorithm>
1010
#include <unordered_set>
1111

‎MeshLib/FEMesh.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "MeshLib/FECoreMesh.h"
2+
#include "FECoreMesh.h"
33
#include "MeshTools/FEGroup.h"
44
#include "MeshTools/FENodeData.h"
55
#include "MeshTools/FESurfaceData.h"

‎MeshTools/BivariatePolynomialSpline.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//
2-
// BivariatePolynomialSpline.cpp
3-
//
4-
// Created by Gerard Ateshian on 9/10/14.
5-
//
6-
//
7-
81
#include "BivariatePolynomialSpline.h"
92
#include "MathLib/LUSolver.h"
103
#include <stdio.h>

‎MeshTools/BivariatePolynomialSpline.h

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
//
2-
// BivariatePolynomialSpline.h
3-
//
4-
// Created by Gerard Ateshian on 9/10/14.
5-
//
6-
//
7-
8-
#ifndef __libspg__BivariatePolynomialSpline__
9-
#define __libspg__BivariatePolynomialSpline__
10-
1+
#pragma once
112
#include "BivariateSpline.h"
123
#include "PointCloud3d.h"
134

@@ -31,5 +22,3 @@ class BivariatePolynomialSpline : public BivariateSpline
3122
vector< vector<double> > m_c; // spline coefficients
3223
int m_n; // spline degree
3324
};
34-
35-
#endif /* defined(__libspg__BivariatePolynomialSpline__) */

‎MeshTools/BivariateSpline.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//
2-
// BivariateSpline.cpp
3-
//
4-
// Created by Gerard Ateshian on 9/18/14.
5-
//
6-
//
7-
81
#include "BivariateSpline.h"
92

103
//--------------------------------------------------------------------------------------

‎MeshTools/BivariateSpline.h

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
//
2-
// BivariateSpline.h
3-
//
4-
// Created by Gerard Ateshian on 9/18/14.
5-
//
6-
//
7-
8-
#ifndef __libspg__BivariateSpline__
9-
#define __libspg__BivariateSpline__
10-
1+
#pragma once
112
#include "PointCloud3d.h"
123

134
class BivariateSpline
@@ -40,6 +31,3 @@ class BivariateSpline
4031
public:
4132
PointCloud3d* m_pc; // pointer to point cloud
4233
};
43-
44-
45-
#endif /* defined(__libspg__BivariateSpline__) */

‎MeshTools/FEAxesCurvature.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//
2-
// FEAxesCurvature.cpp
3-
// MeshTools
4-
//
5-
// Created by Jay Shim on 4/19/18.
6-
// Copyright © 2018 febio.org. All rights reserved.
7-
//
8-
91
#include "FEAxesCurvature.h"
102
#include "stdafx.h"
113
#include "FEDomain.h"

‎MeshTools/FECreateShells.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
//
2-
// FECreateShells.cpp
3-
// MeshTools
4-
//
5-
// Created by Martin Xiberras on 5/31/18.
6-
7-
81
#include "stdafx.h"
92
#include "FECreateShells.h"
103
#include <GeomLib/GMeshObject.h>
114

12-
135
FECreateShells::FECreateShells() : FEModifier("Create Shells")
146
{
157
AddDoubleParam(0, "h", "h");

‎MeshTools/FECreateShells.h

-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
//
2-
// FECreateShells.h
3-
// MeshTools
4-
//
5-
// Created by Martin Xiberras on 5/31/18.
6-
7-
81
#pragma once
92
#include "FEModifier.h"
10-
#include <GeomLib/GMeshObject.h>
113

124
class FECreateShells : public FEModifier
135
{
@@ -20,4 +12,3 @@ class FECreateShells : public FEModifier
2012
protected:
2113
void CreateShells(FEMesh* pm, vector<int>& faceList);
2214
};
23-

‎MeshTools/FEDataVariable.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include <FSCore/FSObject.h>
3-
#include "MathLib/math3d.h"
4-
#include "MathParser.h"
3+
#include <MathLib/math3d.h>
4+
#include <MathLib/MathParser.h>
55
#include <string>
66
using namespace std;
77

‎MeshTools/FEProject.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#include "FEProject.h"
33
#include <FEMLib/FEMKernel.h>
44
#include <FEMLib/FESurfaceLoad.h>
5-
#include <MeshTools/FERigidConstraint.h>
6-
#include <MeshTools/FEMultiMaterial.h>
7-
#include <MeshTools/GGroup.h>
5+
#include "FERigidConstraint.h"
6+
#include "FEMultiMaterial.h"
7+
#include "GGroup.h"
88
#include <GeomLib/GObject.h>
99
#include <string>
1010
using namespace std;

‎MeshTools/FEQuad4ToQuad8.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//
2-
// FEQuad4ToQuad8.cpp
3-
// MeshTools
4-
//
5-
// Created by Gerard Ateshian on 2/28/16.
6-
// Copyright © 2016 febio.org. All rights reserved.
7-
//
8-
91
#include "stdafx.h"
102
#include "FEModifier.h"
113

‎MeshTools/FESelectElementsFromFaces.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//
2-
// FESelectElementsFromFaces.cpp
3-
// MeshTools
4-
//
5-
// Created by Gerard Ateshian on 6/29/18.
6-
// Copyright © 2018 febio.org. All rights reserved.
7-
//
8-
91
#include "stdafx.h"
102
#include "FESelectElementsFromFaces.h"
113
#include "FEDomain.h"

‎MeshTools/FESelectElementsFromFaces.h

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
//
2-
// FESelectElementsFromFaces.hpp
3-
// MeshTools
4-
//
5-
// Created by Gerard Ateshian on 6/29/18.
6-
// Copyright © 2018 febio.org. All rights reserved.
7-
//
8-
9-
#ifndef FESelectElementsFromFaces_hpp
10-
#define FESelectElementsFromFaces_hpp
11-
1+
#pragma once
122
#include "FEModifier.h"
133

144
//-----------------------------------------------------------------------------
@@ -23,5 +13,3 @@ class FESelectElementsFromFaces : public FEModifier
2313
protected:
2414
void SelectElementsFromFaces(FEMesh* pm);
2515
};
26-
27-
#endif /* FESelectElementsFromFaces_hpp */

‎MeshTools/FESurfaceData.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "FEMeshData.h"
3-
#include "MeshTools/FEGroup.h"
3+
#include "FEGroup.h"
44
#include <vector>
55

66
class FESurfaceData : public FEMeshData

‎MeshTools/FETri3ToTri6.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
//
2-
// FETri3ToTri6.cpp
3-
// MeshTools
4-
//
5-
// Created by Gerard Ateshian on 2/28/16.
6-
// Copyright © 2016 febio.org. All rights reserved.
7-
//
8-
91
#include <stdio.h>
10-
112
#include "stdafx.h"
123
#include "FEModifier.h"
134

0 commit comments

Comments
 (0)