Skip to content

Commit 43aea73

Browse files
SteveMaas1978SteveMaas1978
committed
Moved FSProject, FSModel, and PlotDataSettings to FEMLib.
1 parent 59349a2 commit 43aea73

File tree

89 files changed

+109
-110
lines changed

Some content is hidden

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

89 files changed

+109
-110
lines changed

‎Abaqus/AbaqusExport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2424
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2525
SOFTWARE.*/
2626
#include "AbaqusExport.h"
27-
#include <MeshTools/FEProject.h>
27+
#include <FEMLib/FSProject.h>
2828
#include <GeomLib/GModel.h>
2929
#include <GeomLib/GObject.h>
3030

‎Abaqus/AbaqusImport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626

2727
#pragma once
2828
#include <MeshIO/FileReader.h>
29-
#include <MeshTools/FEProject.h>
29+
#include <FEMLib/FSProject.h>
3030
#include "AbaqusModel.h"
3131

3232
#include <list>

‎Abaqus/AbaqusModel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2525
SOFTWARE.*/
2626

2727
#pragma once
28-
#include <MeshTools/FEProject.h>
28+
#include <FEMLib/FSProject.h>
2929
#include <list>
3030
#include <vector>
3131
#include <map>

‎Ansys/AnsysImport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SOFTWARE.*/
2727
#pragma once
2828

2929
#include <MeshIO/FileReader.h>
30-
#include <MeshTools/FEProject.h>
30+
#include <FEMLib/FSProject.h>
3131
#include <list>
3232
//using namespace std;
3333

‎Comsol/COMSOLImport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include <MeshIO/FileReader.h>
3-
#include <MeshTools/FEProject.h>
3+
#include <FEMLib/FSProject.h>
44

55
#include <list>
66
#include <vector>

‎FEBio/FEBioExport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SOFTWARE.*/
3434
#include <GeomLib/GObject.h>
3535
#include <MeshTools/GDiscreteObject.h>
3636
#include <GeomLib/GModel.h>
37-
#include <MeshTools/FEProject.h>
37+
#include <FEMLib/FSProject.h>
3838
#include <sstream>
3939
#include <iomanip>
4040

‎FEBio/FEBioExport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SOFTWARE.*/
2828
#include <MeshIO/FSFileExport.h>
2929
#include <XML/XMLWriter.h>
3030
#include "FEBioException.h"
31-
#include <MeshTools/FEProject.h>
31+
#include <FEMLib/FSProject.h>
3232
#include <sstream>
3333
#include <map>
3434

‎FEBio/FEBioExport12.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SOFTWARE.*/
2727
#pragma once
2828
#include <FEMLib/FEMultiMaterial.h>
2929
#include "FEBioExport.h"
30-
#include <MeshTools/FEProject.h>
30+
#include <FEMLib/FSProject.h>
3131

3232
//-----------------------------------------------------------------------------
3333
class FEBioExport12 : public FEBioExport

‎FEBio/FEBioExport2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SOFTWARE.*/
3737
#include <MeshTools/GDiscreteObject.h>
3838
#include <MeshTools/GGroup.h>
3939
#include <MeshTools/FEElementData.h>
40-
#include <MeshTools/FEProject.h>
40+
#include <FEMLib/FSProject.h>
4141
#include <GeomLib/GModel.h>
4242
#include <GeomLib/GObject.h>
4343
#include <memory>

‎FEBio/FEBioExport2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SOFTWARE.*/
2727
#pragma once
2828
#include <FEMLib/FEMultiMaterial.h>
2929
#include "FEBioExport.h"
30-
#include <MeshTools/FEProject.h>
30+
#include <FEMLib/FSProject.h>
3131

3232
//-----------------------------------------------------------------------------
3333
class GPart;

‎FEBio/FEBioExport25.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SOFTWARE.*/
2828

2929
#include <FEMLib/FEMultiMaterial.h>
3030
#include <FEMLib/FEBodyLoad.h>
31-
#include <MeshTools/FEProject.h>
31+
#include <FEMLib/FSProject.h>
3232
#include "FEBioExport.h"
3333

3434
//-----------------------------------------------------------------------------

‎FEBio/FEBioExport3.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SOFTWARE.*/
3636
#include <MeshTools/FESurfaceData.h>
3737
#include <MeshTools/FEElementData.h>
3838
#include <GeomLib/GModel.h>
39-
#include <MeshTools/FEProject.h>
39+
#include <FEMLib/FSProject.h>
4040
#include <FEBioLink/FEBioModule.h>
4141
#include <memory>
4242
#include <sstream>

