palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-05 02:26:11 +02:00
Code Issues Projects Releases Wiki Activity

Code style

Browse source 
--HG--
branch : XML Editor
This commit is contained in:
Patrick Proy 2014-05-16 16:49:58 +02:00
parent f51f703026
commit c1bf6c8a73
3 changed files with 369 additions and 253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

525
src/app/dialogs/app/dialogpatternxmledit.cpp
View file

@ -35,14 +35,12 @@ const short int DialogPatternXmlEdit::ChangeTypeDelete=1;
const short int DialogPatternXmlEdit::ChangeTypeAdd=2; const short int DialogPatternXmlEdit::ChangeTypeAdd=2;
const short int DialogPatternXmlEdit::ChangeTypeModify=3; const short int DialogPatternXmlEdit::ChangeTypeModify=3;
DialogPatternXmlEdit::DialogPatternXmlEdit(QWidget *parent,VPattern *xmldoc) : DialogPatternXmlEdit::DialogPatternXmlEdit(QWidget *parent,VPattern *xmldoc):QDialog(parent),ui(new Ui::DialogPatternXmlEdit)
QDialog(parent),
ui(new Ui::DialogPatternXmlEdit)
{ {
ui->setupUi(this); ui->setupUi(this);
xmlmodel = new vXMLTreeView(); xmlmodel = new VXMLTreeView();
current_node_edited=0; currentNodeEdited=0;
treeChange=false; treeChange=false;
this->changeStackRoot = this->changeStackLast =0; this->changeStackRoot = this->changeStackLast =0;
@ -58,80 +56,52 @@ DialogPatternXmlEdit::DialogPatternXmlEdit(QWidget *parent,VPattern *xmldoc) :
rootNode = (QStandardItem*) xmlmodel->invisibleRootItem(); rootNode = (QStandardItem*) xmlmodel->invisibleRootItem();
qint16 drawnum=xmldoc->elementsByTagName("draw").size(); qint16 drawnum=xmldoc->elementsByTagName("draw").size();
rootBases = (vXMLTreeElement**)malloc(sizeof(vXMLTreeElement*)*(drawnum+1)); rootBases = new VXMLTreeElement*[drawnum+1];
rootBasesNum=1; rootBasesNum=1;
rootBases[0]=new vXMLTreeElement("Valentina",vXMLTreeElement::TypeRoot,root,false); rootBases[0]=new VXMLTreeElement("Valentina",VXMLTreeElement::TypeRoot,root,false);
// TODO : OOM exception. // TODO : OOM exception.
vXMLTreeElement* standard_base = new vXMLTreeElement("Valentina",vXMLTreeElement::TypeRoot,root,false); VXMLTreeElement* standard_base = new VXMLTreeElement("Valentina",VXMLTreeElement::TypeRoot,root,false);
ui->comboBox_Base_Selection->addItem(tr("All drawings"),QVariant(0)); ui->comboBox_Base_Selection->addItem(tr("All drawings"),QVariant(0));
//rootBases[0]=(QDomNode) doc->DocumentNode; //rootBases[0]=(QDomNode) doc->DocumentNode;
rootNode->appendRow(standard_base); rootNode->appendRow(standard_base);
readNodes(root,standard_base,xmlmodel,false); ReadNodes(root,standard_base,xmlmodel,false);
ui->treeView_main->setModel(xmlmodel); ui->treeView_main->setModel(xmlmodel);
//ui->treeView_main->expandAll(); //ui->treeView_main->expandAll();
// connectors // connectors
connect(ui->comboBox_Base_Selection, connect(ui->comboBox_Base_Selection,static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),this,&DialogPatternXmlEdit::BaseSelectionChanged);
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), connect(ui->treeView_main,&QTreeView::clicked,this,&DialogPatternXmlEdit::ElementClicked);
this, connect(ui->lineEdit_Name,&QLineEdit::textEdited,this,&DialogPatternXmlEdit::NameTextEdited);
&DialogPatternXmlEdit::baseSelectionChanged); connect(ui->lineEdit_Value,&QLineEdit::textEdited,this,&DialogPatternXmlEdit::ValueTextEdited);
connect(ui->treeView_main, connect(ui->pushButton_Set_Values,&QPushButton::clicked,this,&DialogPatternXmlEdit::ButtonSetClicked);
&QTreeView::clicked, connect(ui->pushButton_Cancel_Values,&QPushButton::clicked,this,&DialogPatternXmlEdit::ButtonCancelClicked);
this, connect(ui->pushButton_Remove_attribute,&QPushButton::clicked,this,&DialogPatternXmlEdit::ButtonDeleteAttributeClicked);
&DialogPatternXmlEdit::Element_clicked); connect(ui->pushButton_Add_son,&QPushButton::clicked,this,&DialogPatternXmlEdit::ButtonAddSonClicked);
connect(ui->lineEdit_Name, connect(ui->pushButton_Add_attribute,&QPushButton::clicked,this,&DialogPatternXmlEdit::ButtonAddAttributeClicked);
&QLineEdit::textEdited, connect(ui->pushButton_Apply_Changes,&QPushButton::clicked,this,&DialogPatternXmlEdit::ButtonApplyChangesClicked);
this,
&DialogPatternXmlEdit::nameTextEdited
);
connect(ui->lineEdit_Value,
&QLineEdit::textEdited,
this,
&DialogPatternXmlEdit::valueTextEdited
);
connect(ui->pushButton_Set_Values,
&QPushButton::clicked,
this,
&DialogPatternXmlEdit::ButtonSetClicked);
connect(ui->pushButton_Cancel_Values,
&QPushButton::clicked,
this,
&DialogPatternXmlEdit::ButtonCancelClicked);
connect(ui->pushButton_Remove_attribute,
&QPushButton::clicked,
this,
&DialogPatternXmlEdit::ButtonDeleteAttributeClicked);
connect(ui->pushButton_Add_son,
&QPushButton::clicked,
this,
&DialogPatternXmlEdit::ButtonAddSonClicked);
connect(ui->pushButton_Add_attribute,
&QPushButton::clicked,
this,
&DialogPatternXmlEdit::ButtonAddAttributeClicked);
connect(ui->pushButton_Apply_Changes,
&QPushButton::clicked,
this,
&DialogPatternXmlEdit::ButtonApplyChangesClicked);
} }
DialogPatternXmlEdit::ChangesStackElement* DialogPatternXmlEdit::CreateStackElement(short int typechange) { DialogPatternXmlEdit::ChangesStackElement* DialogPatternXmlEdit::CreateStackElement(short int typechange)
{
ChangesStackElement* tmp; ChangesStackElement* tmp;
tmp= (ChangesStackElement* ) malloc(sizeof(ChangesStackElement)); tmp= new ChangesStackElement;
//if (tmp==0) TODO //if (tmp==0) TODO
tmp->type=typechange; tmp->type=typechange;
tmp->changedText=tmp->changedValue=false; tmp->changedText=tmp->changedValue=false;
if (changeStackLast==0) { if (changeStackLast==0)
{
changeStackLast=changeStackRoot=tmp; changeStackLast=changeStackRoot=tmp;
} else { }
else
{
changeStackLast->next=tmp; changeStackLast->next=tmp;
changeStackLast=changeStackLast->next; changeStackLast=changeStackLast->next;
} }
@ -140,29 +110,42 @@ DialogPatternXmlEdit::ChangesStackElement* DialogPatternXmlEdit::CreateStackElem
return changeStackLast; return changeStackLast;
} }
void DialogPatternXmlEdit::ButtonApplyChangesClicked() { void DialogPatternXmlEdit::ButtonApplyChangesClicked()
{
QString Changes=""; QString Changes="";
ChangesStackElement* currentChange; ChangesStackElement* currentChange;
if (this->changeStackRoot==0) Changes="No Changes"; if (this->changeStackRoot==0)
else { {
Changes="No Changes";
}
else
{
currentChange=this->changeStackRoot; currentChange=this->changeStackRoot;
do { do
if (currentChange->type == DialogPatternXmlEdit::ChangeTypeAdd) { {
if (currentChange->type == DialogPatternXmlEdit::ChangeTypeAdd)
{
Changes += QString("Added type %1 : ").arg(currentChange->element->getelementType()); Changes += QString("Added type %1 : ").arg(currentChange->element->getelementType());
Changes += currentChange->element->gettreeNodeName(); Changes += currentChange->element->gettreeNodeName();
Changes += "/"; Changes += "/";
Changes += (currentChange->element->gettreeNodeValueSet()) ? Changes += (currentChange->element->gettreeNodeValueSet()) ?
currentChange->element->gettreeNodeValue(): QString(tr("<no value>")); currentChange->element->gettreeNodeValue(): QString(tr("<no value>"));
Changes += "\n"; Changes += "\n";
} else { }
if (currentChange->type == DialogPatternXmlEdit::ChangeTypeModify) { else
{
if (currentChange->type == DialogPatternXmlEdit::ChangeTypeModify)
{
Changes += QString("Modified type %1 : ").arg(currentChange->element->getelementType()); Changes += QString("Modified type %1 : ").arg(currentChange->element->getelementType());
Changes += (currentChange->changedText) ? *currentChange->newText : QString(tr("Unchanged")); Changes += (currentChange->changedText) ? *currentChange->newText : QString(tr("Unchanged"));
Changes += "/"; Changes += "/";
Changes += (currentChange->changedValue) ? *currentChange->newValue: QString(tr("Unchanged")); Changes += (currentChange->changedValue) ? *currentChange->newValue: QString(tr("Unchanged"));
Changes += "\n"; Changes += "\n";
} else { }
if (currentChange->type == DialogPatternXmlEdit::ChangeTypeDelete) { else
{
if (currentChange->type == DialogPatternXmlEdit::ChangeTypeDelete)
{
Changes += QString("Deleted type %1 : ").arg(currentChange->element->getelementType()); Changes += QString("Deleted type %1 : ").arg(currentChange->element->getelementType());
Changes += currentChange->element->gettreeNodeName(); Changes += currentChange->element->gettreeNodeName();
Changes += "/"; Changes += "/";
@ -179,97 +162,148 @@ void DialogPatternXmlEdit::ButtonApplyChangesClicked() {
// TODO : clear stack and apply // TODO : clear stack and apply
} }
void DialogPatternXmlEdit::ButtonCancelClicked(){ void DialogPatternXmlEdit::ButtonCancelClicked()
this->clear_edit_data(); {
if (this->current_node_edited_status=DialogPatternXmlEdit::ChangeTypeDelete) { this->ClearEditData();
if (this->current_node_edited->getelementType() == vXMLTreeElement::TypeAttr) { if (this->currentNodeEditedStatus==DialogPatternXmlEdit::ChangeTypeDelete)
{
if (this->currentNodeEdited->getelementType() == VXMLTreeElement::TypeAttr)
{
// Attribute previously deleted -> resore // Attribute previously deleted -> resore
QFont textfont=current_node_edited->font(); QFont textfont=currentNodeEdited->font();
textfont.setStrikeOut(false); textfont.setStrikeOut(false);
this->current_node_edited->setFont(textfont); this->currentNodeEdited->setFont(textfont);
this->removeChangeStackElement(this->current_node_edited_stack); this->RemoveChangeStackElement(this->currentNodeEditedStack);
} else { }
else
{
QMessageBox::information(this, "Not Implemented", "Not Implemented"); QMessageBox::information(this, "Not Implemented", "Not Implemented");
} }
} }
} }
void DialogPatternXmlEdit::removeChangeStackElement(ChangesStackElement* elmt) { void DialogPatternXmlEdit::RemoveChangeStackElement(ChangesStackElement* elmt)
{
ChangesStackElement* index = this->changeStackRoot; ChangesStackElement* index = this->changeStackRoot;
if (changeStackRoot == elmt) { if (changeStackRoot == elmt)
if (elmt->newText != 0) free (elmt->newText); {
if (elmt->newValue != 0) free (elmt->newValue); if (elmt->newText != 0)
{
delete elmt->newText;
}
if (elmt->newValue != 0)
{
delete elmt->newValue;
}
this->changeStackRoot = elmt->next; this->changeStackRoot = elmt->next;
if (this->changeStackLast == elmt) { this->changeStackLast= elmt->next; } if (this->changeStackLast == elmt)
free(elmt); {
this->changeStackLast= elmt->next;
}
delete elmt;
return; return;
} }
while (index->next!=0) { while (index->next!=0) {
if (index->next == elmt) { if (index->next == elmt)
{
break; break;
} }
index=index->next; index=index->next;
} }
if (index->next == 0) { if (index->next == 0)
{
// TODO : debug error here // TODO : debug error here
return; return;
} }
if (index->next->newText != 0) free (index->next->newText); if (index->next->newText != 0)
if (index->next->newValue != 0) free (index->next->newValue); {
delete index->next->newText;
}
if (index->next->newValue != 0)
{
delete index->next->newValue;
}
index->next=index->next->next; index->next=index->next->next;
if (this->changeStackLast == elmt) { this->changeStackLast= index;} if (this->changeStackLast == elmt)
free(elmt); {
this->changeStackLast= index;
}
delete elmt;
} }
void DialogPatternXmlEdit::ButtonDeleteAttributeClicked(){ void DialogPatternXmlEdit::ButtonDeleteAttributeClicked()
{
ChangesStackElement* newstack; ChangesStackElement* newstack;
// TODO : maybe assert functions here // TODO : maybe assert functions here
if (this->current_node_edited == 0) return; if (this->currentNodeEdited == 0)
if (this->current_node_edited->getelementType() != vXMLTreeElement::TypeAttr) return; {
return;
}
if (this->currentNodeEdited->getelementType() != VXMLTreeElement::TypeAttr)
{
return;
}
newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeDelete); newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeDelete);
newstack->element= this->current_node_edited; newstack->element= this->currentNodeEdited;
QFont textfont=current_node_edited->font(); QFont textfont=currentNodeEdited->font();
textfont.setStrikeOut(true); textfont.setStrikeOut(true);
this->current_node_edited->setFont(textfont); this->currentNodeEdited->setFont(textfont);
// Activate changes // Activate changes
this->treeChange=true; this->treeChange=true;
ui->pushButton_Apply_Changes->setEnabled(true); ui->pushButton_Apply_Changes->setEnabled(true);
// clear dialog // clear dialog
this->clear_edit_data(); this->ClearEditData();
} }
void DialogPatternXmlEdit::ButtonAddSonClicked(){ void DialogPatternXmlEdit::ButtonAddSonClicked()
{
ChangesStackElement* newstack; ChangesStackElement* newstack;
bool ok;
//clear_edit_data(); //clear_edit_data();
// TODO : maybe assert functions here // TODO : maybe assert functions here
if (this->current_node_edited == 0) return; if (this->currentNodeEdited == 0)
if (this->current_node_edited->getelementType() != vXMLTreeElement::TypeNode) return; {
return;
}
if (this->currentNodeEdited->getelementType() != VXMLTreeElement::TypeNode)
{
return;
}
bool ok;
QString name = QInputDialog::getText(this, tr("Node Name"), QString name = QInputDialog::getText(this, tr("Node Name"),
tr("Name:"), QLineEdit::Normal, tr("Name:"), QLineEdit::Normal,
"", &ok); "", &ok);
if (!ok) return; if (ok==false)
{
return;
}
QString value = QInputDialog::getText(this, tr("Node Value (may be empty)"), QString value = QInputDialog::getText(this, tr("Node Value (may be empty)"),
tr("Value:"), QLineEdit::Normal, tr("Value:"), QLineEdit::Normal,
"", &ok); "", &ok);
if (!ok) return; if (ok==false)
{
return;
}
// create element tree but do not add attribute in DOM (will be done in apply). // create element tree but do not add attribute in DOM (will be done in apply).
QDomNode empty; QDomNode empty;
vXMLTreeElement* tElement = new vXMLTreeElement( VXMLTreeElement* tElement = new VXMLTreeElement(
name, name,
vXMLTreeElement::TypeNode, VXMLTreeElement::TypeNode,
empty,true); empty,true);
if (value !="") tElement->setTreeNodeValue(value); if (!value.isEmpty())
current_node_edited->appendRow(tElement); {
tElement->setTreeNodeValue(value);
}
currentNodeEdited->appendRow(tElement);
xmlmodel->appendchain(tElement); xmlmodel->appendchain(tElement);
QFont textfont=current_node_edited->font(); QFont textfont=currentNodeEdited->font();
textfont.setBold(true); textfont.setBold(true);
tElement->setFont(textfont); tElement->setFont(textfont);
@ -277,46 +311,59 @@ void DialogPatternXmlEdit::ButtonAddSonClicked(){
newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeAdd); newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeAdd);
newstack->element=tElement; newstack->element=tElement;
newstack->newText=new QString(name); newstack->changedText=true; newstack->newText=new QString(name); newstack->changedText=true;
if (value !="") { newstack->changedValue=true;newstack->newValue=new QString(value);} if (value.isEmpty())
{
newstack->changedValue=true;newstack->newValue=new QString(value);
}
// Activate changes // Activate changes
treeChange=true; treeChange=true;
ui->pushButton_Apply_Changes->setEnabled(true); ui->pushButton_Apply_Changes->setEnabled(true);
} }
void DialogPatternXmlEdit::ButtonAddAttributeClicked(){ void DialogPatternXmlEdit::ButtonAddAttributeClicked()
{
ChangesStackElement* newstack; ChangesStackElement* newstack;
bool ok; bool ok;
QDomNode empty; // empty QNode to pas to create function : maybe a better way to do this ? QDomNode empty; // empty QNode to pas to create function : maybe a better way to do this ?
// TODO : maybe assert functions here // TODO : maybe assert functions here
if (this->current_node_edited == 0) return; if (this->currentNodeEdited == 0)
if (this->current_node_edited->getelementType() != vXMLTreeElement::TypeNode) return; {
return;
}
if (this->currentNodeEdited->getelementType() != VXMLTreeElement::TypeNode) return;
QString name = QInputDialog::getText(this, tr("Attribute Name"), QString name = QInputDialog::getText(this, tr("Attribute Name"),
tr("Name:"), QLineEdit::Normal, tr("Name:"), QLineEdit::Normal,
"", &ok); "", &ok);
if (!ok) return; if (ok==false)
{
return;
}
QString value = QInputDialog::getText(this, tr("Attribute Value"), QString value = QInputDialog::getText(this, tr("Attribute Value"),
tr("Value:"), QLineEdit::Normal, tr("Value:"), QLineEdit::Normal,
"", &ok); "", &ok);
if (!ok) return; if (ok==false)
{
return;
}
// create element tree but do not add attribute in DOM (will be done in apply). // create element tree but do not add attribute in DOM (will be done in apply).
vXMLTreeElement* tElement = new vXMLTreeElement( VXMLTreeElement* tElement = new VXMLTreeElement(
name, name,
vXMLTreeElement::TypeAttr, VXMLTreeElement::TypeAttr,
empty,true); empty,true);
tElement->setTreeNodeValue(value); tElement->setTreeNodeValue(value);
current_node_edited->appendRow(tElement); currentNodeEdited->appendRow(tElement);
xmlmodel->appendchain(tElement); xmlmodel->appendchain(tElement);
QFont textfont=current_node_edited->font(); QFont textfont=currentNodeEdited->font();
textfont.setBold(true); textfont.setBold(true);
tElement->setFont(textfont); tElement->setFont(textfont);
// Add to change stack // Add to change stack
newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeAdd); newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeAdd);
newstack->element= tElement; newstack->element= tElement;
newstack->type=vXMLTreeElement::TypeAttr; newstack->type=VXMLTreeElement::TypeAttr;
newstack->newText=new QString(name); newstack->newText=new QString(name);
newstack->newValue=new QString(value); newstack->newValue=new QString(value);
// Activate changes // Activate changes
@ -324,56 +371,63 @@ void DialogPatternXmlEdit::ButtonAddAttributeClicked(){
ui->pushButton_Apply_Changes->setEnabled(true); ui->pushButton_Apply_Changes->setEnabled(true);
} }
void DialogPatternXmlEdit::ButtonSetClicked(){ void DialogPatternXmlEdit::ButtonSetClicked()
{
QString name,value; QString name,value;
ChangesStackElement* newstack; ChangesStackElement* newstack;
// TODO : check if a change has already been done // TODO : check if a change has already been done
if (this->current_node_edited == 0) return; if (this->currentNodeEdited == 0) return;
name=ui->lineEdit_Name->text(); name=ui->lineEdit_Name->text();
value=ui->lineEdit_Value->text(); value=ui->lineEdit_Value->text();
bool nameedit,valueedit; bool nameedit,valueedit;
nameedit = (name != current_node_edited->gettreeNodeName()) ? true : false; nameedit = (name != currentNodeEdited->gettreeNodeName()) ? true : false;
valueedit= (value != current_node_edited->gettreeNodeValue()) ? true : false; valueedit= (value != currentNodeEdited->gettreeNodeValue()) ? true : false;
if ( nameedit == true || valueedit == true ) { if ( nameedit == true || valueedit == true )
{
newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeModify); newstack = this->CreateStackElement(DialogPatternXmlEdit::ChangeTypeModify);
newstack->element= this->current_node_edited; newstack->element= this->currentNodeEdited;
if (nameedit == true) { if (nameedit == true)
{
newstack->changedText=true; newstack->changedText=true;
newstack->newText=new QString(name); newstack->newText=new QString(name);
current_node_edited->setTreeNodeName(name); currentNodeEdited->setTreeNodeName(name);
} }
if (valueedit == true) { if (valueedit == true)
{
newstack->changedValue=true; newstack->changedValue=true;
newstack->newValue= new QString(value); newstack->newValue= new QString(value);
current_node_edited->setTreeNodeValue(value); currentNodeEdited->setTreeNodeValue(value);
} }
QFont textfont=current_node_edited->font(); QFont textfont=currentNodeEdited->font();
textfont.setBold(true); textfont.setBold(true);
current_node_edited->setFont(textfont); currentNodeEdited->setFont(textfont);
treeChange=true; treeChange=true;
ui->pushButton_Apply_Changes->setEnabled(true); ui->pushButton_Apply_Changes->setEnabled(true);
clear_edit_data(); ClearEditData();
} }
} }
void DialogPatternXmlEdit::nameTextEdited(QString newtext) { void DialogPatternXmlEdit::NameTextEdited(QString newtext)
{
//QMessageBox::information(this, "nameTextEdited", QString("%1").arg(newtext)); //QMessageBox::information(this, "nameTextEdited", QString("%1").arg(newtext));
ui->pushButton_Set_Values->setEnabled(true); ui->pushButton_Set_Values->setEnabled(true);
ui->pushButton_Cancel_Values->setEnabled(true); ui->pushButton_Cancel_Values->setEnabled(true);
} }
void DialogPatternXmlEdit::valueTextEdited(QString newtext) { void DialogPatternXmlEdit::ValueTextEdited(QString newtext)
{
//QMessageBox::information(this, "valueTextEdited", QString("%1").arg(newtext)); //QMessageBox::information(this, "valueTextEdited", QString("%1").arg(newtext));
ui->pushButton_Set_Values->setEnabled(true); ui->pushButton_Set_Values->setEnabled(true);
ui->pushButton_Cancel_Values->setEnabled(true); ui->pushButton_Cancel_Values->setEnabled(true);
} }
void DialogPatternXmlEdit::clear_edit_data() { void DialogPatternXmlEdit::ClearEditData()
{
ui->lineEdit_Name->setText(""); ui->lineEdit_Name->setText("");
ui->lineEdit_Value->setText(""); ui->lineEdit_Value->setText("");
ui->lineEdit_Name->setEnabled(false); ui->lineEdit_Name->setEnabled(false);
@ -387,27 +441,36 @@ void DialogPatternXmlEdit::clear_edit_data() {
ui->pushButton_Cancel_Values->setEnabled(false); ui->pushButton_Cancel_Values->setEnabled(false);
} }
void DialogPatternXmlEdit::clearStack() { void DialogPatternXmlEdit::ClearStack()
{
ChangesStackElement * tmp; ChangesStackElement * tmp;
while (changeStackRoot != 0) { while (changeStackRoot != 0)
if (changeStackRoot->newText != 0) free (changeStackRoot->newText); {
if (changeStackRoot->newValue != 0) free (changeStackRoot->newValue); if (changeStackRoot->newText != 0)
{
delete changeStackRoot->newText;
}
if (changeStackRoot->newValue != 0)
{
delete changeStackRoot->newValue;
}
tmp=changeStackRoot; tmp=changeStackRoot;
changeStackRoot=changeStackRoot->next; changeStackRoot=changeStackRoot->next;
free(tmp); delete tmp;
} }
changeStackLast=0; changeStackLast=0;
} }
void DialogPatternXmlEdit::baseSelectionChanged(int value) void DialogPatternXmlEdit::BaseSelectionChanged(int value)
{ {
QDomNode newbase; QDomNode newbase;
int index; int index;
if (this->treeChange == true) {//Changes have been made : warn ? if (this->treeChange == true)
{//Changes have been made : warn ?
} }
clearStack(); ClearStack();
ui->pushButton_Apply_Changes->setEnabled(false); ui->pushButton_Apply_Changes->setEnabled(false);
index = ui->comboBox_Base_Selection->itemData(value).toInt(); //.convert(QVariant::Int); index = ui->comboBox_Base_Selection->itemData(value).toInt(); //.convert(QVariant::Int);
@ -416,45 +479,50 @@ void DialogPatternXmlEdit::baseSelectionChanged(int value)
// Clear all tree info and nodes // Clear all tree info and nodes
// TODO : Check // TODO : Check
while (rootNode->rowCount() > 0) { while (rootNode->rowCount() > 0)
{
rootNode->removeRow(0); rootNode->removeRow(0);
} }
xmlmodel->clearTree(); xmlmodel->ClearTree();
vXMLTreeElement* standard_base = new vXMLTreeElement( VXMLTreeElement* standard_base = new VXMLTreeElement(
rootBases[index]->gettreeNodeName(), rootBases[index]->gettreeNodeName(),
vXMLTreeElement::TypeRoot, VXMLTreeElement::TypeRoot,
rootBases[index]->getDocNode(), rootBases[index]->getDocNode(),
false); false);
rootNode->appendRow(standard_base); rootNode->appendRow(standard_base);
readNodes(rootBases[index]->getDocNode(),standard_base,xmlmodel,true); ReadNodes(rootBases[index]->getDocNode(),standard_base,xmlmodel,true);
ui->treeView_main->setModel(xmlmodel); ui->treeView_main->setModel(xmlmodel);
this->clear_edit_data(); this->ClearEditData();
// TODO : warn if changes ? // TODO : warn if changes ?
this->clearStack(); this->ClearStack();
return; return;
} }
void DialogPatternXmlEdit::Element_clicked ( const QModelIndex & index ) { void DialogPatternXmlEdit::ElementClicked ( const QModelIndex & index )
{
// Get item (function returns parent of clicked item) // Get item (function returns parent of clicked item)
vXMLTreeElement *item = (vXMLTreeElement *)index.internalPointer(); VXMLTreeElement *item = (VXMLTreeElement *)index.internalPointer();
// Get child specified by index row/column // Get child specified by index row/column
vXMLTreeElement * item2 = (vXMLTreeElement *) item->child(index.row(),index.column()); VXMLTreeElement * item2 = (VXMLTreeElement *) item->child(index.row(),index.column());
// Clear all data and disable buttons // Clear all data and disable buttons
this->clear_edit_data(); this->ClearEditData();
// Check status of element in change stack // Check status of element in change stack
this->current_node_edited=item2; this->currentNodeEdited=item2;
this->current_node_edited_status=0; this->currentNodeEditedStatus=0;
DialogPatternXmlEdit::ChangesStackElement * local = this->changeStackRoot; DialogPatternXmlEdit::ChangesStackElement * local = this->changeStackRoot;
while (local != 0) { while (local != 0)
if (local->element == item2) { {
this->current_node_edited_status=local->type; if (local->element == item2)
this->current_node_edited_stack=local; {
if (local->type == DialogPatternXmlEdit::ChangeTypeDelete) { this->currentNodeEditedStatus=local->type;
this->currentNodeEditedStack=local;
if (local->type == DialogPatternXmlEdit::ChangeTypeDelete)
{
// Node is deleted, only enable cancel button // Node is deleted, only enable cancel button
ui->pushButton_Cancel_Values->setEnabled(true); ui->pushButton_Cancel_Values->setEnabled(true);
return; return;
@ -463,21 +531,27 @@ void DialogPatternXmlEdit::Element_clicked ( const QModelIndex & index ) {
local=local->next; local=local->next;
} }
// Fill the dialog and Activate the line edit // Fill the dialog and Activate the line edit
if (item2->getelementType() != vXMLTreeElement::TypeRoot) { if (item2->getelementType() != VXMLTreeElement::TypeRoot)
ui->lineEdit_Name->setText(current_node_edited->gettreeNodeName()); {
ui->lineEdit_Name->setText(currentNodeEdited->gettreeNodeName());
ui->lineEdit_Name->setEnabled(true); ui->lineEdit_Name->setEnabled(true);
// Fill value // Fill value
ui->lineEdit_Value->setText(current_node_edited->gettreeNodeValue()); ui->lineEdit_Value->setText(currentNodeEdited->gettreeNodeValue());
ui->lineEdit_Value->setEnabled(true); ui->lineEdit_Value->setEnabled(true);
} }
if (item2->getelementType() == vXMLTreeElement::TypeRoot) { if (item2->getelementType() == VXMLTreeElement::TypeRoot)
{
ui->label_type_value->setText(tr("Root node"));; ui->label_type_value->setText(tr("Root node"));;
ui->pushButton_Add_son->setEnabled(true); ui->pushButton_Add_son->setEnabled(true);
} else if (item2->getelementType() == vXMLTreeElement::TypeNode) { }
else if (item2->getelementType() == VXMLTreeElement::TypeNode)
{
ui->label_type_value->setText(tr("Node")); ui->label_type_value->setText(tr("Node"));
ui->pushButton_Add_attribute->setEnabled(true); ui->pushButton_Add_attribute->setEnabled(true);
ui->pushButton_Add_son->setEnabled(true); ui->pushButton_Add_son->setEnabled(true);
} else if (item2->getelementType() == vXMLTreeElement::TypeAttr) { }
else if (item2->getelementType() == VXMLTreeElement::TypeAttr)
{
ui->label_type_value->setText(tr("Attribute")); ui->label_type_value->setText(tr("Attribute"));
ui->pushButton_Remove_attribute->setEnabled(true); ui->pushButton_Remove_attribute->setEnabled(true);
} }
@ -487,39 +561,45 @@ DialogPatternXmlEdit::~DialogPatternXmlEdit()
{ {
//xmlmodel->clearTree(); //xmlmodel->clearTree();
delete ui; delete ui;
ChangesStackElement * tmp; while (changeStackRoot != 0) { ChangesStackElement * tmp;
while (changeStackRoot != 0)
{
tmp=changeStackRoot->next; tmp=changeStackRoot->next;
free(changeStackRoot); delete changeStackRoot;
changeStackRoot=tmp; changeStackRoot=tmp;
} }
//delete rootBases[0];
//free(rootBases);
//delete xmlmodel;
} }
void DialogPatternXmlEdit::readNodes(QDomNode dNode, vXMLTreeElement* root,vXMLTreeView* xmlmodel, bool refresh) void DialogPatternXmlEdit::ReadNodes(QDomNode dNode, VXMLTreeElement* root,VXMLTreeView* xmlmodel, bool refresh)
{ {
QDomNode tNode,tNode2; QDomNode tNode,tNode2;
vXMLTreeElement* tElement,*tElement2; VXMLTreeElement* tElement,*tElement2;
int totalOfChilds = dNode.childNodes().size(); int totalOfChilds = dNode.childNodes().size();
if (totalOfChilds == 0) return; // empty xml if (totalOfChilds == 0)
for (int i=0;i<totalOfChilds;i++) { {
return; // empty xml
}
for (int i=0;i<totalOfChilds;i++)
{
tNode = dNode.childNodes().at(i); tNode = dNode.childNodes().at(i);
if (tNode.nodeType() != QDomNode::CommentNode) { if (tNode.nodeType() != QDomNode::CommentNode)
tElement = new vXMLTreeElement(tNode.nodeName(),vXMLTreeElement::TypeNode,tNode,false); {
tElement = new VXMLTreeElement(tNode.nodeName(),VXMLTreeElement::TypeNode,tNode,false);
xmlmodel->appendchain(tElement); xmlmodel->appendchain(tElement);
root->appendRow(tElement); root->appendRow(tElement);
if (tNode.nodeName() == "draw") { if (tNode.nodeName() == "draw")
{
for (int i = 0; i < tNode.attributes().size(); i++) for (int i = 0; i < tNode.attributes().size(); i++)
{ {
if ((tNode.attributes().item(i).nodeName() == "name") if ((tNode.attributes().item(i).nodeName() == "name")
&& (refresh == false)){ && (refresh == false))
{
ui->comboBox_Base_Selection->addItem(tNode.attributes().item(i).nodeValue(), ui->comboBox_Base_Selection->addItem(tNode.attributes().item(i).nodeValue(),
QVariant(rootBasesNum)); QVariant(rootBasesNum));
rootBases[rootBasesNum]=new vXMLTreeElement( rootBases[rootBasesNum]=new VXMLTreeElement(
QString("Drawing %1").arg(tNode.attributes().item(i).nodeValue()), QString("Drawing %1").arg(tNode.attributes().item(i).nodeValue()),
vXMLTreeElement::TypeRoot,tNode,false);; VXMLTreeElement::TypeRoot,tNode,false);;
rootBasesNum++; rootBasesNum++;
//QStandardItem* rootNode = (QStandardItem*) rootBases[rootBasesNum]->invisibleRootItem(); //QStandardItem* rootNode = (QStandardItem*) rootBases[rootBasesNum]->invisibleRootItem();
//rootNode->appendRow(tElement); //rootNode->appendRow(tElement);
@ -533,70 +613,77 @@ void DialogPatternXmlEdit::readNodes(QDomNode dNode, vXMLTreeElement* root,vXMLT
{ {
tElement=xmlmodel->getCurrent()->elmt; tElement=xmlmodel->getCurrent()->elmt;
tNode=tElement->getDocNode(); tNode=tElement->getDocNode();
if (tElement->getelementType() == vXMLTreeElement::TypeNode) { if (tElement->getelementType() == VXMLTreeElement::TypeNode)
{
totalOfChilds = tNode.childNodes().size(); totalOfChilds = tNode.childNodes().size();
for (int i=0;i<totalOfChilds;i++) { for (int i=0;i<totalOfChilds;i++)
{
tNode2 = tNode.childNodes().at(i); tNode2 = tNode.childNodes().at(i);
if (tNode2.nodeType() != QDomNode::CommentNode) { if (tNode2.nodeType() != QDomNode::CommentNode)
tElement2 = new vXMLTreeElement(tNode2.nodeName(),vXMLTreeElement::TypeNode,tNode2,false); {
tElement2 = new VXMLTreeElement(tNode2.nodeName(),VXMLTreeElement::TypeNode,tNode2,false);
xmlmodel->appendchain(tElement2); xmlmodel->appendchain(tElement2);
tElement->appendRow(tElement2); tElement->appendRow(tElement2);
} }
} }
if (tNode.nodeType() == QDomNode::TextNode) { if (tNode.nodeType() == QDomNode::TextNode)
{
tElement->setTreeNodeValue(tNode.nodeValue()); tElement->setTreeNodeValue(tNode.nodeValue());
} }
for (int i = 0; i < tNode.attributes().size(); i++) for (int i = 0; i < tNode.attributes().size(); i++)
{ {
tElement2 = new vXMLTreeElement( tElement2 = new VXMLTreeElement(
tNode.attributes().item(i).nodeName(), tNode.attributes().item(i).nodeName(),
vXMLTreeElement::TypeAttr, VXMLTreeElement::TypeAttr,
tNode,false); tNode,false);
tElement2->setTreeNodeValue(tNode.attributes().item(i).nodeValue()); tElement2->setTreeNodeValue(tNode.attributes().item(i).nodeValue());
tElement->appendRow(tElement2); tElement->appendRow(tElement2);
xmlmodel->appendchain(tElement2); xmlmodel->appendchain(tElement2);
} }
} }
xmlmodel->setCurrent(xmlmodel->getCurrent()->next); xmlmodel->SetCurrent(xmlmodel->getCurrent()->next);
} }
while (xmlmodel->getCurrent() != 0); while (xmlmodel->getCurrent() != 0);
return; return;
} }
// vXMLTreeView Code ----------------------------------------------------------------- // vXMLTreeView Code -----------------------------------------------------------------
vXMLTreeView::vXMLTreeView(QObject *parent) : QStandardItemModel(parent) VXMLTreeView::VXMLTreeView(QObject *parent) : QStandardItemModel(parent)
{ {
current=last=items=0; current=last=items=0;
} }
void vXMLTreeView::clearTree() { void VXMLTreeView::ClearTree() {
// TODO check if treeitems are deleted with the delete row command of QDom // TODO check if treeitems are deleted with the delete row command of QDom
//clear the chain link //clear the chain link
TreeElementchain * tmp; TreeElementchain * tmp;
while (items != 0) { while (items != 0)
{
tmp=items; tmp=items;
items=items->next; items=items->next;
free (tmp); delete tmp;
} }
// reset chain counters // reset chain counters
current=last=items=0; current=last=items=0;
} }
vXMLTreeView::~vXMLTreeView() VXMLTreeView::~VXMLTreeView()
{ {
} }
void vXMLTreeView::appendchain(vXMLTreeElement* elmt) void VXMLTreeView::appendchain(VXMLTreeElement* elmt)
{ {
if (last == 0) { // first element if (last == 0)
current=(TreeElementchain*)malloc(sizeof(TreeElementchain)); { // first element
if (current == 0) { current = new TreeElementchain;
if (current == 0)
{
Q_ASSERT(current != 0); Q_ASSERT(current != 0);
// TODO : throw exception // TODO : throw exception
} }
@ -605,8 +692,9 @@ void vXMLTreeView::appendchain(vXMLTreeElement* elmt)
last=items=current; last=items=current;
return; return;
} }
TreeElementchain* temp=(TreeElementchain*)malloc(sizeof(TreeElementchain)); TreeElementchain* temp= new TreeElementchain;
if (temp == 0) { if (temp == 0)
{
Q_ASSERT(temp != 0); Q_ASSERT(temp != 0);
// TODO : throw exception // TODO : throw exception
} }
@ -616,32 +704,30 @@ void vXMLTreeView::appendchain(vXMLTreeElement* elmt)
last=temp; last=temp;
} }
vXMLTreeView::TreeElementchain * vXMLTreeView::getCurrent() { return this->current;}
void vXMLTreeView::setCurrent(vXMLTreeView::TreeElementchain * value) { this->current=value;}
vXMLTreeView::TreeElementchain * vXMLTreeView::getLast() { return this->last;}
vXMLTreeView::TreeElementchain * vXMLTreeView::getItems() { return this->items;}
// vXMLTreeElement code ----------------------------------------------------------------- // vXMLTreeElement code -----------------------------------------------------------------
const short int vXMLTreeElement::TypeNode=1; const short int VXMLTreeElement::TypeNode=1;
const short int vXMLTreeElement::TypeAttr=2; const short int VXMLTreeElement::TypeAttr=2;
const short int vXMLTreeElement::TypeRoot=3; const short int VXMLTreeElement::TypeRoot=3;
vXMLTreeElement::vXMLTreeElement(QString name, int nodetype, QDomNode source,bool editor) VXMLTreeElement::VXMLTreeElement(QString name, int nodetype, QDomNode source,bool editor): QStandardItem(name)
: QStandardItem(name)
{ {
this->elementType=nodetype; this->elementType=nodetype;
this->DocNode=source; this->DocNode=source;
this->addedNode=editor; this->addedNode=editor;
if (!editor) this->DocNode=source; if (!editor)
{
this->DocNode=source;
}
this->treeNodeName=name; this->treeNodeName=name;
this->treeNodeValue="<empty>"; // TODO : translation ? this->treeNodeValue="<empty>"; // TODO : translation ?
this->treeNodeValueSet=false, this->treeNodeValueSet=false,
this->setText(this->displayText()); this->setText(this->displayText());
switch (this->elementType) { switch (this->elementType)
case vXMLTreeElement::TypeAttr: {
case VXMLTreeElement::TypeAttr:
this->setBackground(BACKGROUND_COLOR_ATTRIBUTE); this->setBackground(BACKGROUND_COLOR_ATTRIBUTE);
break; break;
default: default:
@ -650,43 +736,36 @@ vXMLTreeElement::vXMLTreeElement(QString name, int nodetype, QDomNode source,boo
} }
vXMLTreeElement::~vXMLTreeElement() VXMLTreeElement::~VXMLTreeElement()
{ {
} }
void vXMLTreeElement::setTreeNodeValue(QString value)
void VXMLTreeElement::setTreeNodeValue(QString value)
{ {
this->treeNodeValue=value; this->treeNodeValue=value;
this->treeNodeValueSet=true; this->treeNodeValueSet=true;
this->setText(this->displayText()); this->setText(this->displayText());
} }
void vXMLTreeElement::setTreeNodeName(QString value) void VXMLTreeElement::setTreeNodeName(QString value)
{ {
this->treeNodeName=value; this->treeNodeName=value;
this->setText(this->displayText()); this->setText(this->displayText());
} }
QString vXMLTreeElement::displayText() QString VXMLTreeElement::displayText()
{ {
if (this->elementType == vXMLTreeElement::TypeRoot) if (this->elementType == VXMLTreeElement::TypeRoot)
return this->treeNodeName; return this->treeNodeName;
return QString("%1 : %2").arg((this->treeNodeName)).arg(this->treeNodeValue); return QString("%1 : %2").arg((this->treeNodeName)).arg(this->treeNodeValue);
} }
short int vXMLTreeElement::getelementType() { return this->elementType;} QString VXMLTreeElement::gettreeNodeValue() {
QDomNode vXMLTreeElement::getDocNode()
{
return this->DocNode;
}
QString vXMLTreeElement::gettreeNodeName() { return this->treeNodeName;}
QString vXMLTreeElement::gettreeNodeValue() {
// Only return value if it's really set. // Only return value if it's really set.
if (this->treeNodeValueSet) if (this->treeNodeValueSet)
return this->treeNodeValue; return this->treeNodeValue;
else else
return ""; return "";
} }
bool vXMLTreeElement::gettreeNodeValueSet() {return this->treeNodeValueSet;}

95
src/app/dialogs/app/dialogpatternxmledit.h
View file

@ -41,7 +41,7 @@
*/ */
#define BACKGROUND_COLOR_ATTRIBUTE QBrush(Qt::GlobalColor::cyan) #define BACKGROUND_COLOR_ATTRIBUTE QBrush(Qt::GlobalColor::cyan)
class vXMLTreeElement : public QStandardItem class VXMLTreeElement : public QStandardItem
{ {
public: public:
@ -51,11 +51,11 @@ public:
* @param nodetype : node type (node, attribute, root) * @param nodetype : node type (node, attribute, root)
* @param source : the source dom node * @param source : the source dom node
*/ */
explicit vXMLTreeElement (QString name, int nodetype, QDomNode source,bool editor); explicit VXMLTreeElement (QString name, int nodetype, QDomNode source,bool editor);
explicit vXMLTreeElement (QString name, int nodetype); explicit VXMLTreeElement (QString name, int nodetype);
~vXMLTreeElement (); ~VXMLTreeElement ();
static const short int TypeNode; static const short int TypeNode;
static const short int TypeAttr; static const short int TypeAttr;
static const short int TypeRoot; static const short int TypeRoot;
@ -110,38 +110,58 @@ private:
* @brief nodeValue : Attribute or node value * @brief nodeValue : Attribute or node value
*/ */
QString treeNodeName; QString treeNodeName;
Q_DISABLE_COPY(vXMLTreeElement) Q_DISABLE_COPY(VXMLTreeElement)
}; };
inline short int VXMLTreeElement::getelementType()
{
return this->elementType;
}
inline QDomNode VXMLTreeElement::getDocNode()
{
return this->DocNode;
}
inline QString VXMLTreeElement::gettreeNodeName()
{
return this->treeNodeName;
}
inline bool VXMLTreeElement::gettreeNodeValueSet()
{
return this->treeNodeValueSet;
}
//******************************************************************************************** //********************************************************************************************
/** /**
* @brief The vXMLTreeView class : container to display/edit xml pattern * @brief The vXMLTreeView class : container to display/edit xml pattern
*/ */
class vXMLTreeView : public QStandardItemModel class VXMLTreeView : public QStandardItemModel
{ {
public: public:
explicit vXMLTreeView (QObject *parent = 0); explicit VXMLTreeView (QObject *parent = 0);
void appendchain(vXMLTreeElement* elmt); void appendchain(VXMLTreeElement* elmt);
/** /**
* @brief The TreeElement struct : chained list of vXMLTreeElement * @brief The TreeElement struct : chained list of vXMLTreeElement
*/ */
typedef struct TreeElementchain { typedef struct TreeElementchain {
vXMLTreeElement* elmt; VXMLTreeElement* elmt;
TreeElementchain* next; TreeElementchain* next;
} TreeElementchain; } TreeElementchain;
TreeElementchain * getCurrent(); TreeElementchain * getCurrent();
void setCurrent(TreeElementchain * value); void SetCurrent(TreeElementchain * value);
TreeElementchain * getLast(); TreeElementchain * GetLast();
TreeElementchain * getItems(); TreeElementchain * GetItems();
/** /**
* @brief clearTree : clear tree elements and listed items. * @brief clearTree : clear tree elements and listed items.
*/ */
void clearTree(); void ClearTree();
~vXMLTreeView (); ~VXMLTreeView ();
private: private:
Q_DISABLE_COPY(vXMLTreeView) Q_DISABLE_COPY(VXMLTreeView)
/** /**
* @brief items : root of chained list of vXMLTreeElement * @brief items : root of chained list of vXMLTreeElement
@ -158,6 +178,23 @@ private:
}; };
inline VXMLTreeView::TreeElementchain * VXMLTreeView::getCurrent()
{
return this->current;
}
inline void VXMLTreeView::SetCurrent(VXMLTreeView::TreeElementchain * value)
{
this->current=value;
}
inline VXMLTreeView::TreeElementchain * VXMLTreeView::GetLast()
{
return this->last;
}
inline VXMLTreeView::TreeElementchain * VXMLTreeView::GetItems()
{
return this->items;
}
//******************************************************************************************** //********************************************************************************************
namespace Ui { namespace Ui {
@ -177,10 +214,10 @@ public:
/** /**
* @brief clear_edit_data : clear input boxes and disables buttons. * @brief clear_edit_data : clear input boxes and disables buttons.
*/ */
void clear_edit_data(); void ClearEditData();
void nameTextEdited(QString newtext); void NameTextEdited(QString newtext);
void valueTextEdited(QString newtext); void ValueTextEdited(QString newtext);
void ButtonSetClicked(); void ButtonSetClicked();
void ButtonCancelClicked(); void ButtonCancelClicked();
void ButtonDeleteAttributeClicked(); void ButtonDeleteAttributeClicked();
@ -192,7 +229,7 @@ public:
// Stack of changes definition // Stack of changes definition
typedef struct ChangesStackElement { typedef struct ChangesStackElement {
short int type; short int type;
vXMLTreeElement *element; VXMLTreeElement *element;
QString *newText; QString *newText;
bool changedText; bool changedText;
QString *newValue; QString *newValue;
@ -202,16 +239,16 @@ public:
// Change stack functions // Change stack functions
ChangesStackElement* CreateStackElement(short int typechange); ChangesStackElement* CreateStackElement(short int typechange);
void removeChangeStackElement(ChangesStackElement* elmt); void RemoveChangeStackElement(ChangesStackElement* elmt);
void clearStack(); void ClearStack();
bool treeChange; bool treeChange;
vXMLTreeElement* current_node_edited; VXMLTreeElement* currentNodeEdited;
short int current_node_edited_status; short int currentNodeEditedStatus;
ChangesStackElement* current_node_edited_stack; ChangesStackElement* currentNodeEditedStack;
private slots: private slots:
void baseSelectionChanged(int value); void BaseSelectionChanged(int value);
void Element_clicked ( const QModelIndex & index ); void ElementClicked ( const QModelIndex & index );
private: private:
Q_DISABLE_COPY(DialogPatternXmlEdit) Q_DISABLE_COPY(DialogPatternXmlEdit)
@ -222,11 +259,11 @@ private:
QDomElement root; QDomElement root;
QStandardItem *rootNode; QStandardItem *rootNode;
//typedef struct rootbases { vXMLTreeElement * root; QString name; } rootbases; //typedef struct rootbases { vXMLTreeElement * root; QString name; } rootbases;
vXMLTreeElement ** rootBases; VXMLTreeElement ** rootBases;
qint16 rootBasesNum; qint16 rootBasesNum;
void readNodes(QDomNode dNode, vXMLTreeElement* root, vXMLTreeView *xmlmodel, bool refresh); void ReadNodes(QDomNode dNode, VXMLTreeElement* root, VXMLTreeView *xmlmodel, bool refresh);
vXMLTreeView* xmlmodel; VXMLTreeView* xmlmodel;
// Stack of changes // Stack of changes

2
src/app/mainwindow.cpp
View file

@ -546,8 +546,8 @@ void MainWindow::PatternProperties()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindow::EditPatternCode() void MainWindow::EditPatternCode()
{ {
//TODO : free dialog pointer at end of dialog
DialogPatternXmlEdit *Pattern = new DialogPatternXmlEdit (this,doc); DialogPatternXmlEdit *Pattern = new DialogPatternXmlEdit (this,doc);
Pattern->setAttribute(Qt::WA_DeleteOnClose,true);
Pattern->show(); Pattern->show();
} }