diff --git a/src/Material/Material.cpp b/src/Material/Material.cpp index b49a981..01296e4 100644 --- a/src/Material/Material.cpp +++ b/src/Material/Material.cpp @@ -48,7 +48,7 @@ namespace Material QDomElement& Material::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement maele = doc->createElement("Material"); + QDomElement maele = doc->createElement("Material"); maele.setAttribute("Name", _name); maele.setAttribute("Type", _type); if (_needID) diff --git a/src/Material/MaterialSingletion.cpp b/src/Material/MaterialSingletion.cpp index 4962aad..2350b3b 100644 --- a/src/Material/MaterialSingletion.cpp +++ b/src/Material/MaterialSingletion.cpp @@ -71,7 +71,7 @@ void MaterialSingleton::appendMaterial(Material* m) QDomElement& MaterialSingleton::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement mroot = doc->createElement("Materials"); + QDomElement mroot = doc->createElement("Materials"); const int n = _materialList.size(); for (int i = 0; i < n; ++i) { diff --git a/src/ModelData/modelDataBase.cpp b/src/ModelData/modelDataBase.cpp index 8324709..5ab0fea 100644 --- a/src/ModelData/modelDataBase.cpp +++ b/src/ModelData/modelDataBase.cpp @@ -100,7 +100,7 @@ namespace ModelData QDomElement &ModelDataBase::writeToProjectFile(QDomDocument *doc, QDomElement *parent) { - static QDomElement modelEle = doc->createElement("Model"); + QDomElement modelEle = doc->createElement("Model"); modelEle.setAttribute("ID", QString::number(_id)); // modelEle.setAttribute("Name", _name); modelEle.setAttribute("Type", getTreeTypeToSring(_treeType)); diff --git a/src/ModelData/modelDataBaseExtend.cpp b/src/ModelData/modelDataBaseExtend.cpp index 26f788d..5ba6a4a 100644 --- a/src/ModelData/modelDataBaseExtend.cpp +++ b/src/ModelData/modelDataBaseExtend.cpp @@ -80,7 +80,7 @@ namespace ModelData QDomElement& ModelDataBaseExtend::writeToProjectFile(QDomDocument* doc, QDomElement* e) { - static QDomElement element = ModelDataBase::writeToProjectFile(doc, e); + QDomElement element = ModelDataBase::writeToProjectFile(doc, e); QDomElement propele = doc->createElement("Property"); QList setidlist = _setProperty.keys(); for (int i = 0; i < setidlist.size(); ++i) diff --git a/src/ModelData/modelDataSingleton.cpp b/src/ModelData/modelDataSingleton.cpp index ce96a89..6d032f2 100644 --- a/src/ModelData/modelDataSingleton.cpp +++ b/src/ModelData/modelDataSingleton.cpp @@ -108,7 +108,7 @@ namespace ModelData QDomElement& ModelDataSingleton::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement modelElement = doc->createElement("ModelData"); + QDomElement modelElement = doc->createElement("ModelData"); const int nmodel = _modelList.size(); for (int i = 0; i < nmodel; ++i) { diff --git a/src/PluginManager/PluginManager.cpp b/src/PluginManager/PluginManager.cpp index db872b6..569c48c 100644 --- a/src/PluginManager/PluginManager.cpp +++ b/src/PluginManager/PluginManager.cpp @@ -206,7 +206,7 @@ namespace Plugins QDomElement &PluginManager::writeToProjectFile(QDomDocument *doc, QDomElement *parent) { - static QDomElement pgsele = doc->createElement("Plugins"); + QDomElement pgsele = doc->createElement("Plugins"); for (auto p : _pluginList) p->writeToProjectFile(doc, &pgsele); parent->appendChild(pgsele); diff --git a/src/geometry/GeoComponent.cpp b/src/geometry/GeoComponent.cpp index add1fef..f1d21c1 100644 --- a/src/geometry/GeoComponent.cpp +++ b/src/geometry/GeoComponent.cpp @@ -153,7 +153,7 @@ namespace Geometry QDomElement &GeoComponent::writeToProjectFile(QDomDocument *doc, QDomElement *root) { - static QDomElement geoComponent = doc->createElement("GeoComponent"); + QDomElement geoComponent = doc->createElement("GeoComponent"); geoComponent.setAttribute("gcID", getID()); geoComponent.setAttribute("gcName", getName()); geoComponent.setAttribute("gcType", gcTypeToString(_type)); diff --git a/src/geometry/GeometryPy.cpp b/src/geometry/GeometryPy.cpp index e726940..075f088 100644 --- a/src/geometry/GeometryPy.cpp +++ b/src/geometry/GeometryPy.cpp @@ -27,7 +27,7 @@ GEOMETRYAPI char* getGeometrySetNameByIndex(int index) //qDebug() << name; std::string ba = name.toStdString(); const char* ch = ba.c_str(); - static char dest[128] = { 0 }; + char dest[128] = { 0 }; strcpy(dest, ch); return dest; } @@ -41,7 +41,7 @@ GEOMETRYAPI char* getGeometrySetNameByID(int id) qDebug() << name; std::string ba = name.toStdString(); const char* ch = ba.c_str(); - static char dest[128] = { 0 }; + char dest[128] = { 0 }; strcpy(dest, ch); return dest; } diff --git a/src/geometry/geometryData.cpp b/src/geometry/geometryData.cpp index 256fcc5..b3fcd2c 100644 --- a/src/geometry/geometryData.cpp +++ b/src/geometry/geometryData.cpp @@ -177,7 +177,7 @@ namespace Geometry } QDomElement &GeometryData::writeToProjectFile(QDomDocument *doc, QDomElement *element, bool isdiso) { - static QDomElement georoot = doc->createElement("Geometry"); + QDomElement georoot = doc->createElement("Geometry"); element->appendChild(georoot); int n = _geometryList.size(); diff --git a/src/geometry/geometryDatum.cpp b/src/geometry/geometryDatum.cpp index a129864..573f8e5 100644 --- a/src/geometry/geometryDatum.cpp +++ b/src/geometry/geometryDatum.cpp @@ -49,7 +49,7 @@ DatumType GeometryDatum::getDatumType() QDomElement& GeometryDatum::writeToProjectFile(QDomDocument* doc, QDomElement* ele, bool isDiso /* = false */) { - static QDomElement element = doc->createElement("GeoDatum"); //创建子节点 + QDomElement element = doc->createElement("GeoDatum"); //创建子节点 QDomAttr idattr = doc->createAttribute("ID"); idattr.setValue(QString::number(_id)); element.setAttributeNode(idattr); diff --git a/src/geometry/geometryParaBoolOperation.cpp b/src/geometry/geometryParaBoolOperation.cpp index 263f9d3..fa817c8 100644 --- a/src/geometry/geometryParaBoolOperation.cpp +++ b/src/geometry/geometryParaBoolOperation.cpp @@ -67,7 +67,7 @@ BoolType GeometryParaBoolOperation::getType() QDomElement &GeometryParaBoolOperation::writeToProjectFile(QDomDocument *doc, QDomElement *parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaBox.cpp b/src/geometry/geometryParaBox.cpp index 35f0b37..b30047b 100644 --- a/src/geometry/geometryParaBox.cpp +++ b/src/geometry/geometryParaBox.cpp @@ -68,7 +68,7 @@ namespace Geometry QDomElement &GeometryParaBox::writeToProjectFile(QDomDocument *doc, QDomElement *parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaChamfer.cpp b/src/geometry/geometryParaChamfer.cpp index a53fe34..df0ea58 100644 --- a/src/geometry/geometryParaChamfer.cpp +++ b/src/geometry/geometryParaChamfer.cpp @@ -65,7 +65,7 @@ namespace Geometry QDomElement& GeometryParaChamfer::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaCone.cpp b/src/geometry/geometryParaCone.cpp index 6f475cb..e7f406b 100644 --- a/src/geometry/geometryParaCone.cpp +++ b/src/geometry/geometryParaCone.cpp @@ -82,7 +82,7 @@ namespace Geometry QDomElement& GeometryParaCone::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaCylinder.cpp b/src/geometry/geometryParaCylinder.cpp index 093c5d4..6562bb3 100644 --- a/src/geometry/geometryParaCylinder.cpp +++ b/src/geometry/geometryParaCylinder.cpp @@ -72,7 +72,7 @@ namespace Geometry QDomElement& GeometryParaCylinder::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaExtrusion.cpp b/src/geometry/geometryParaExtrusion.cpp index 80ca24a..adaad50 100644 --- a/src/geometry/geometryParaExtrusion.cpp +++ b/src/geometry/geometryParaExtrusion.cpp @@ -73,7 +73,7 @@ namespace Geometry QDomElement& GeometryParaExtrusion::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaFace.cpp b/src/geometry/geometryParaFace.cpp index 89785d3..c4c3f0a 100644 --- a/src/geometry/geometryParaFace.cpp +++ b/src/geometry/geometryParaFace.cpp @@ -35,7 +35,7 @@ namespace Geometry QDomElement& GeometryParaFace::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaFillet.cpp b/src/geometry/geometryParaFillet.cpp index 0071c67..eb5e411 100644 --- a/src/geometry/geometryParaFillet.cpp +++ b/src/geometry/geometryParaFillet.cpp @@ -44,7 +44,7 @@ namespace Geometry QDomElement& GeometryParaFillet::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaGeoSplitter.cpp b/src/geometry/geometryParaGeoSplitter.cpp index 4cf38bf..357cd4b 100644 --- a/src/geometry/geometryParaGeoSplitter.cpp +++ b/src/geometry/geometryParaGeoSplitter.cpp @@ -117,7 +117,7 @@ namespace Geometry QDomElement& GeometryParaGeoSplitter::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaLine.cpp b/src/geometry/geometryParaLine.cpp index fb8f527..9b215f8 100644 --- a/src/geometry/geometryParaLine.cpp +++ b/src/geometry/geometryParaLine.cpp @@ -98,7 +98,7 @@ namespace Geometry QDomElement& GeometryParaLine::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaLoft.cpp b/src/geometry/geometryParaLoft.cpp index 6edd5d8..b16b112 100644 --- a/src/geometry/geometryParaLoft.cpp +++ b/src/geometry/geometryParaLoft.cpp @@ -45,7 +45,7 @@ bool GeometryParaLoft::getSloid() QDomElement& GeometryParaLoft::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaMakeFillGap.cpp b/src/geometry/geometryParaMakeFillGap.cpp index 7e0b667..2397872 100644 --- a/src/geometry/geometryParaMakeFillGap.cpp +++ b/src/geometry/geometryParaMakeFillGap.cpp @@ -33,7 +33,7 @@ namespace Geometry } QDomElement& GeometryParaMakeFillGap::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); @@ -44,7 +44,7 @@ namespace Geometry if (_shapelist.size() == 2) { - static QDomElement body1Ele = doc->createElement("Shape1"); + QDomElement body1Ele = doc->createElement("Shape1"); QDomText body1Text = doc->createTextNode(QString::number(_shapelist.front().first->getID())); body1Ele.appendChild(body1Text); element.appendChild(body1Ele); diff --git a/src/geometry/geometryParaMakeFillHole.cpp b/src/geometry/geometryParaMakeFillHole.cpp index b6150db..e49cdc7 100644 --- a/src/geometry/geometryParaMakeFillHole.cpp +++ b/src/geometry/geometryParaMakeFillHole.cpp @@ -46,7 +46,7 @@ namespace Geometry QDomElement& GeometryParaMakeFillHole::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaMakeMatrix.cpp b/src/geometry/geometryParaMakeMatrix.cpp index 0430d8f..d290b11 100644 --- a/src/geometry/geometryParaMakeMatrix.cpp +++ b/src/geometry/geometryParaMakeMatrix.cpp @@ -212,7 +212,7 @@ namespace Geometry QDomElement& GeometryParaMatrix::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaMakeMirror.cpp b/src/geometry/geometryParaMakeMirror.cpp index 76f2736..82f14f6 100644 --- a/src/geometry/geometryParaMakeMirror.cpp +++ b/src/geometry/geometryParaMakeMirror.cpp @@ -118,7 +118,7 @@ namespace Geometry QDomElement& GeometryParaMirrorFeature::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaMakeMove.cpp b/src/geometry/geometryParaMakeMove.cpp index 77ef2d5..2a9c525 100644 --- a/src/geometry/geometryParaMakeMove.cpp +++ b/src/geometry/geometryParaMakeMove.cpp @@ -122,7 +122,7 @@ namespace Geometry QDomElement& GeometryParaMakeMove::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaMakeRemoveSurface.cpp b/src/geometry/geometryParaMakeRemoveSurface.cpp index 0182b5c..9d9acd4 100644 --- a/src/geometry/geometryParaMakeRemoveSurface.cpp +++ b/src/geometry/geometryParaMakeRemoveSurface.cpp @@ -46,7 +46,7 @@ namespace Geometry QDomElement& GeometryParaMakeRemoveSurface::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaPoint.cpp b/src/geometry/geometryParaPoint.cpp index 8334c07..705063a 100644 --- a/src/geometry/geometryParaPoint.cpp +++ b/src/geometry/geometryParaPoint.cpp @@ -50,7 +50,7 @@ namespace Geometry QDomElement& GeometryParaPoint::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaRevol.cpp b/src/geometry/geometryParaRevol.cpp index 71124dd..39b60fc 100644 --- a/src/geometry/geometryParaRevol.cpp +++ b/src/geometry/geometryParaRevol.cpp @@ -119,7 +119,7 @@ namespace Geometry QDomElement& GeometryParaRevol::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaRotateFeature.cpp b/src/geometry/geometryParaRotateFeature.cpp index 846058b..152c919 100644 --- a/src/geometry/geometryParaRotateFeature.cpp +++ b/src/geometry/geometryParaRotateFeature.cpp @@ -12,7 +12,7 @@ namespace Geometry QDomElement& GeometryParaRotateFeature::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaSphere.cpp b/src/geometry/geometryParaSphere.cpp index ed045c4..dea0ca8 100644 --- a/src/geometry/geometryParaSphere.cpp +++ b/src/geometry/geometryParaSphere.cpp @@ -43,7 +43,7 @@ namespace Geometry QDomElement& GeometryParaSphere::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaSweep.cpp b/src/geometry/geometryParaSweep.cpp index 8a0c135..5de336c 100644 --- a/src/geometry/geometryParaSweep.cpp +++ b/src/geometry/geometryParaSweep.cpp @@ -46,7 +46,7 @@ namespace Geometry QDomElement& GeometryParaSweep::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); element.setAttributeNode(typeattr); diff --git a/src/geometry/geometryParaVariableFillet.cpp b/src/geometry/geometryParaVariableFillet.cpp index abc1906..851577c 100644 --- a/src/geometry/geometryParaVariableFillet.cpp +++ b/src/geometry/geometryParaVariableFillet.cpp @@ -55,7 +55,7 @@ namespace Geometry QDomElement& GeometryParaVariableFillet::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement element = doc->createElement("Parameter"); //创建子节点 + QDomElement element = doc->createElement("Parameter"); //创建子节点 QDomAttr typeattr = doc->createAttribute("Type"); typeattr.setValue(this->typeToString()); diff --git a/src/geometry/geometrySet.cpp b/src/geometry/geometrySet.cpp index 62c97e0..173e70e 100644 --- a/src/geometry/geometrySet.cpp +++ b/src/geometry/geometrySet.cpp @@ -176,7 +176,7 @@ const TopoDS_Shape& GeometrySet::getRealShape(int type, int index) // } QDomElement& GeometrySet::writeToProjectFile(QDomDocument* doc, QDomElement* ele, bool isDiso) { - static QDomElement element = doc->createElement("GeoSet"); //创建子节点 + QDomElement element = doc->createElement("GeoSet"); //创建子节点 QDomAttr idattr = doc->createAttribute("ID"); idattr.setValue(QString::number(_id)); element.setAttributeNode(idattr); diff --git a/src/meshData/CgnsBCZone.cpp b/src/meshData/CgnsBCZone.cpp index 18c2abd..c0fed2e 100644 --- a/src/meshData/CgnsBCZone.cpp +++ b/src/meshData/CgnsBCZone.cpp @@ -44,7 +44,7 @@ namespace MeshData QDomElement& CgnsBCZone::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement setEle = doc->createElement("MeshSet"); + QDomElement setEle = doc->createElement("MeshSet"); QDomAttr idAttr = doc->createAttribute("ID"); idAttr.setValue(QString::number(_id)); diff --git a/src/meshData/CgnsFamily.cpp b/src/meshData/CgnsFamily.cpp index c7bddd2..d5b396b 100644 --- a/src/meshData/CgnsFamily.cpp +++ b/src/meshData/CgnsFamily.cpp @@ -54,7 +54,7 @@ namespace MeshData QDomElement& CgnsFamily::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement setEle = doc->createElement("MeshSet"); + QDomElement setEle = doc->createElement("MeshSet"); QDomAttr idAttr = doc->createAttribute("ID"); idAttr.setValue(QString::number(_id)); diff --git a/src/meshData/MeshPy.cpp b/src/meshData/MeshPy.cpp index b2b4f74..2d9fda4 100644 --- a/src/meshData/MeshPy.cpp +++ b/src/meshData/MeshPy.cpp @@ -17,7 +17,7 @@ MESHDATAAPI const char* getKernalNameByIndexPy(const int index) if (!mk) return ""; std::string cppStr = mk->getName().toStdString(); const char* cStr = cppStr.c_str(); - static char name[128] = { 0 }; + char name[128] = { 0 }; strcpy(name, cStr); return name; } @@ -28,7 +28,7 @@ MESHDATAAPI const char* getKernalNameByKidPy(const int kid) if (!mk) return ""; std::string cppStr = mk->getName().toStdString(); const char* cStr = cppStr.c_str(); - static char name[128] = { 0 }; + char name[128] = { 0 }; strcpy(name, cStr); return name; } @@ -54,7 +54,7 @@ MESHDATAAPI const char* getSetNameByIndexPy(const int index) if (!ms) return ""; std::string cppStr = ms->getName().toStdString(); const char* cStr = cppStr.c_str(); - static char name[128] = { 0 }; + char name[128] = { 0 }; strcpy(name, cStr); return name; } @@ -65,7 +65,7 @@ MESHDATAAPI const char* getSetNameBySidPy(const int sid) if (!ms) return ""; std::string cppStr = ms->getName().toStdString(); const char* cStr = cppStr.c_str(); - static char name[128] = { 0 }; + char name[128] = { 0 }; strcpy(name, cStr); return name; } diff --git a/src/meshData/meshKernal.cpp b/src/meshData/meshKernal.cpp index 820a707..535c669 100644 --- a/src/meshData/meshKernal.cpp +++ b/src/meshData/meshKernal.cpp @@ -105,7 +105,7 @@ namespace MeshData QDomElement& MeshKernal::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement kernelele = doc->createElement("MeshKernel"); + QDomElement kernelele = doc->createElement("MeshKernel"); QDomAttr idAttr = doc->createAttribute("ID"); idAttr.setValue(QString::number(_id)); kernelele.setAttributeNode(idAttr); diff --git a/src/meshData/meshSet.cpp b/src/meshData/meshSet.cpp index 663bc20..3fc0236 100644 --- a/src/meshData/meshSet.cpp +++ b/src/meshData/meshSet.cpp @@ -115,7 +115,7 @@ int MeshSet::getAllCount() QDomElement& MeshSet::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement setEle = doc->createElement("MeshSet"); + QDomElement setEle = doc->createElement("MeshSet"); QDomAttr idAttr = doc->createAttribute("ID"); idAttr.setValue(QString::number(_id)); diff --git a/src/meshData/meshSingleton.cpp b/src/meshData/meshSingleton.cpp index 1281a09..77170f7 100644 --- a/src/meshData/meshSingleton.cpp +++ b/src/meshData/meshSingleton.cpp @@ -135,7 +135,7 @@ namespace MeshData } QDomElement& MeshData::writeToProjectFile(QDomDocument* doc, QDomElement* parent) { - static QDomElement meshNode = doc->createElement("Mesh"); + QDomElement meshNode = doc->createElement("Mesh"); const int n = _meshList.size(); QDomElement meshKernalList = doc->createElement("Kernel"); for (int i = 0; i < n; ++i) diff --git a/src/moduleBase/XRandom.cpp b/src/moduleBase/XRandom.cpp index 33ac281..9366380 100644 --- a/src/moduleBase/XRandom.cpp +++ b/src/moduleBase/XRandom.cpp @@ -91,8 +91,8 @@ XRandom * XRandom::instance() double XRandom::GaussRand_NORMAL() { - static double V1, V2, S; - static int phase = 0; + double V1, V2, S; + int phase = 0; double X; if (phase == 0) { diff --git a/src/moduleBase/messageWindowBase.h b/src/moduleBase/messageWindowBase.h index b45efff..2da1963 100644 --- a/src/moduleBase/messageWindowBase.h +++ b/src/moduleBase/messageWindowBase.h @@ -4,99 +4,93 @@ #ifndef _MESSAGEWINDOWBASE_H_ #define _MESSAGEWINDOWBASE_H_ -#include "moduleBaseAPI.h" +#include "Common/Types.h" #include "dockWidgetBase.h" +#include "moduleBaseAPI.h" +#include "QDateTime" + #include #include -#include "QDateTime" -#include "Common/Types.h" -namespace Ui -{ +namespace Ui { class MessageWindow; } -namespace GUI -{ +namespace GUI { class MainWindow; } -namespace ModuleBase -{ - typedef enum tag_ShowType - { - Normal_Show = 0x01, +namespace ModuleBase { + typedef enum tag_ShowType { + Normal_Show = 0x01, Warning_Show = 0x02, - Error_Show = 0x04, + Error_Show = 0x04, } ShowType; - typedef struct tag_Message - { + typedef struct tag_Message { tag_Message() {} tag_Message(Common::Message _type, QString _message) { - type = _type; + type = _type; message = _message; - time = QTime::currentTime().toString("hh:mm:ss"); + time = QTime::currentTime().toString("hh:mm:ss"); } Common::Message type; - QString message; - QString time; + QString message; + QString time; } Message; - typedef struct tag_TypeMessageColor - { + typedef struct tag_TypeMessageColor { tag_TypeMessageColor() {} tag_TypeMessageColor(Common::Message _type, QColor _typeColor, QColor _itemColor) { - type = _type; + type = _type; typeColor = _typeColor; itemColor = _itemColor; } Common::Message type; - QColor typeColor; - QColor itemColor; + QColor typeColor; + QColor itemColor; } TypeMessageColor; - class MODULEBASEAPI MessageWindowBase : public DockWidgetBase - { + class MODULEBASEAPI MessageWindowBase : public DockWidgetBase { Q_OBJECT public: - MessageWindowBase(GUI::MainWindow *mainwindow, QWidget *parent = 0); + MessageWindowBase(GUI::MainWindow* mainwindow, QWidget* parent = 0); virtual ~MessageWindowBase(); - //翻译 + // 翻译 virtual void reTranslate() override; - //执行python命令 - bool executePyscript(); + // 执行python命令 + bool executePyscript(); // protected slots: virtual void showMessage(QString message); virtual void showMessage(Message message, bool first = true); protected: - Ui::MessageWindow *_ui{}; + Ui::MessageWindow* _ui{}; protected: ///< MG - void setColor(const TypeMessageColor &color); + void setColor(const TypeMessageColor& color); TypeMessageColor color(Common::Message type) const; - void setShow(int mode); + void setShow(int mode); - int show() const; + int show() const; - void setShowType(bool _showType); + void setShowType(bool _showType); - bool showType() const; + bool showType() const; - int font(); + int font(); - void setFont(int _font); + void setFont(int _font); - bool eventFilter(QObject *target, QEvent *event); //事件过滤器 + bool eventFilter(QObject* target, QEvent* event); // 事件过滤器 - bool isParaComaand(); + bool isParaComaand(); private: void updateMessage(); @@ -123,16 +117,16 @@ namespace ModuleBase void slot_clicked_menu_close_action(); private: - int m_showMode{Normal_Show | Warning_Show | Error_Show}; + int m_showMode{ Normal_Show | Warning_Show | Error_Show }; QMap m_typeColors; - bool m_showType{true}; - bool m_showTime{true}; - QVector m_messages; - QMap m_typeNames{}; - int m_fontPts{11}; - QColor m_bkColor{QColor(0, 0, 0)}; + bool m_showType{ true }; + bool m_showTime{ true }; + QVector m_messages; + QMap m_typeNames{}; + int m_fontPts{ 11 }; + QColor m_bkColor{ QColor(0, 0, 0) }; }; -} +} // namespace ModuleBase -//Q_DECLARE_METATYPE(ModuleBase::Message) +Q_DECLARE_METATYPE(ModuleBase::Message) #endif