Ver Fonte

centos bianyi

caizm há 2 anos atrás
pai
commit
9024129f8b
33 ficheiros alterados com 54 adições e 54 exclusões
  1. 7 7
      CAE_Solution/src/VTK/Manager/ResultMeshManager.cpp
  2. 1 1
      CAE_Solution/src/VTK/Manager/ResultMeshManager.h
  3. 1 1
      CAE_Solution/src/VTK/MeshDS/meshstructured.cpp
  4. 1 1
      CAE_Solution/src/VTK/MeshDS/meshunstructured.cpp
  5. 1 1
      CAE_Solution/src/VTK/VTK.pri
  6. 1 1
      CAE_Solution/src/VTK/display/linedisplay.h
  7. 1 1
      CAE_Solution/src/VTK/display/slicewidget.cpp
  8. 1 1
      CAE_Solution/src/VTK/display/slicewidget.h
  9. 1 1
      CAE_Solution/src/VTK/display/solidsurfacewidget.h
  10. 1 1
      CAE_Solution/src/VTK/display/streamwidget.cpp
  11. 1 1
      CAE_Solution/src/VTK/display/vectordisplay.h
  12. 1 1
      CAE_Solution/src/VTK/mesh/Mesh_CSDInp.cpp
  13. 1 1
      CAE_Solution/src/VTK/mesh/Mesh_CSDInp.h
  14. 2 2
      CAE_Solution/src/VTK/mesh/Mesh_Frd.h
  15. 3 3
      CAE_Solution/src/VTK/mesh/mesh.cpp
  16. 1 1
      CAE_Solution/src/VTK/mesh/mesh_adi.cpp
  17. 1 1
      CAE_Solution/src/VTK/mesh/mesh_adi.h
  18. 2 2
      CAE_Solution/src/VTK/mesh/mesh_tecplot.cpp
  19. 1 1
      CAE_Solution/src/VTK/mesh/mesh_tecplot.h
  20. 2 2
      CAE_Solution/src/VTK/mesh/mesh_ugrid.cpp
  21. 1 1
      CAE_Solution/src/VTK/mesh/mesh_ugrid.h
  22. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkVISAddUnGridDataSource.cpp
  23. 2 2
      CAE_Solution/src/VTK/visualization_VTK/vtkVISAddUnGridDataSource.h
  24. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkVISMeshToVTKSource.cpp
  25. 3 3
      CAE_Solution/src/VTK/visualization_VTK/vtkVISMeshToVTKSource.h
  26. 3 3
      CAE_Solution/src/VTK/visualization_VTK/vtkVISUnContour.h
  27. 3 3
      CAE_Solution/src/VTK/visualization_VTK/vtkVISUnGlyph.h
  28. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkVISUnSlice.cpp
  29. 2 2
      CAE_Solution/src/VTK/visualization_VTK/vtkVISUnSlice.h
  30. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkVISUnStreamTrace.cpp
  31. 2 2
      CAE_Solution/src/VTK/visualization_VTK/vtkVISUnStreamTrace.h
  32. 2 2
      CAE_Solution/src/VTK/visualization_VTK/vtkvismeshbasetovtksource.cpp
  33. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkvismeshbasetovtksource.h

+ 7 - 7
CAE_Solution/src/VTK/Manager/ResultMeshManager.cpp

@@ -3,17 +3,17 @@
 #include <QString>
 #include <QFileInfo>
 #include "../QVTKRenderer/qvtkrenderer.h"
-#include "../mesh/Mesh.h"
-#include "../meshds/MeshBase.h"
-#include "../mesh/Mesh_UGrid.h"
+#include "../mesh/mesh.h"
+#include "../MeshDS/MeshBase.h"
+#include "../mesh/mesh_ugrid.h"
 
 #include "../visualization_VTK/vtkVISUnContour.h"
-#include "../visualization_VTK/vtkVISUnstructuredGridSource.h"
+#include "../visualization_VTK/vtkvisunstructuredgridsource.h"
 #include "ResultMeshManager.h"
 #include "../visualization_VTK/vtkVISMeshToVTKSource.h"
-#include "../mesh/Mesh_Tecplot.h"
+#include "../mesh/mesh_tecplot.h"
 #include "../mesh/Mesh_Frd.h"
-#include "../visualization_VTK/vtkVISUnShadeMesh.h"
+#include "../visualization_VTK/vtkvisunshademesh.h"
 #include "../visualization_VTK/vtkVISUnGlyph.h"
 //#include "contourinimation.h"
 #include "../display/slicewidget.h"
