Browse Source

AlignToAxis

caizm 2 năm trước cách đây
mục cha
commit
aa86fecc9c
26 tập tin đã thay đổi với 64 bổ sung45 xóa
  1. 5 5
      CAE_Solution/src/VTK/Manager/meshmanager.cpp
  2. 1 1
      CAE_Solution/src/VTK/mesh/PointDS.cpp
  3. 4 4
      CAE_Solution/src/VTK/mesh/mesh.cpp
  4. 1 1
      CAE_Solution/src/VTK/mesh/mesh_adi.cpp
  5. 1 1
      CAE_Solution/src/VTK/mesh/mesh_adi.h
  6. 2 2
      CAE_Solution/src/VTK/mesh/mesh_tecplot.cpp
  7. 1 1
      CAE_Solution/src/VTK/mesh/mesh_tecplot.h
  8. 2 2
      CAE_Solution/src/VTK/mesh/mesh_ugrid.cpp
  9. 1 1
      CAE_Solution/src/VTK/mesh/mesh_ugrid.h
  10. 1 1
      CAE_Solution/src/VTK/mesh/meshbase.cpp
  11. 1 1
      CAE_Solution/src/VTK/mesh/meshstructured.cpp
  12. 1 1
      CAE_Solution/src/VTK/mesh/meshstructured.h
  13. 1 1
      CAE_Solution/src/VTK/mesh/meshunstructured.cpp
  14. 1 1
      CAE_Solution/src/VTK/mesh/meshunstructured.h
  15. 1 2
      CAE_Solution/src/VTK/visualization_VTK/vtkviscameramanager.cpp
  16. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkviscameramanager.h
  17. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkvismanager.cpp
  18. 3 3
      CAE_Solution/src/VTK/visualization_VTK/vtkvismeshbasetovtksource.cpp
  19. 3 3
      CAE_Solution/src/VTK/visualization_VTK/vtkvismeshbasetovtksource.h
  20. 2 2
      CAE_Solution/src/VTK/visualization_VTK/vtkvisunshademesh.cpp
  21. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkvisunshademesh.h
  22. 2 2
      CAE_Solution/src/VTK/visualization_VTK/vtkvisunstructuredgridmanager.cpp
  23. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkvisunstructuredgridmanager.h
  24. 2 1
      CAE_Solution/src/VTK/visualization_VTK/vtkvisunstructuredgridsource.cpp
  25. 1 1
      CAE_Solution/src/VTK/visualization_VTK/vtkvisunstructuredgridsource.h
  26. 23 4
      CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

+ 5 - 5
CAE_Solution/src/VTK/Manager/meshmanager.cpp

@@ -3,13 +3,13 @@
 #include <QString>
 #include <QFileInfo>
 
-#include "../qvtkrenderer/qvtkrenderer.h"
+#include "../QVTKRenderer/qvtkrenderer.h"
 #include "../mesh/mesh.h"
 #include "../mesh/mesh_ugrid.h"
-#include "../visualization_vtk//vtkvisunshademesh.h"
-#include "../visualization_vtk/vtkvisunstructuredgridsource.h"
-#include "../manager/meshmanager.h"
-#include "../visualization_vtk/vtkvismeshbasetovtksource.h"
+#include "../visualization_VTK//vtkvisunshademesh.h"
+#include "../visualization_VTK/vtkvisunstructuredgridsource.h"
+#include "../Manager/meshmanager.h"
+#include "../visualization_VTK/vtkvismeshbasetovtksource.h"
 #include "../mesh/mesh_tecplot.h"
 
 

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

@@ -1,4 +1,4 @@
-#include "PointDS.h"
+#include "PointDS.h".h"
 
 
 

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

@@ -1,8 +1,8 @@
 #include <set>
-#include "MeshBase.h"
-#include "MeshStructured.h"
-#include "MeshUnstructured.h"
-#include "Mesh.h"
+#include "meshbase.h"
+#include "meshstructured.h"
+#include "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 "PointDS.h"
-#include "MeshUnstructured.h"
-#include "Mesh_Tecplot.h"
+#include "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 "PointDS.h"
-#include "MeshUnstructured.h"
-#include "Mesh_UGrid.h"
+#include "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/mesh/meshbase.cpp

@@ -1,4 +1,4 @@
-#include "MeshBase.h"
+#include "meshbase.h"
 
 
 

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

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

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

@@ -1,7 +1,7 @@
 #ifndef MESHSTRUCTURED_H
 #define MESHSTRUCTURED_H
 
-#include "MeshBase.h"
+#include "meshbase.h"
 
 
 

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

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

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

@@ -6,7 +6,7 @@
 using namespace std;
 
 #include "CellDS.h"
-#include "MeshBase.h"
+#include "meshbase.h"
 
 
 

+ 1 - 2
CAE_Solution/src/VTK/visualization_VTK/vtkviscameramanager.cpp

@@ -5,7 +5,7 @@
 #include <vtkObjectFactory.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkInteractorStyleSwitch.h>
-#include "vtkVISCameraManager.h"
+#include "vtkviscameramanager.h"
 
 vtkStandardNewMacro(vtkVISCameraManager)
 
@@ -20,7 +20,6 @@ vtkVISCameraManager::vtkVISCameraManager()
 
 vtkVISCameraManager::~vtkVISCameraManager()
 {
-
 }
 
 void vtkVISCameraManager::GetCamera()//»ñÈ¡ÉãÏñ»ú

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

@@ -2,7 +2,7 @@
 #define vtkVISCameraManager_h
 
 
-#include "vtkVISManager.h"
+#include "vtkvismanager.h"
 class vtkCamera;
 class vtkTransform;
 

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

