caizm преди 2 години
родител
ревизия
4556a5502f

+ 2 - 2
CAE_Solution/conf/conf_recv.txt

@@ -4,6 +4,6 @@ userName:admin
 password:admin
 
 channel_id:1
-queue_name:BLOCKcaein
+queue_name:BLOCKcaeint
 exchange_name:BLOCKMQ-EXCHANGE
-keys_name:caein
+keys_name:caeint

+ 7 - 5
CAE_Solution/src/VTK/mesh/mesh_tecplot.cpp

@@ -93,8 +93,8 @@ bool Mesh_Tecplot::Load_Tecp_Ascii(ifstream &infile)
     for(int i =3;i<var_l.size();i++){
         scalarName_[i-3]=var_l[i].toStdString();
     }
-    while(!infile.eof()){//循环读zone
-
+    //while(!infile.eof()){//循环读zone
+    //while(true){
         int numOfPoint,numOfCell;
         string datatype,celltype;
         celltype.clear();
@@ -109,7 +109,7 @@ bool Mesh_Tecplot::Load_Tecp_Ascii(ifstream &infile)
             QStringList temp_name =temp_vec[i].split("=");
             string temp_name_str = temp_name[0].toStdString();
             for (int j = 0; j < temp_name_str.size(); j++)
-                    temp_name_str[j] = toupper(temp_name_str[j]);
+                    temp_name_str[j] = tolower(temp_name_str[j]);
             if(temp_name_str == "t"){
                 string zone_name=temp_name[1].toStdString();
                 zone_name = zone_name.substr(zone_name.find_first_of("\"")+1);
@@ -197,7 +197,9 @@ bool Mesh_Tecplot::Load_Tecp_Ascii(ifstream &infile)
             }
         }
         SaveData_Ascii(numOfPoint,numOfCell,celltype,cell_vec);
-    }
+        //if(infile.eof())break;
+    //}
+    infile.close();
     return true;
 }
 
@@ -755,7 +757,7 @@ void Mesh_Tecplot::SaveData_Ascii(int numofpoint, int numofcell, string celltype
     PointsDS* points  = new PointsDS();
     points->SetPointNumber(numofpoint);
     for(int i =0;i<numofpoint;i++){
-        points->SetPoint(i,ScalarsData_[0][0][i],ScalarsData_[0][1][i],ScalarsData_[0][2][i]);
+        points->SetPoint(i,ScalarsData_[zoneNumber_-1][0][i],ScalarsData_[zoneNumber_-1][1][i],ScalarsData_[zoneNumber_-1][2][i]);
     }
     zonePointsVec_.push_back(points);
     unMesh->SetPoints(points);

+ 1 - 1
CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -291,7 +291,7 @@ void handlePool::judgeLoaddata(boostJsonObject *object, QVTKRenderer *render_)
 bool handlePool::resultImport(boostJsonObject *object_, QVTKRenderer *renderer_)
 {
     string type_;
-    //object_->fileName = "tfg_part1_tec_volume_timestep100.dat,tfg_part1_tec_volume_timestep200.dat";//单个文件?
+    //object_->fileName = "hcfd_part1_tec_volume_timestep100.dat,hcfd_part1_tec_volume_timestep100.dat";
     //object_->fileName = "whole_part1.plt,whole_part2.plt";
     size_t found = object_->fileName.find_first_of(',');
     if(found==string::npos){//单个文件