0419

CAE_Solution/src/main.cpp

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
         QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     }
 #endif
-    QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());
+    QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());//必需
     qRegisterMetaType<std::string>("std::string");
     QApplication a(argc, argv);
     Widget w;

CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -78,16 +78,9 @@ 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()){
             cout<<"file path is Empty!"<<endl;
             return;