Skip to content

Commit 59349a2

Browse files
SteveMaas1978SteveMaas1978
committed
Moved GModel to GeomLib.
1 parent 4537a74 commit 59349a2

File tree

87 files changed

+86
-90
lines changed

Some content is hidden

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

87 files changed

+86
-90
lines changed

‎Abaqus/AbaqusExport.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
#include "AbaqusExport.h"
2727
#include <MeshTools/FEProject.h>
28-
#include <MeshTools/GModel.h>
28+
#include <GeomLib/GModel.h>
2929
#include <GeomLib/GObject.h>
3030

3131
FEAbaqusExport::FEAbaqusExport(FSProject& prj) : FSFileExport(prj)

‎Abaqus/AbaqusImport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SOFTWARE.*/
3535
#include <FEMLib/FEMultiMaterial.h>
3636
#include <FEMLib/FESurfaceLoad.h>
3737
#include <MeshTools/GDiscreteObject.h>
38-
#include <MeshTools/GModel.h>
38+
#include <GeomLib/GModel.h>
3939
#include <FEBioLink/FEBioModule.h>
4040
#include <sstream>
4141
////using namespace std;

‎Ansys/AnsysImport.cpp

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

2727
#include "AnsysImport.h"
2828
#include <GeomLib/GMeshObject.h>
29-
#include <MeshTools/GModel.h>
29+
#include <GeomLib/GModel.h>
3030