@@ -23,7 +23,7 @@
 #include <QDebug>
 #include <QMessageBox>
 #include <vtkTextActor.h>
-#include "../visualization_VTK/vtkVISMeshBaseToVTKSource.h"
+#include "../visualization_VTK/vtkvismeshbasetovtksource.h"
 #include "vtkPoints.h"
 
 

+ 1 - 1
CAE_Solution/src/VTK/Manager/ResultMeshManager.h

@@ -14,7 +14,7 @@
 #include "../visualization_VTK/vtkVISUnStreamTrace.h"
 
 
-#include "../meshds/PointDS.h"
+#include "../MeshDS/PointDS.h"
 using namespace std;
 
 #include <set>

+ 1 - 1
CAE_Solution/src/VTK/MeshDS/meshstructured.cpp

@@ -1,4 +1,4 @@
-#include "MeshStructured.h"
+#include "meshstructured.h"
 
 
 

+ 1 - 1
CAE_Solution/src/VTK/MeshDS/meshunstructured.cpp

@@ -1,5 +1,5 @@
 #include "CellDS.h"
-#include "MeshUnstructured.h"
+#include "meshunstructured.h"
 
 
 

+ 1 - 1
CAE_Solution/src/VTK/VTK.pri

@@ -3,4 +3,4 @@ include( $$PWD/mesh/mesh.pri)#存储几何数据的类
 include( $$PWD/QVTKRenderer/QVTKRenderer.pri)#封装vtkrenderer的渲染类
 include( $$PWD/visualization_VTK/visualization_VTK.pri)#接口,切片,管理相机,数据存储,捕获渲染图等
 include( $$PWD/display/display.pri)#等值线、标量等
-include( $$PWD/meshds/meshds.pri)
+include( $$PWD/MeshDS/MeshDS.pri)

+ 1 - 1
CAE_Solution/src/VTK/display/linedisplay.h

@@ -3,7 +3,7 @@
 #include <QObject>
 #include <map>
 #include <string>
-#include "../manager/ResultMeshManager.h"
+#include "../Manager/ResultMeshManager.h"
 #include "../../threadPool_and_statemachine/dealWith/vtkjsonobject.h"
 
 

+ 1 - 1
CAE_Solution/src/VTK/display/slicewidget.cpp

@@ -1,5 +1,5 @@
 #include "slicewidget.h"