‎FEBio/FEBioExport4.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SOFTWARE.*/
3535
#include <MeshTools/FESurfaceData.h>
3636
#include <MeshTools/FEElementData.h>
3737
#include <GeomLib/GModel.h>
38-
#include <MeshTools/FEProject.h>
38+
#include <FEMLib/FSProject.h>
3939
#include <FEBioLink/FEBioModule.h>
4040
#include <memory>
4141
#include <sstream>

‎FEBio/FEBioFormat.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SOFTWARE.*/
3030
#include "FEBioImport.h"
3131
#include <GeomLib/GMeshObject.h>
3232
#include <FEMLib/FEDiscreteMaterial.h>
33-
#include <MeshTools/FEProject.h>
33+
#include <FEMLib/FSProject.h>
3434
#include <FEBioLink/FEBioInterface.h>
3535
#include <FEBioLink/FEBioModule.h>
3636

‎FEBio/FEBioFormat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626

2727
#pragma once
2828
#include <XML/XMLReader.h>
29-
#include <MeshTools/FEProject.h>
29+
#include <FEMLib/FSProject.h>
3030
#include <FEMLib/FESurfaceLoad.h>
3131
#include <FEMLib/FEMultiMaterial.h>
3232
#include "FEBioInputModel.h"

‎FEBio/FEBioImport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SOFTWARE.*/
2828

2929
#include <MeshTools/GMaterial.h>
3030
#include <FEMLib/FEMultiMaterial.h>
31-
#include <MeshTools/FEProject.h>
31+
#include <FEMLib/FSProject.h>
3232
#include <MeshIO/FileReader.h>
3333
#include <XML/XMLReader.h>
3434
#include "FEBioFormat.h"

‎FEBio/FEBioInputModel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SOFTWARE.*/
2727
#pragma once
2828
#include <string>
2929
#include <vector>
30-
#include <MeshTools/FEProject.h>
30+
#include <FEMLib/FSProject.h>
3131
#include <FEMLib/FEElementFormulation.h>
3232

3333
class GMeshObject;

‎FEBioLink/FEBioClass.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SOFTWARE.*/
3131
#include <FECore/FEModule.h>
3232
#include <FEBioLib/FEBioModel.h>
3333
#include <FEBioLib/febio.h>
34-
#include <MeshTools/FEModel.h>
34+
#include <FEMLib/FSModel.h>
3535
#include <FEMLib/FEStepComponent.h>
3636
#include <FEMLib/FEBoundaryCondition.h>
3737
#include <FEMLib/FESurfaceLoad.h>
@@ -47,7 +47,7 @@ SOFTWARE.*/
4747
#include <FEMLib/FEDiscreteMaterial.h>
4848
#include <FEMLib/FEElementFormulation.h>
4949
#include <FEMLib/FEMeshDataGenerator.h>
50-
#include <MeshTools/FEModel.h>
50+
#include <FEMLib/FSModel.h>
5151
#include <sstream>
5252
using namespace FEBio;
5353

‎FEBioLink/FEBioInit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626
#include "FEBioInit.h"
2727
#include <FEBioLib/febio.h>
2828
#include <FECore/FEModelUpdate.h>
29-
#include <MeshTools/FEProject.h>
29+
#include <FEMLib/FSProject.h>
3030
#include "FEBioModule.h"
3131

3232
class FBSModelUpdate : public FEModelUpdate

‎FEBioStudio/DlgAddNodalLoad.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SOFTWARE.*/
3434
#include <QFormLayout>
3535
#include <QLineEdit>
3636
#include <QMessageBox>
37-
#include <MeshTools/FEModel.h>
37+
#include <FEMLib/FSModel.h>
3838
#include "InputWidgets.h"
3939

4040
class Ui::CDlgAddNodalLoad

‎FEBioStudio/DlgAddPhysicsItem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SOFTWARE.*/
3535
#include <QHeaderView>
3636
#include <unordered_map>
3737
#include <FEMLib/FEMKernel.h>
38-
#include "MeshTools/FEProject.h"
38+
#include <FEMLib/FSProject.h>
3939
#include "DlgAddPhysicsItem.h"
4040
#include <FEBioLink/FEBioClass.h>
4141
#include <FEBioLink/FEBioModule.h>

