issue826 allow empty groups, schema version 0.7.8, update group list when adding or removing item

--HG--
branch : issue826
This commit is contained in:
Ronan Le Tiec 2018-03-25 16:43:28 +02:00
parent be44126c94
commit 032783581a
8 changed files with 1166 additions and 38 deletions

View File

@ -174,6 +174,14 @@ void VWidgetGroups::FillTable(const QMap<quint32, QPair<QString, bool> > &groups
item = new QTableWidgetItem(data.first); item = new QTableWidgetItem(data.first);
item->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); item->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
if(doc->GroupIsEmpty(i.key()))
{
QFont font;
font.setStrikeOut(true);
item->setFont(font);
}
ui->tableWidget->setItem(currentRow, 1, item); ui->tableWidget->setItem(currentRow, 1, item);
++i; ++i;
} }

View File

@ -4123,6 +4123,8 @@ void MainWindow::InitDocksContain()
qCDebug(vMainWindow, "Initialization groups dock."); qCDebug(vMainWindow, "Initialization groups dock.");
groupsWidget = new VWidgetGroups(doc, this); groupsWidget = new VWidgetGroups(doc, this);
ui->dockWidgetGroups->setWidget(groupsWidget); ui->dockWidgetGroups->setWidget(groupsWidget);
connect(doc,&VAbstractPattern::UpdateGroups , groupsWidget, &VWidgetGroups::UpdateGroups);
connect(doc,&VAbstractPattern::UpdateGroups , groupsWidget, &VWidgetGroups::UpdateGroups);
detailsWidget = new VWidgetDetails(pattern, doc, this); detailsWidget = new VWidgetDetails(pattern, doc, this);
connect(doc, &VPattern::FullUpdateFromFile, detailsWidget, &VWidgetDetails::UpdateList); connect(doc, &VPattern::FullUpdateFromFile, detailsWidget, &VWidgetDetails::UpdateList);

View File

@ -49,6 +49,7 @@
<file>schema/pattern/v0.7.5.xsd</file> <file>schema/pattern/v0.7.5.xsd</file>
<file>schema/pattern/v0.7.6.xsd</file> <file>schema/pattern/v0.7.6.xsd</file>
<file>schema/pattern/v0.7.7.xsd</file> <file>schema/pattern/v0.7.7.xsd</file>
<file>schema/pattern/v0.7.8.xsd</file>
<file>schema/standard_measurements/v0.3.0.xsd</file> <file>schema/standard_measurements/v0.3.0.xsd</file>
<file>schema/standard_measurements/v0.4.0.xsd</file> <file>schema/standard_measurements/v0.4.0.xsd</file>
<file>schema/standard_measurements/v0.4.1.xsd</file> <file>schema/standard_measurements/v0.4.1.xsd</file>
@ -62,5 +63,5 @@
<file>schema/individual_measurements/v0.3.3.xsd</file> <file>schema/individual_measurements/v0.3.3.xsd</file>
<file>schema/individual_measurements/v0.4.0.xsd</file> <file>schema/individual_measurements/v0.4.0.xsd</file>
<file>schema/label_template/v1.0.0.xsd</file> <file>schema/label_template/v1.0.0.xsd</file>
</qresource> </qresource>
</RCC> </RCC>

File diff suppressed because it is too large Load Diff

View File