-#include "../manager/ResultMeshManager.h"
+#include "../Manager/ResultMeshManager.h"
 
 /*
  * @brief: the constructor

+ 1 - 1
CAE_Solution/src/VTK/display/slicewidget.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <QObject>
-#include "../manager/ResultMeshManager.h"
+#include "../Manager/ResultMeshManager.h"
 
 class SliceWidget
 {

+ 1 - 1
CAE_Solution/src/VTK/display/solidsurfacewidget.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <QObject>
-#include "../manager/ResultMeshManager.h"
+#include "../Manager/ResultMeshManager.h"
 
 class SolidSurface
 {

+ 1 - 1
CAE_Solution/src/VTK/display/streamwidget.cpp

@@ -1,5 +1,5 @@
 #include "streamwidget.h"
-#include "../manager/ResultMeshManager.h"
+#include "../Manager/ResultMeshManager.h"
 
 StreamWidget::StreamWidget()
 {

+ 1 - 1
CAE_Solution/src/VTK/display/vectordisplay.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <QObject>
-#include "../manager/ResultMeshManager.h"
+#include "../Manager/ResultMeshManager.h"
 
 class Vectordisplay
 {

+ 1 - 1
CAE_Solution/src/VTK/mesh/Mesh_CSDInp.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <sstream>
 #include "../MeshDS/PointDS.h"
-#include "../MeshDS/MeshUnstructured.h"
+#include "../MeshDS/meshunstructured.h"
 #include "Mesh_CSDInp.h"
 
 

+ 1 - 1
CAE_Solution/src/VTK/mesh/Mesh_CSDInp.h

@@ -4,7 +4,7 @@
 #include <fstream>
 #include <map>
 using namespace std;
-#include "Mesh.h"
+#include "mesh.h"
 
 
 

+ 2 - 2
CAE_Solution/src/VTK/mesh/Mesh_Frd.h

@@ -4,12 +4,12 @@
 #include <fstream>
 #include <iostream>
 using namespace std;
-#include "Mesh.h"
+#include "mesh.h"
 #include <vector>
 #include <map>
 #include <set>
 #include "../MeshDS/PointDS.h"
-#include "../MeshDS/MeshUnstructured.h"
+#include "../MeshDS/meshunstructured.h"
 
 
 class vtkDoubleArray;

+ 3 - 3
CAE_Solution/src/VTK/mesh/mesh.cpp

@@ -1,8 +1,8 @@
 #include <set>
 #include "../MeshDS/MeshBase.h"
-#include "../MeshDS/MeshStructured.h"
-#include "../MeshDS/MeshUnstructured.h"
-#include "Mesh.h"
+#include "../MeshDS/meshstructured.h"
+#include "../MeshDS/meshunstructured.h"
+#include "mesh.h"
 #include <iostream>
 
 

+ 1 - 1
CAE_Solution/src/VTK/mesh/mesh_adi.cpp

@@ -1,6 +1,6 @@
 #include <fstream>
 using namespace std;
-#include "Mesh_ADI.h"
+#include "mesh_adi.h"
 
 
 

+ 1 - 1
CAE_Solution/src/VTK/mesh/mesh_adi.h

@@ -1,7 +1,7 @@
 #ifndef MESH_ADI_H
 #define MESH_ADI_H
 
-#include "Mesh.h"
+#include "mesh.h"
 
 
 

+ 2 - 2
CAE_Solution/src/VTK/mesh/mesh_tecplot.cpp

@@ -1,7 +1,7 @@
 #include <vtkDoubleArray.h>
 #include "../MeshDS/PointDS.h"
-#include "../MeshDS/MeshUnstructured.h"
-#include "Mesh_Tecplot.h"
+#include "../MeshDS/meshunstructured.h"
+#include "mesh_tecplot.h"
 
 
 

+ 1 - 1
CAE_Solution/src/VTK/mesh/mesh_tecplot.h

@@ -4,7 +4,7 @@
 #include <fstream>
 #include <iostream>
 using namespace std;
-#include "Mesh.h"
+#include "mesh.h"
 
 class vtkDoubleArray;
 

+ 2 - 2
CAE_Solution/src/VTK/mesh/mesh_ugrid.cpp

@@ -1,6 +1,6 @@
 #include "../MeshDS/PointDS.h"
-#include "../MeshDS/MeshUnstructured.h"
-#include "Mesh_UGrid.h"
+#include "../MeshDS/meshunstructured.h"
+#include "mesh_ugrid.h"
 
 
 

+ 1 - 1
CAE_Solution/src/VTK/mesh/mesh_ugrid.h

@@ -2,7 +2,7 @@
 #define MESH_UGRID_H
 #include <fstream>
 using namespace std;
-#include "Mesh.h"
+#include "mesh.h"
 
 
 

+ 1 - 1
CAE_Solution/src/VTK/visualization_VTK/vtkVISAddUnGridDataSource.cpp

@@ -2,7 +2,7 @@
 #include <algorithm>
 #include <vtkUnstructuredGrid.h>
 #include <vtkDoubleArray.h>
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <vtkPointData.h>
 #include <vtkCellData.h>
 #include <vtkProperty.h>

+ 2 - 2
CAE_Solution/src/VTK/visualization_VTK/vtkVISAddUnGridDataSource.h

@@ -5,8 +5,8 @@
 #include <iostream>
 using namespace std;
 
-#include "vtkVISManager.h"
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvismanager.h"
+#include "vtkvisunstructuredgridsource.h"
 #include "vtkUnstructuredGridReader.h"
 #include "vtkPointData.h"
 #include "vtkCellData.h"

+ 1 - 1
CAE_Solution/src/VTK/visualization_VTK/vtkVISMeshToVTKSource.cpp

@@ -1,7 +1,7 @@
 #include <vtkObjectFactory.h>
 #include "vtkVISMeshToVTKSource.h"
 #include "../MeshDS/MeshBase.h"
-#include "../MeshDS/MeshUnstructured.h"
+#include "../MeshDS/meshunstructured.h"
 #include "vtkUnstructuredGrid.h"
 #include "vtkPoints.h"
 #include "vtkLine.h"

+ 3 - 3
CAE_Solution/src/VTK/visualization_VTK/vtkVISMeshToVTKSource.h

@@ -2,10 +2,10 @@
 #define VTKVISMESHTOVTKSOURCE_H
 
 
-#include "vtkVISManager.h"
+#include "vtkvismanager.h"
 #include "../MeshDS/MeshBase.h"
-#include "../Mesh/Mesh.h"
-#include "vtkVISUnstructuredGridSource.h"
+#include "../mesh/mesh.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <iostream>
 #include <vector>
 using namespace std;

+ 3 - 3
CAE_Solution/src/VTK/visualization_VTK/vtkVISUnContour.h

@@ -5,8 +5,8 @@
 #include <iostream>
 #include <string>
 
-#include "vtkVISManager.h"
-#include "vtkVISUnstructuredGridManager.h"
+#include "vtkvismanager.h"
+#include "vtkvisunstructuredgridmanager.h"
 #include <vtkGeometryFilter.h>
 #include <vtkPolyDataNormals.h>
 #include <vtkFloatArray.h>
@@ -25,7 +25,7 @@
 #include <vtkUnstructuredGrid.h>
 #include <vtkActor.h>
 #include <vtkDoubleArray.h>
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <vtkProperty.h>
 #include <vtkRenderer.h>
 #include <vtkRenderWindow.h>

+ 3 - 3
CAE_Solution/src/VTK/visualization_VTK/vtkVISUnGlyph.h

@@ -3,8 +3,8 @@
 
 
 #include <iostream>
-#include "vtkVISManager.h"
-#include "vtkVISUnstructuredGridManager.h"
+#include "vtkvismanager.h"
+#include "vtkvisunstructuredgridmanager.h"
 #include <vtkGeometryFilter.h>
 #include <vtkPolyDataNormals.h>
 #include <vtkFloatArray.h>
@@ -23,7 +23,7 @@
 #include <vtkUnstructuredGrid.h>
 #include <vtkActor.h>
 #include <vtkDoubleArray.h>
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <vtkProperty.h>
 #include <vtkRenderer.h>
 #include <vtkRenderWindow.h>

+ 1 - 1
CAE_Solution/src/VTK/visualization_VTK/vtkVISUnSlice.cpp

@@ -11,7 +11,7 @@
 #include <vtkRenderer.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkDoubleArray.h>
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <vtkPointData.h>
 #include <vtkCellData.h>
 #include <vtkRenderWindow.h>

+ 2 - 2
CAE_Solution/src/VTK/visualization_VTK/vtkVISUnSlice.h

@@ -3,8 +3,8 @@
 #include <iostream>
 using namespace std;
 
-#include "vtkVISManager.h"
-#include "vtkVISUnstructuredGridManager.h"
+#include "vtkvismanager.h"
+#include "vtkvisunstructuredgridmanager.h"
 
 
 #include "vtkPlane.h"

+ 1 - 1
CAE_Solution/src/VTK/visualization_VTK/vtkVISUnStreamTrace.cpp

@@ -5,7 +5,7 @@
 #include <vtkRenderer.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkDoubleArray.h>
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <vtkPointData.h>
 #include <vtkCellData.h>
 #include <vtkRenderWindow.h>

+ 2 - 2
CAE_Solution/src/VTK/visualization_VTK/vtkVISUnStreamTrace.h

@@ -4,8 +4,8 @@
 using namespace std;
 
 
-#include "vtkVISManager.h"
-#include "vtkVISUnstructuredGridManager.h"
+#include "vtkvismanager.h"
+#include "vtkvisunstructuredgridmanager.h"
 
 #include "vtkLineWidget.h"
 #include "vtkMultiBlockDataSet.h"

+ 2 - 2
CAE_Solution/src/VTK/visualization_VTK/vtkvismeshbasetovtksource.cpp

@@ -1,7 +1,7 @@
 #include <vtkObjectFactory.h>
 #include "vtkvismeshbasetovtksource.h"
-#include "../meshds/meshbase.h"
-#include "../meshds/meshunstructured.h"
+#include "../MeshDS/MeshBase.h"
+#include "../MeshDS/meshunstructured.h"
 #include "vtkUnstructuredGrid.h"
 #include "vtkPoints.h"
 #include "vtkLine.h"

+ 1 - 1
CAE_Solution/src/VTK/visualization_VTK/vtkvismeshbasetovtksource.h

@@ -3,7 +3,7 @@
 
 
 #include "vtkvismanager.h"
-#include "../meshds/meshbase.h"
+#include "../MeshDS/MeshBase.h"
 #include "vtkvisunstructuredgridsource.h"
 #include <iostream>
 #include <vector>