3131
AnsysImport::AnsysImport(FSProject& prj) : FSFileImport(prj)
3232
{

‎Comsol/COMSOLImport.cpp

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

2727
#include "COMSOLImport.h"
2828
#include <GeomLib/GMeshObject.h>
29-
#include <MeshTools/GModel.h>
29+
#include <GeomLib/GModel.h>
3030
#include <vector>
3131
//using namespace std;
3232

‎FEBio/FEBioExport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SOFTWARE.*/
3333
#include <FEMLib/FERigidLoad.h>
3434
#include <GeomLib/GObject.h>
3535
#include <MeshTools/GDiscreteObject.h>
36-
#include <MeshTools/GModel.h>
36+
#include <GeomLib/GModel.h>
3737
#include <MeshTools/FEProject.h>
3838
#include <sstream>
3939
#include <iomanip>

‎FEBio/FEBioExport12.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SOFTWARE.*/
3030

3131
#include "FEBioExport12.h"
3232
#include <FEMLib/FERigidConstraint.h>
33-
#include <MeshTools/GModel.h>
33+
#include <GeomLib/GModel.h>
3434
#include <MeshTools/GDiscreteObject.h>
3535
#include <GeomLib/GObject.h>
3636
#include <FEMLib/FEInitialCondition.h>

‎FEBio/FEBioExport2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SOFTWARE.*/
3838
#include <MeshTools/GGroup.h>
3939
#include <MeshTools/FEElementData.h>
4040
#include <MeshTools/FEProject.h>
41-
#include <MeshTools/GModel.h>
41+
#include <GeomLib/GModel.h>
4242
#include <GeomLib/GObject.h>
4343
#include <memory>
4444
#include <FECore/FETransform.h>

‎FEBio/FEBioExport25.cpp

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

‎FEBio/FEBioExport3.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ SOFTWARE.*/
3535
#include <MeshTools/FENodeData.h>
3636
#include <MeshTools/FESurfaceData.h>
3737
#include <MeshTools/FEElementData.h>
38-
#include <MeshTools/GModel.h>
39-
#include <MeshTools/GModel.h>
38+
#include <GeomLib/GModel.h>
4039
#include <MeshTools/FEProject.h>
4140
#include <FEBioLink/FEBioModule.h>
4241
#include <memory>

‎FEBio/FEBioExport4.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ SOFTWARE.*/
3434
#include <MeshTools/FENodeData.h>
3535
#include <MeshTools/FESurfaceData.h>
3636
#include <MeshTools/FEElementData.h>
37-
#include <MeshTools/GModel.h>
38-
#include <MeshTools/GModel.h>
37+
#include <GeomLib/GModel.h>
3938
#include <MeshTools/FEProject.h>
4039
#include <FEBioLink/FEBioModule.h>
4140
#include <memory>

‎FEBio/FEBioFormat12.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOFTWARE.*/
3232
#include <FEMLib/FEBodyLoad.h>
3333
#include <FEMLib/FEModelConstraint.h>
3434
#include <MeshTools/GDiscreteObject.h>
35-
#include <MeshTools/GModel.h>
35+
#include <GeomLib/GModel.h>
3636

3737
FEBioFormat12::FEBioFormat12(FEBioFileImport* fileReader, FEBioInputModel& febio) : FEBioFormat(fileReader, febio)
3838
{

‎FEBio/FEBioFormat2.cpp

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

‎FEBio/FEBioFormat25.cpp

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

‎FEBio/FEBioFormat3.cpp

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

‎FEBio/FEBioFormat4.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SOFTWARE.*/
3737
#include <MeshTools/FEElementData.h>
3838
#include <MeshTools/FESurfaceData.h>
3939
#include <MeshTools/FENodeData.h>
40-
#include <MeshTools/GModel.h>
40+
#include <GeomLib/GModel.h>
4141
#include <MeshTools/GGroup.h>
4242
#include <FEBioLink/FEBioInterface.h>
4343
#include <FEBioLink/FEBioModule.h>

‎FEBio/FEBioFormatOld.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOFTWARE.*/
3232
#include <FEMLib/FEBodyLoad.h>
3333
#include <FEMLib/FEModelConstraint.h>
3434
#include <MeshTools/GDiscreteObject.h>
35-
#include <MeshTools/GModel.h>
35+
#include <GeomLib/GModel.h>
3636
#include <FEBioLink/FEBioModule.h>
3737

3838
FEBioFormatOld::FEBioFormatOld(FEBioFileImport* fileReader, FEBioInputModel& febio) : FEBioFormat(fileReader, febio)

‎FEBio/FEBioImport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SOFTWARE.*/
3333
#include <GeomLib/GMeshObject.h>
3434
#include <FEMLib/FEMultiMaterial.h>
3535
#include <FEBioLink/FEBioModule.h>
36-
#include <MeshTools/GModel.h>
36+
#include <GeomLib/GModel.h>
3737
#include "FEBioFormatOld.h"
3838
#include "FEBioFormat12.h"
3939
#include "FEBioFormat2.h"

‎FEBio/FEBioInputModel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SOFTWARE.*/
2828
#include "FEBioInputModel.h"
2929
#include <GeomLib/GMeshObject.h>
3030
#include <MeshTools/GDiscreteObject.h>
31-
#include <MeshTools/GModel.h>
31+
#include <GeomLib/GModel.h>
3232
#include "FEBioImport.h"
3333
#include <string.h>
3434
#include <stdarg.h>

‎FEBioStudio/Commands.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOFTWARE.*/
3232
#include <MeshTools/FEMesher.h>
3333
#include <GeomLib/GPrimitive.h>
3434
#include <GeomLib/GMultiBox.h>
35-
#include <MeshTools/GModel.h>
35+
#include <GeomLib/GModel.h>
3636
#include <GeomLib/MeshLayer.h>
3737
#include <MeshLib/FEMeshBuilder.h>
3838

‎FEBioStudio/CreatePanel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SOFTWARE.*/
3838
#include "CreateP2PlinePane.h"
3939
#include "CreateSpringPane.h"
4040
#include <GeomLib/GOCCObject.h>
41-
#include <MeshTools/GModel.h>
41+
#include <GeomLib/GModel.h>
4242

4343
//------------------------------------------------------------------------------------------------------------
4444
REGISTER_CLASS2(GBox , CLASS_OBJECT, "Box" , ":/icons/box.png" , 0);

‎FEBioStudio/CreateSpringPane.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ SOFTWARE.*/
4141
#include <GeomLib/GCurveMeshObject.h>
4242
#include <GeomLib/GMeshObject.h>
4343
#include <MeshLib/FECurveMesh.h>
44-
#include <MeshTools/GModel.h>
44+
#include <GeomLib/GModel.h>
4545
#include "GLHighlighter.h"
4646
#include "Commands.h"
4747
#include <FEBioLink/FEBioClass.h>

‎FEBioStudio/CurveEditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SOFTWARE.*/
3737
#include <FEMLib/FEBodyLoad.h>
3838
#include <FEMLib/FERigidLoad.h>
3939
#include <FEMLib/FEModelConstraint.h>
40-
#include <MeshTools/GModel.h>
40+
#include <GeomLib/GModel.h>
4141
#include <sstream>
4242
#include <QDialogButtonBox>
4343
#include <QComboBox>

‎FEBioStudio/CurveIntersectProps.h

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

2727
#pragma once
2828
#include "PropertyList.h"
29-
#include <MeshTools/GModel.h>
29+
#include <GeomLib/GModel.h>
3030
#include <MeshTools/FECurveIntersect.h>
3131

3232
class CCurveIntersectProps : public CDataPropertyList

‎FEBioStudio/CurvePicker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SOFTWARE.*/
3535
#include "FEBioStudio.h"
3636
#include "ModelDocument.h"
3737
#include "Commands.h"
38-
#include <MeshTools/GModel.h>
38+
#include <GeomLib/GModel.h>
3939

4040
class Ui::CCurvePicker
4141
{

‎FEBioStudio/DiscreteElementNetworkTool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <QBoxLayout>
3131
#include <QMessageBox>
3232
#include <MeshLib/FEMesh.h>
33-
#include <MeshTools/GModel.h>
33+
#include <GeomLib/GModel.h>
3434
#include <GeomLib/GMeshObject.h>
3535
#include <FEMLib/FEDiscreteMaterial.h>
3636
#include "MainWindow.h"

‎FEBioStudio/DlgEditOutput.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SOFTWARE.*/
2727
#include "stdafx.h"
2828
#include "DlgEditOutput.h"
2929
#include <MeshTools/FEProject.h>
30-
#include <MeshTools/GModel.h>
30+
#include <GeomLib/GModel.h>
3131
#include <FEMLib/FEMultiMaterial.h>
3232
#include <MeshTools/GGroup.h>
3333
#include <MeshTools/FEGroup.h>

‎FEBioStudio/DocTemplate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOFTWARE.*/
3232
#include <MeshTools/FEProject.h>
3333
#include <FEBioLink/FEBioModule.h>
3434
#include <FEBioLink/FEBioClass.h>
35-
#include <MeshTools/GModel.h>
35+
#include <GeomLib/GModel.h>
3636
#include <MeshTools/GGroup.h>
3737
#include <MeshTools/FEBox.h>
3838
#include <MeshTools/FEMesher.h>

‎FEBioStudio/Document.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ SOFTWARE.*/
5252
#include <PostLib/ImageSource.h>
5353
#include <ImageLib/ImageFilter.h>
5454
#include "ImageThread.h"
55-
#include <MeshTools/GModel.h>
55+
#include <GeomLib/GModel.h>
5656
#include <MeshTools/FENodeData.h>
5757
#include <MeshTools/FESurfaceData.h>
5858
#include <MeshTools/FEElementData.h>

‎FEBioStudio/GLModelScene.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SOFTWARE.*/
2626
#include "GLModelScene.h"
2727
#include "GLView.h"
2828
#include "ModelDocument.h"
29-
#include <MeshTools/GModel.h>
29+
#include <GeomLib/GModel.h>
3030
#include <GeomLib/GObject.h>
3131
#include <GLLib/glx.h>
3232
#include <GLLib/GLMeshRender.h>

‎FEBioStudio/GLView.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SOFTWARE.*/
5959
#include "PostDocument.h"
6060
#include <PostGL/GLPlaneCutPlot.h>
6161
#include <PostGL/GLModel.h>
62-
#include <MeshTools/GModel.h>
62+
#include <GeomLib/GModel.h>
6363
#include "Commands.h"
6464
#include "PostObject.h"
6565
#include <PostLib/ImageSlicer.h>

‎FEBioStudio/ImportSpringsTool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SOFTWARE.*/
2929
#include "ModelDocument.h"
3030
#include <GeomLib/GMeshObject.h>
3131
#include <GeomLib/GSurfaceMeshObject.h>
32-
#include <MeshTools/GModel.h>
32+
#include <GeomLib/GModel.h>
3333
#include <MeshLib/MeshTools.h>
3434
#include <QDir>
3535

‎FEBioStudio/MainWindow.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ SOFTWARE.*/
7171
#include "DlgImportXPLT.h"
7272
#include "Commands.h"
7373
#include <XPLTLib/xpltFileReader.h>
74-
#include <MeshTools/GModel.h>
74+
#include <GeomLib/GModel.h>
7575
#include "DocManager.h"
7676
#include "PostDocument.h"
7777
#include "ModelDocument.h"

‎FEBioStudio/MaterialMapTool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SOFTWARE.*/
3131
#include <PostLib/ColorMap.h>
3232
#include <FEMLib/FEMultiMaterial.h>
3333
#include <GeomLib/GObject.h>
34-
#include <MeshTools/GModel.h>
34+
#include <GeomLib/GModel.h>
3535

3636
CMaterialMapTool::CMaterialMapTool(CMainWindow* wnd) : CBasicTool(wnd, "Material Map", HAS_APPLY_BUTTON)
3737
{

‎FEBioStudio/ModelDocument.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ SOFTWARE.*/
3535
#include "MainWindow.h"
3636
#include "ModelFileWriter.h"
3737
#include <QMessageBox>
38-
#include <MeshTools/GModel.h>
38+
#include <GeomLib/GModel.h>
3939
#include <PostGL/GLPlot.h>
4040
#include <MeshLib/FENodeFaceList.h>
41-
#include <MeshTools/GModel.h>
4241
#include <FEBio/FEBioImport.h>
4342
#include <FEBioLink/FEBioInit.h>
4443
#include "GLModelScene.h"

‎FEBioStudio/ModelPropsPanel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SOFTWARE.*/
5959
#include <CUILib/HistogramViewer.h>
6060
#include <PostLib/ImageModel.h>
6161
#include <PostGL/GLPlot.h>
62-
#include <MeshTools/GModel.h>
62+
#include <GeomLib/GModel.h>
6363
#include "Commands.h"
6464
#include "MaterialPropsView.h"
6565
#include "FEClassPropsView.h"

‎FEBioStudio/ModelTree.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ SOFTWARE.*/
4747
#include <QtCore/QFileInfo>
4848
#include <FEMLib/FELoad.h>
4949
#include <FEMLib/FEModelConstraint.h>
50-
#include <MeshTools/GModel.h>
50+
#include <GeomLib/GModel.h>
5151
#include <MeshTools/GGroup.h>
5252
#include "MainWindow.h"
5353
#include "SSHThread.h"

‎FEBioStudio/ModelTypeInfoReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SOFTWARE.*/
3131
#include "FEBioStudio.h"
3232
#include <FEBio/FEBioImport.h>
3333
#include <MeshTools/FEModel.h>
34-
#include <MeshTools/GModel.h>
34+
#include <GeomLib/GModel.h>
3535
#include <FEMLib/FEAnalysisStep.h>
3636
#include <FEMLib/FEModelConstraint.h>
3737
#include <FEMLib/FERigidConstraint.h>

‎FEBioStudio/ModelViewer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ SOFTWARE.*/
4343
#include <FEMLib/FERigidLoad.h>
4444
#include <GeomLib/GObject.h>
4545
#include <GeomLib/MeshLayer.h>
46-
#include <MeshTools/GModel.h>
46+
#include <GeomLib/GModel.h>
4747
#include "Commands.h"
4848
#include "PropertyList.h"
4949
#include <PostLib/ImageModel.h>

‎FEBioStudio/PostDocument.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SOFTWARE.*/
3333
#include <PostLib/Palette.h>
3434
#include <PostLib/constants.h>
3535
#include <PostGL/GLModel.h>
36-
#include <MeshTools/GModel.h>
36+
#include <GeomLib/GModel.h>
3737
//---------------------------------------
3838
// NOTE: We need to include these FEBio files to make sure we get the correct
3939
// implementations for the type_to_string and string_to_type functions.

‎FEBioStudio/SelectionBox.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SOFTWARE.*/
3939
#include <MeshTools/FEItemListBuilder.h>
4040
#include <MeshTools/GGroup.h>
4141
#include <GeomLib/GObject.h>
42-
#include <MeshTools/GModel.h>
42+
#include <GeomLib/GModel.h>
4343
#include "MainWindow.h"
4444
#include "ModelDocument.h"
4545

‎FEBioStudio/menuEdit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SOFTWARE.*/
4040
#include "PostDocument.h"
4141
#include "XMLDocument.h"
4242
#include "Commands.h"
43-
#include <MeshTools/GModel.h>
43+
#include <GeomLib/GModel.h>
4444
#include <QMessageBox>
4545
#include <QInputDialog>
4646
#include <GeomLib/GPrimitive.h>

‎FEBioStudio/menuFile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ SOFTWARE.*/
104104
#include <PostLib/ImageSource.h>
105105
#include <PostLib/FELSDYNAExport.h>
106106
#include <PostLib/AbaqusExport.h>
107-
#include <MeshTools/GModel.h>
107+
#include <GeomLib/GModel.h>
108108
#include "DlgExportXPLT.h"
109109
#include <XPLTLib/xpltFileExport.h>
110110
#include <iostream>

‎FEBioStudio/menuTools.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SOFTWARE.*/
3737
#include <QMessageBox>
3838
#include <GeomLib/MeshLayer.h>
3939
#include <GeomLib/GObject.h>
40-
#include <MeshTools/GModel.h>
40+
#include <GeomLib/GModel.h>
4141
#include "ModelDocument.h"
4242
#include "PostDocument.h"
4343
#include "DlgStartThread.h"

0 commit comments

Comments
 (0)