‎FEBioStudio/DlgAddRigidConnector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ SOFTWARE.*/
3333
#include <QListWidget>
3434
#include <QFormLayout>
3535
#include <QMessageBox>
36-
#include <MeshTools/FEModel.h>
37-
#include <MeshTools/FEProject.h>
36+
#include <FEMLib/FSModel.h>
37+
#include <FEMLib/FSProject.h>
3838
#include <FEMLib/FEMultiMaterial.h>
3939
#include <FEMLib/FEMKernel.h>
4040
#include <FEBioLink/FEBioInterface.h>

‎FEBioStudio/DlgAddRigidConstraint.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ SOFTWARE.*/
3434
#include <QFormLayout>
3535
#include <QLineEdit>
3636
#include <QMessageBox>
37-
#include <MeshTools/FEModel.h>
38-
#include <MeshTools/FEProject.h>
37+
#include <FEMLib/FSModel.h>
38+
#include <FEMLib/FSProject.h>
3939
#include <FEMLib/FERigidConstraint.h>
4040
#include <FEMLib/FEMultiMaterial.h>
4141
#include <FEMLib/FEMKernel.h>

‎FEBioStudio/DlgAddStep.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ SOFTWARE.*/
3434
#include <QFormLayout>
3535
#include <QLineEdit>
3636
#include <QMessageBox>
37-
#include <MeshTools/FEModel.h>
37+
#include <FEMLib/FSModel.h>
3838
#include "InputWidgets.h"
3939
#include <FEMLib/FEMKernel.h>
40-
#include <MeshTools/FEProject.h>
40+
#include <FEMLib/FSProject.h>
4141