@ -2377,11 +2377,11 @@ QMap<quint32, QPair<QString, bool> > VAbstractPattern::GetGroups()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief Returns the groups that contain or do not contain the item identified by the toolid and the objectid * @brief Returns the groups that contain or do not contain the item identified by the toolid and the objectid
* @param id * @param toolId
* @param containItem | true if the groups have to contain the given item, false if they musn't contain the item * @param objectId
* @param containItem |true if the groups have to contain the given item, false if they musn't contain the item
* @return * @return
*/ */
QMap<quint32, QString> VAbstractPattern::GetGroupsContainingItem(quint32 toolId, quint32 objectId, bool containItem) QMap<quint32, QString> VAbstractPattern::GetGroupsContainingItem(quint32 toolId, quint32 objectId, bool containItem)
@ -2406,7 +2406,7 @@ QMap<quint32, QString> VAbstractPattern::GetGroupsContainingItem(quint32 toolId,
const QDomElement group = domNode.toElement(); const QDomElement group = domNode.toElement();
if (group.isNull() == false) if (group.isNull() == false)
{ {
if (group.tagName() == TagGroup && group.hasChildNodes()) if (group.tagName() == TagGroup)
{ {
bool groupHasItem = GroupHasItem(group, toolId, objectId); bool groupHasItem = GroupHasItem(group, toolId, objectId);
if((containItem && groupHasItem) || (not containItem && not groupHasItem)) if((containItem && groupHasItem) || (not containItem && not groupHasItem))
@ -2431,7 +2431,7 @@ QMap<quint32, QString> VAbstractPattern::GetGroupsContainingItem(quint32 toolId,
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief Checks if the given group has the item with the given toolId and objectId * @brief Checks if the given group has the item with the given toolId and objectId
* @param domElement * @param groupDomElement
* @param toolId * @param toolId
* @param objectId * @param objectId
* @return * @return
@ -2474,15 +2474,24 @@ void VAbstractPattern::AddItemToGroup(quint32 toolId, quint32 objectId, quint32
{ {
QDomElement group = elementById(groupId, TagGroup); QDomElement group = elementById(groupId, TagGroup);
if(objectId == 0) if (group.isNull() == false)
{ {
objectId = toolId; if(objectId == 0)
} {
objectId = toolId;
}
QDomElement item = createElement(TagGroupItem); QDomElement item = createElement(TagGroupItem);
item.setAttribute(AttrTool, toolId); item.setAttribute(AttrTool, toolId);
item.setAttribute(AttrObject, objectId); item.setAttribute(AttrObject, objectId);
group.appendChild(item); group.appendChild(item);
emit UpdateGroups();
}
else
{
qDebug() << "The group of id " << groupId << " doesn't exist";
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -2496,35 +2505,60 @@ void VAbstractPattern::RemoveItemFromGroup(quint32 toolId, quint32 objectId, qui
{ {
QDomElement group = elementById(groupId, TagGroup); QDomElement group = elementById(groupId, TagGroup);
if(objectId == 0) if (group.isNull() == false)
{ {
objectId = toolId; if(objectId == 0)
}
QDomNode itemNode = group.firstChild();
while (itemNode.isNull() == false) // iterate through the items of the group
{
if (itemNode.isElement())
{ {
const QDomElement item = itemNode.toElement(); objectId = toolId;
if (item.isNull() == false) }
{
quint32 toolIdIterate= GetParametrUInt(item, AttrTool, "0");
quint32 objectIdIterate= GetParametrUInt(item, AttrObject, "0");
if(toolIdIterate == toolId && objectIdIterate == objectId) QDomNode itemNode = group.firstChild();
while (itemNode.isNull() == false) // iterate through the items of the group
{
if (itemNode.isElement())
{
const QDomElement item = itemNode.toElement();
if (item.isNull() == false)
{ {
group.removeChild(itemNode); quint32 toolIdIterate= GetParametrUInt(item, AttrTool, "0");
break; quint32 objectIdIterate= GetParametrUInt(item, AttrObject, "0");
if(toolIdIterate == toolId && objectIdIterate == objectId)
{
group.removeChild(itemNode);
emit UpdateGroups();
break;
}
} }
} }
itemNode = itemNode.nextSibling();
} }
itemNode = itemNode.nextSibling();
} }
else
{
qDebug() << "The group of id " << groupId << " doesn't exist";
}
}
// Handling when removing the last child: //---------------------------------------------------------------------------------------------------------------------
// - automatically removes the group? /**
// - or allow a group to be empty? * @brief Returns true if the given group is empty
* @param id
* @return
*/
bool VAbstractPattern::GroupIsEmpty(quint32 id)
{
QDomElement group = elementById(id, TagGroup);
if (group.isNull() == false)
{
return not group.hasChildNodes();
}
else
{
qDebug() << "The group of id " << id << " doesn't exist";
return true;
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

View File

@ -198,6 +198,7 @@ public:
QMap<quint32, QString> GetGroupsContainingItem(quint32 toolId, quint32 objectId, bool containItem); QMap<quint32, QString> GetGroupsContainingItem(quint32 toolId, quint32 objectId, bool containItem);
void AddItemToGroup(quint32 toolId, quint32 objectId, quint32 groupId); void AddItemToGroup(quint32 toolId, quint32 objectId, quint32 groupId);
void RemoveItemFromGroup(quint32 toolId, quint32 objectId, quint32 groupId); void RemoveItemFromGroup(quint32 toolId, quint32 objectId, quint32 groupId);
bool GroupIsEmpty(quint32 id);
bool GetGroupVisivility(quint32 id); bool GetGroupVisivility(quint32 id);
void SetGroupVisivility(quint32 id, bool visible); void SetGroupVisivility(quint32 id, bool visible);
@ -388,6 +389,10 @@ signals:
void ShowDetail(quint32 id); void ShowDetail(quint32 id);
void SetCurrentPP(const QString &patterPiece); void SetCurrentPP(const QString &patterPiece);
void MadeProgress(); void MadeProgress();
/**
* @brief UpdateGroups emit if the groups have been updated
*/
void UpdateGroups();
public slots: public slots:
virtual void LiteParseTree(const Document &parse)=0; virtual void LiteParseTree(const Document &parse)=0;

View File

@ -59,8 +59,8 @@ class QDomElement;
*/ */
const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0");
const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.7"); const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.8");
const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.7.7.xsd"); const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.7.8.xsd");
//VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
//VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@ -227,7 +227,8 @@ QString VPatternConverter::XSDSchema(int ver) const
std::make_pair(0x000704, QStringLiteral("://schema/pattern/v0.7.4.xsd")), std::make_pair(0x000704, QStringLiteral("://schema/pattern/v0.7.4.xsd")),
std::make_pair(0x000705, QStringLiteral("://schema/pattern/v0.7.5.xsd")), std::make_pair(0x000705, QStringLiteral("://schema/pattern/v0.7.5.xsd")),
std::make_pair(0x000706, QStringLiteral("://schema/pattern/v0.7.6.xsd")), std::make_pair(0x000706, QStringLiteral("://schema/pattern/v0.7.6.xsd")),
std::make_pair(0x000707, CurrentSchema) std::make_pair(0x000707, QStringLiteral("://schema/pattern/v0.7.7.xsd")),
std::make_pair(0x000708, CurrentSchema)
}; };
if (schemas.contains(ver)) if (schemas.contains(ver))
@ -438,6 +439,10 @@ void VPatternConverter::ApplyPatches()
ValidateXML(XSDSchema(0x000707), m_convertedFileName); ValidateXML(XSDSchema(0x000707), m_convertedFileName);
V_FALLTHROUGH V_FALLTHROUGH
case (0x000707): case (0x000707):
ToV0_7_8();
ValidateXML(XSDSchema(0x000708), m_convertedFileName);
V_FALLTHROUGH
case (0x000708):
break; break;
default: default:
InvalidVersion(m_ver); InvalidVersion(m_ver);
@ -455,7 +460,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion()
bool VPatternConverter::IsReadOnly() const bool VPatternConverter::IsReadOnly() const
{ {
// Check if attribute readOnly was not changed in file format // Check if attribute readOnly was not changed in file format
Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 7, 7), Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 7, 8),
"Check attribute readOnly."); "Check attribute readOnly.");
// Possibly in future attribute readOnly will change position etc. // Possibly in future attribute readOnly will change position etc.
@ -999,6 +1004,17 @@ void VPatternConverter::ToV0_7_7()
Save(); Save();
} }
//---------------------------------------------------------------------------------------------------------------------
void VPatternConverter::ToV0_7_8()
{
// TODO. Delete if minimal supported version is 0.7.8
Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 7, 8),
"Time to refactor the code.");
SetVersion(QStringLiteral("0.7.8"));
Save();
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VPatternConverter::TagUnitToV0_2_0() void VPatternConverter::TagUnitToV0_2_0()
{ {

View File

@ -53,7 +53,7 @@ public:
static const QString PatternMaxVerStr; static const QString PatternMaxVerStr;
static const QString CurrentSchema; static const QString CurrentSchema;
static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0);
static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 7, 7); static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 7, 8);
protected: protected:
virtual int MinVer() const Q_DECL_OVERRIDE; virtual int MinVer() const Q_DECL_OVERRIDE;
@ -120,6 +120,7 @@ private:
void ToV0_7_5(); void ToV0_7_5();
void ToV0_7_6(); void ToV0_7_6();
void ToV0_7_7(); void ToV0_7_7();
void ToV0_7_8();
void TagUnitToV0_2_0(); void TagUnitToV0_2_0();
void TagIncrementToV0_2_0(); void TagIncrementToV0_2_0();