@@ -8,7 +8,7 @@ VTK_MODULE_INIT(vtkInteractionStyle)
 VTK_MODULE_INIT(vtkRenderingVolumeOpenGL2)
 VTK_MODULE_INIT(vtkRenderingFreeType)
 
-#include "vtkVISManager.h"
+#include "vtkvismanager.h"
 
 vtkStandardNewMacro(vtkVISManager)
 

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

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

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

@@ -2,9 +2,9 @@
 #define VTKVISMESHBASETOVTKSOURCE_H
 
 
-#include "vtkVISManager.h"
-#include "../mesh/MeshBase.h"
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvismanager.h"
+#include "../mesh/meshbase.h"
+#include "vtkvisunstructuredgridsource.h"
 #include <iostream>
 #include <vector>
 using namespace std;

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

@@ -9,8 +9,8 @@
 #include <vtkProperty.h>
 #include <vtkActor.h>
 #include <vtkUnstructuredGrid.h>
-#include "vtkVISUnstructuredGridSource.h"
-#include "vtkVISUnShadeMesh.h"
+#include "vtkvisunstructuredgridsource.h"
+#include "vtkvisunshademesh.h"
 
 vtkStandardNewMacro(vtkVISUnShadeMesh)
 

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

@@ -2,7 +2,7 @@
 #define vtkVISUnShadeMesh_h
 
 
-#include "vtkVISUnstructuredGridManager.h"
+#include "vtkvisunstructuredgridmanager.h"
 
 class  vtkVISUnShadeMesh : public vtkVISUnstructuredGridManager
 {

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

@@ -3,8 +3,8 @@
 #include <vtkObjectFactory.h>
 #include <vtkProperty.h>
 #include <vtkActor.h>
-#include "vtkVISUnstructuredGridSource.h"
-#include "vtkVISUnstructuredGridManager.h"
+#include "vtkvisunstructuredgridsource.h"
+#include "vtkvisunstructuredgridmanager.h"
 
 vtkStandardNewMacro(vtkVISUnstructuredGridManager)
 

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

@@ -2,7 +2,7 @@
 #define vtkVISUnstructuredGridManager_h
 
 
-#include "vtkVISManager.h"
+#include "vtkvismanager.h"
 class vtkActor;
 class vtkVISUnstructuredGridSource;
 

+ 2 - 1
CAE_Solution/src/VTK/visualization_VTK/vtkvisunstructuredgridsource.cpp

@@ -6,7 +6,7 @@
 #include <vtkIdList.h>
 #include <vtkUnstructuredGridWriter.h>
 #include <vtkObjectFactory.h>
-#include "vtkVISUnstructuredGridSource.h"
+#include "vtkvisunstructuredgridsource.h"
 
 vtkStandardNewMacro(vtkVISUnstructuredGridSource)
 
@@ -84,6 +84,7 @@ vtkVISUnstructuredGridSource::~vtkVISUnstructuredGridSource()
 	//   }*/
 	//   
 	//   ErrorInfo(0, "destructure func 7 end.");
+
 }
 
 void vtkVISUnstructuredGridSource::LoadData(char* fileName)

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

@@ -2,7 +2,7 @@
 #define vtkVISUnstructuredGridSource_h
 
 
-#include "vtkVISManager.h"
+#include "vtkvismanager.h"
 
 class vtkUnstructuredGridReader;
 class vtkUnstructuredGrid;

+ 23 - 4
CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -76,9 +76,10 @@ void handlePool::operateRender(QString action,QVTKRenderer* render_)
         //render_->init();
         //emit sendWidget_handlePoolToWidget(render_->GetWidget());
 
-        render_->CaptureWindowImages();
+
     }else if(action == "loaddata"){
-        QString m_filePath="F:\\czm\\adicode\\CAE_Solution\\CAE_Solution\\tf.ugrid";
+        //QString m_filePath="F:\\czm\\adicode\\CAE_Solution\\CAE_Solution\\tf.ugrid";
+        QString m_filePath = "/cephfs/hcfd/solverdown/31f117acb7e74232a3267b091391eab2/hcfd/data_in";
         if(m_filePath.isEmpty())return;
         MeshManager *meshmanager = MeshManager::getInstance();
         bool f = meshmanager->LoadData(m_filePath);
@@ -89,8 +90,26 @@ void handlePool::operateRender(QString action,QVTKRenderer* render_)
             }
         }
         //cout<<"action:"<<action.toStdString()<<endl;
-        render_->CaptureWindowImages();
+        //render_->CaptureWindowImages();
+    }else if(action == "zoomout"){//缩小
+        render_->camera_->ZoomOut();
+    }else if(action == "zoomin"){
+        render_->camera_->ZoomIn();
+    }else if(action == "AlignToPlusAxisX"){//正x轴对齐
+        render_->camera_->AlignToPlusAxisX();
+    }else if(action == "AlignToPlusAxisY"){//正y轴对齐
+        render_->camera_->AlignToPlusAxisY();
+    }else if(action == "AlignToPlusAxisZ"){//正z轴对齐
+        render_->camera_->AlignToPlusAxisZ();
+    }else if(action == "AlignToMinusAxisX"){//负x轴对齐
+        render_->camera_->AlignToMinusAxisX();
+    }else if(action == "AlignToMinusAxisY"){//负y轴对齐
+        render_->camera_->AlignToMinusAxisY();
+    }else if(action == "AlignToMinusAxisZ"){//负z轴对齐
+        render_->camera_->AlignToMinusAxisZ();
+    }else if(action == "RelocateToCenter"){
+        render_->camera_->RelocateToCenter();
     }
-
+    render_->CaptureWindowImages();
 }