1115更新

CAE_Solution/src/acis/geometryimexporter.cpp

@@ -136,7 +136,7 @@ bool GeometryImExporter::LoadGeometryFile(const string &inFile,bool state/*=fals
     {
         //geoEntityList_.clear();
         //geomEntities_.clear();
-        //vector<ENTITY_LIST>().swap(geomEntities_);
+        vector<ENTITY_LIST>().swap(geomEntities_);
         this->Clear();
     }
     //// Import Input Geom
@@ -226,7 +226,7 @@ void GeometryImExporter::ImportAssembly(const SPAIopInputPSInstance &iPSInstance
 {
     SPAIopInputPSReference inputReference = iPSInstance.GetReference();
     SPAIopWString referenceStorageName = inputReference.GetStorageName();
-    if (iMissingFiles.ContainsPath(referenceStorageName))  return;
+//    if (iMissingFiles.ContainsPath(referenceStorageName))  return;
     if (inputReference.IsPart())
     {
         ImportPart(inputReference);

CAE_Solution/src/acis/rwritefile.cpp

@@ -145,7 +145,7 @@ void CRWriteFile::WriteNeuFoamFile(const Spa3dpm::Mesh &sub, const char *fileNam
 */
 void CRWriteFile::WirteVtkFoamFile(const Spa3dpm::Mesh &sub, const char *fileName)
 {
-    QFile file(fileName);
+    QFile file(QString::fromUtf8(fileName));
     if (!file.open(QIODevice::WriteOnly))
     {
         return;

CAE_Solution/src/component/manager/geometrymanager.cpp

@@ -40,6 +40,10 @@ GeometryManager::~GeometryManager()
 {
     qvtkRenderer_ = nullptr;
     this->clear();
+    if(this->giExporter){
+        delete this->giExporter;
+        this->giExporter = NULL;
+    }
 }
 
 /**

CAE_Solution/src/main.cpp

@@ -23,6 +23,7 @@ VTK_MODULE_INIT(vtkRenderingFreeType)
 #include "threadPool_and_statemachine/dealWith/boostjsonobject.h"
 #include "VTK/Manager/ResultMeshManager.h"
 #include "Rabbitmq/sendLogMsg/logmsg.h"
+#include <QProcess>
 
 #include "./component/manager/geometrymanager.h"
 
@@ -38,19 +39,20 @@ int main(int argc, char *argv[])
     }
 #endif
     //QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);//opengl共享上下文
+
     QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());//必需
     qRegisterMetaType<std::string>("std::string");
 
     QApplication a(argc, argv);
     Widget w;
-
-//    unlock_license();
+/********************************************/
+//    unlock_license();//test
 //    api_start_modeller(0);//启动ACIS,生成内部数据结构
 //    api_initialize_3dpm_bridge();
 
 //    SPAIopAcisSystem::Shutdown();
 //    SPAIopAcisSystem::Initialize(SPATIAL_LICENSE);
-
+/*************************************************/
     w.resize(QApplication::desktop()->availableGeometry().size());//最大化
     w.move(0,0);
     w.show();
@@ -70,7 +72,9 @@ int main(int argc, char *argv[])
 
     QObject::connect(handle,SIGNAL(sendImg_handlePoolToSendstate(std::string)),sendstate,SLOT(getImg_handlePoolToSendstate(std::string)));
     QObject::connect(recvstate,SIGNAL(sendmsg_recvstateTohandlePool(std::string)),handle,SLOT(getmsg_recvstateTohandlePool(std::string)));
-//    QVTKRenderer* render = new QVTKRenderer();
+
+
+    //    QVTKRenderer* render = new QVTKRenderer();
 //    render->init();
 //    w.addTab(render->GetWidget(),"test");
 //    GeometryManager *gm = new GeometryManager();