centos

CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -77,9 +77,14 @@ void handlePool::operateRender(vtkJsonObject* object,QVTKRenderer* render_)
     }else if(object->action == "loaddata"){
         if(!map_render.contains(object->proId))return;
         render_ = map_render.value(object->proId);
+<<<<<<< HEAD
 
         QString m_filePath = object->filePath;
         //QString m_filePath="F:\\czm\\vtkfile\\tf.ugrid";
+=======
+        //QString m_filePath = object->filePath;
+        QString m_filePath="F:\\czm\\vtkfile\\tf.ugrid";
+>>>>>>> 0705def0fdb523eb562135039be11981574089ed
         //QString m_filePath = "/cephfs/hcfd/solverdown/31f117acb7e74232a3267b091391eab2/hcfd/data_in";
 
         if(m_filePath.isEmpty()){
@@ -98,8 +103,10 @@ void handlePool::operateRender(vtkJsonObject* object,QVTKRenderer* render_)
             for(allActor->InitTraversal(pit);(currActor = allActor->GetNextActor(pit));)
             {
                 render_->GetRenderer()->RemoveActor(currActor);
+                render_->GetRenderer()->GetRenderWindow()->Render();
             }
-            meshmanager->Clear();
+            //meshmanager->Clear();
+            meshmanager =NULL;
             //delete meshmanager;
             meshmanager = new MeshManager();
         }
@@ -112,6 +119,7 @@ void handlePool::operateRender(vtkJsonObject* object,QVTKRenderer* render_)
                 render_->ZoomToExtents();
             }
         }
+        map_manager[object->proId]=meshmanager;
         //cout<<"action:"<<action.toStdString()<<endl;
         //render_->CaptureWindowImages();
     }else if(object->action == "zoomout"){//缩小