4242
class Ui::CDlgAddStep
4343
{

‎FEBioStudio/DlgEditOutput.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626

2727
#include "stdafx.h"
2828
#include "DlgEditOutput.h"
29-
#include <MeshTools/FEProject.h>
29+
#include <FEMLib/FSProject.h>
3030
#include <GeomLib/GModel.h>
3131
#include <FEMLib/FEMultiMaterial.h>
3232
#include <MeshTools/GGroup.h>

‎FEBioStudio/DlgEditProject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626

2727
#include "stdafx.h"
2828
#include "DlgEditProject.h"
29-
#include <MeshTools/FEProject.h>
29+
#include <FEMLib/FSProject.h>
3030
#include <QListWidget>
3131
#include <QBoxLayout>
3232
#include <QDialogButtonBox>

‎FEBioStudio/DlgMaterialTest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SOFTWARE.*/
3737
#include <QMessageBox>
3838
#include <unordered_map>
3939
#include <FEMLib/FEMKernel.h>
40-
#include "MeshTools/FEProject.h"
40+
#include <FEMLib/FSProject.h>
4141
#include "DlgMaterialTest.h"
4242
#include <FEBioLink/FEBioInterface.h>
4343
#include <FSCore/FSCore.h>

‎FEBioStudio/DocTemplate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SOFTWARE.*/
2929
#include "ModelDocument.h"
3030
#include <QtCore/QDir>
3131
#include <XML/XMLReader.h>
32-
#include <MeshTools/FEProject.h>
32+
#include <FEMLib/FSProject.h>
3333
#include <FEBioLink/FEBioModule.h>
3434
#include <FEBioLink/FEBioClass.h>
3535
#include <GeomLib/GModel.h>

‎FEBioStudio/Document.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2525
SOFTWARE.*/
2626

2727
#pragma once
28-
#include <MeshTools/FEProject.h>
28+
#include <FEMLib/FSProject.h>
2929
#include <MeshTools/FESelection.h>
3030
#include <FSCore/LoadCurve.h>
3131
#include <FSCore/Serializable.h>

‎FEBioStudio/FEClassPropsView.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SOFTWARE.*/
3939
#include "PropertyList.h"
4040
#include "PlotWidget.h"
4141
#include "IconProvider.h"
42-
#include <MeshTools/FEModel.h>
42+
#include <FEMLib/FSModel.h>
4343
#include <FEBioLink/FEBioInterface.h>
4444
#include <FEMLib/FEBase.h>
4545
#include <FEBioLink/FEBioClass.h>

‎FEBioStudio/FEObjectProps.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ SOFTWARE.*/
2929
#include <GeomLib/GObject.h>
3030
#include <FEMLib/FEBoundaryCondition.h>
3131
#include <FEMLib/FEAnalysisStep.h>
32-
#include <MeshTools/FEModel.h>
32+
#include <FEMLib/FSModel.h>
3333
#include <FEMLib/FERigidConstraint.h>
3434
#include <MeshTools/GMaterial.h>
35-
#include <MeshTools/FEProject.h>
35+
#include <FEMLib/FSProject.h>
3636
#include <FEMLib/FEMultiMaterial.h>
3737
#include <FEMLib/FEElementFormulation.h>
3838
#include <FEBioLink/FEBioInterface.h>

‎FEBioStudio/HelpDialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SOFTWARE.*/
3131
#include <QTextBrowser>
3232
#include <QDesktopServices>
3333
#include <QMessageBox>
34-
#include <MeshTools/FEProject.h>
34+
#include <FEMLib/FSProject.h>
3535
#include "HelpDialog.h"
3636
#include "WebDefines.h"
3737
#include "FEBioStudio.h"

‎FEBioStudio/MaterialPropsView.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SOFTWARE.*/
3434
#include <QComboBox>
3535
#include "units.h"
3636
#include "PropertyList.h"
37-
#include <MeshTools/FEModel.h>
37+
#include <FEMLib/FSModel.h>
3838
#include <FEBioLink/FEBioInterface.h>
3939
#include "EditVariableParam.h"
4040

‎FEBioStudio/ModelSearch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOFTWARE.*/
3232
#include <QLabel>
3333
#include <QContextMenuEvent>
3434
#include "Document.h"
35-
#include <MeshTools/FEModel.h>
35+
#include <FEMLib/FSModel.h>
3636
#include "ModelViewer.h"
3737
#include "ModelTree.h"
3838

‎FEBioStudio/ModelTree.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SOFTWARE.*/
2727
#include "stdafx.h"
2828
#include "ModelTree.h"
2929
#include "ModelDocument.h"
30-
#include <MeshTools/FEModel.h>
30+
#include <FEMLib/FSModel.h>
3131
#include <FEMLib/FEMultiMaterial.h>
3232
#include <FEMLib/FEAnalysisStep.h>
3333
#include <FEMLib/FERigidLoad.h>

‎FEBioStudio/ModelTypeInfoReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SOFTWARE.*/
3030
#include "ModelFileReader.h"
3131
#include "FEBioStudio.h"
3232
#include <FEBio/FEBioImport.h>
33-
#include <MeshTools/FEModel.h>
33+
#include <FEMLib/FSModel.h>
3434
#include <GeomLib/GModel.h>
3535
#include <FEMLib/FEAnalysisStep.h>
3636
#include <FEMLib/FEModelConstraint.h>

‎FEBioStudio/menuPhysics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SOFTWARE.*/
3838
#include "DlgAddRigidConnector.h"
3939
#include "MaterialEditor.h"
4040
#include "DlgEditProject.h"
41-
#include <MeshTools/FEModel.h>
41+
#include <FEMLib/FSModel.h>
4242
#include <FEMLib/FEInitialCondition.h>
4343
#include <FEMLib/FEMKernel.h>
4444
#include <FEMLib/FESurfaceLoad.h>

‎FEBioStudio/modelcheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626

2727
#include "stdafx.h"
2828
#include "modelcheck.h"
29-
#include <MeshTools/FEProject.h>
29+
#include <FEMLib/FSProject.h>
3030
#include <PostGL/GLModel.h>
3131
#include <GeomLib/GObject.h>
3232
#include <FEMLib/FEMaterial.h>

‎FEMLib/FEAnalysisStep.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2525
SOFTWARE.*/
2626

2727
#include "FEAnalysisStep.h"
28-
#include <MeshTools/FEModel.h>
29-
#include <FEMLib/FERigidConstraint.h>
30-
#include <FEMLib/FERigidLoad.h>
31-
#include <MeshTools/FEProject.h>
28+
#include "FSModel.h"
29+
#include "FERigidConstraint.h"
30+
#include "FERigidLoad.h"
31+
#include "FSProject.h"
3232
#include "FEInitialCondition.h"
3333
#include "FESurfaceLoad.h"
3434
#include "FEMKernel.h"

‎FEMLib/FEBoundaryCondition.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626

2727
#include "FEBoundaryCondition.h"
2828
#include <MeshLib/FEMesh.h>
29-
#include <MeshTools/FEModel.h>
29+
#include "FSModel.h"
3030
#include <MeshTools/GGroup.h>
3131
#include <FECore/units.h>
3232
#include <FECore/fecore_enum.h>

‎FEMLib/FEConnector.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2525
SOFTWARE.*/
2626

2727
#include "FEConnector.h"
28-
#include <MeshTools/FEModel.h>
28+
#include "FSModel.h"
2929
#include <MeshTools/GGroup.h>
3030
#include <set>
3131
#include <memory>

0 commit comments

Comments
 (0)