代码优化
parent
88fa821d97
commit
30609c2bb0
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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<int> setidlist = _setProperty.keys();
|
||||
for (int i = 0; i < setidlist.size(); ++i)
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -4,33 +4,29 @@
|
|||
#ifndef _MESSAGEWINDOWBASE_H_
|
||||
#define _MESSAGEWINDOWBASE_H_
|
||||
|
||||
#include "moduleBaseAPI.h"
|
||||
#include "Common/Types.h"
|
||||
#include "dockWidgetBase.h"
|
||||
#include "moduleBaseAPI.h"
|
||||
#include "QDateTime"
|
||||
|
||||
#include <QMap>
|
||||
#include <QMetaType>
|
||||
#include "QDateTime"
|
||||
#include "Common/Types.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
namespace Ui {
|
||||
class MessageWindow;
|
||||
}
|
||||
namespace GUI
|
||||
{
|
||||
namespace GUI {
|
||||
class MainWindow;
|
||||
}
|
||||
|
||||
namespace ModuleBase
|
||||
{
|
||||
typedef enum tag_ShowType
|
||||
{
|
||||
namespace ModuleBase {
|
||||
typedef enum tag_ShowType {
|
||||
Normal_Show = 0x01,
|
||||
Warning_Show = 0x02,
|
||||
Error_Show = 0x04,
|
||||
} ShowType;
|
||||
|
||||
typedef struct tag_Message
|
||||
{
|
||||
typedef struct tag_Message {
|
||||
tag_Message() {}
|
||||
tag_Message(Common::Message _type, QString _message)
|
||||
{
|
||||
|
@ -43,8 +39,7 @@ namespace ModuleBase
|
|||
QString time;
|
||||
} Message;
|
||||
|
||||
typedef struct tag_TypeMessageColor
|
||||
{
|
||||
typedef struct tag_TypeMessageColor {
|
||||
tag_TypeMessageColor() {}
|
||||
tag_TypeMessageColor(Common::Message _type, QColor _typeColor, QColor _itemColor)
|
||||
{
|
||||
|
@ -57,16 +52,15 @@ namespace ModuleBase
|
|||
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命令
|
||||
// 执行python命令
|
||||
bool executePyscript();
|
||||
//
|
||||
protected slots:
|
||||
|
@ -74,11 +68,11 @@ namespace ModuleBase
|
|||
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;
|
||||
|
||||
|
@ -94,7 +88,7 @@ namespace ModuleBase
|
|||
|
||||
void setFont(int _font);
|
||||
|
||||
bool eventFilter(QObject *target, QEvent *event); //事件过滤器
|
||||
bool eventFilter(QObject* target, QEvent* event); // 事件过滤器
|
||||
|
||||
bool isParaComaand();
|
||||
|
||||
|
@ -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<Common::Message, TypeMessageColor> m_typeColors;
|
||||
bool m_showType{true};
|
||||
bool m_showTime{true};
|
||||
bool m_showType{ true };
|
||||
bool m_showTime{ true };
|
||||
QVector<Message> m_messages;
|
||||
QMap<Common::Message, QString> m_typeNames{};
|
||||
int m_fontPts{11};
|
||||
QColor m_bkColor{QColor(0, 0, 0)};
|
||||
int m_fontPts{ 11 };
|
||||
QColor m_bkColor{ QColor(0, 0, 0) };
|
||||
};
|
||||
}
|
||||
} // namespace ModuleBase
|
||||
|
||||
//Q_DECLARE_METATYPE(ModuleBase::Message)
|
||||
Q_DECLARE_METATYPE(ModuleBase::Message)
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue