| [qet] [3414] Master element : comment is displayed even if there isn' t slave linked |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3414
Author: blacksun
Date: 2014-10-28 16:45:28 +0100 (Tue, 28 Oct 2014)
Log Message:
-----------
Master element : comment is displayed even if there isn't slave linked
Modified Paths:
--------------
trunk/sources/qetgraphicsitem/commentitem.cpp
trunk/sources/qetgraphicsitem/commentitem.h
trunk/sources/qetgraphicsitem/masterelement.cpp
trunk/sources/qetgraphicsitem/masterelement.h
trunk/sources/ui/elementinfopartwidget.cpp
trunk/sources/ui/elementinfopartwidget.h
trunk/sources/ui/elementinfowidget.cpp
Modified: trunk/sources/qetgraphicsitem/commentitem.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/commentitem.cpp 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/qetgraphicsitem/commentitem.cpp 2014-10-28 15:45:28 UTC (rev 3414)
@@ -79,6 +79,15 @@
}
/**
+ * @brief CommentItem::mouseDoubleClickEvent
+ * @param event
+ */
+void CommentItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
+ event -> accept();
+ m_element -> editProperty();
+}
+
+/**
* @brief CommentItem::updateLabel
* update the content of this item
* (draw this item in a QPicture)
Modified: trunk/sources/qetgraphicsitem/commentitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/commentitem.h 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/qetgraphicsitem/commentitem.h 2014-10-28 15:45:28 UTC (rev 3414)
@@ -44,6 +44,7 @@
protected:
virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+ virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event );
private:
Element *m_element;
Modified: trunk/sources/qetgraphicsitem/masterelement.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/masterelement.cpp 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/qetgraphicsitem/masterelement.cpp 2014-10-28 15:45:28 UTC (rev 3414)
@@ -17,6 +17,7 @@
*/
#include "masterelement.h"
#include "crossrefitem.h"
+#include "commentitem.h"
/**
* @brief MasterElement::MasterElement
@@ -27,10 +28,11 @@
* @param state int used to know if the creation of element have error
*/
MasterElement::MasterElement(const ElementsLocation &location, QGraphicsItem *qgi, Diagram *s, int *state) :
- CustomElement(location, qgi, s, state)
+ CustomElement(location, qgi, s, state),
+ cri_ (nullptr),
+ m_ci (nullptr)
{
link_type_ = Master;
- cri_ = nullptr;
connect(this, SIGNAL(elementInfoChange(DiagramContext)), this, SLOT(updateLabel()));
}
@@ -40,6 +42,7 @@
*/
MasterElement::~MasterElement() {
unlinkAllElements();
+ if (m_ci) delete m_ci;
disconnect(this, SIGNAL(elementInfoChange(DiagramContext)), this, SLOT(updateLabel()));
}
@@ -56,10 +59,18 @@
elmt->linkToElement(this);
if (!cri_) cri_ = new CrossRefItem(this); //create cross ref item if not yet
- connect(elmt, SIGNAL(xChanged()), cri_, SLOT(updateLabel()));
- connect(elmt, SIGNAL(yChanged()), cri_, SLOT(updateLabel()));
- cri_->updateLabel();
+
+ connect(elmt, SIGNAL(xChanged()), cri_, SLOT(updateLabel()));
+ connect(elmt, SIGNAL(yChanged()), cri_, SLOT(updateLabel()));
+ cri_ -> updateLabel();
+
+ //If there is a comment item, we delete it
+ //because cross ref item display comment too.
+ if (m_ci) {
+ delete m_ci;
+ m_ci = nullptr;
}
+ }
}
/**
@@ -93,6 +104,7 @@
if (linkedElements().isEmpty()) {
delete cri_;
cri_ = nullptr;
+ updateLabel();
}
else {
cri_->updateLabel();
@@ -101,8 +113,23 @@
}
/**
+ * @brief MasterElement::initLink
+ * Initialise the links between this element and other element.
+ * @param project
+ */
+void MasterElement::initLink(QETProject *project) {
+ //Create the link with other element if needed
+ CustomElement::initLink(project);
+
+ //If no link that mean there are no cross ref item (cri)
+ //So we call @updateLabel for add comment item (m_ci) if needed.
+ if (!cri_) updateLabel();
+}
+
+/**
* @brief MasterElement::updateLabel
* update label of this element
+ * and the comment item if he's displayed.
*/
void MasterElement::updateLabel() {
QString label = elementInformations()["label"].toString();
@@ -112,4 +139,20 @@
(label.isEmpty() || !show)?
setTaggedText("label", "_", false):
setTaggedText("label", label, true);
+
+ if (cri_) return;
+
+ //At this point there isn't a cross ref item displayed,
+ //but if element have comment and must be show, we add a comment item
+
+ QString comment = elementInformations()["comment"].toString();
+ bool must_show = elementInformations().keyMustShow("comment");
+
+ if (!(comment.isEmpty() || !must_show) && !m_ci) {
+ m_ci = new CommentItem(this);
+ }
+ else if ((comment.isEmpty() || !must_show) && m_ci) {
+ delete m_ci;
+ m_ci = nullptr;
+ }
}
Modified: trunk/sources/qetgraphicsitem/masterelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/masterelement.h 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/qetgraphicsitem/masterelement.h 2014-10-28 15:45:28 UTC (rev 3414)
@@ -21,25 +21,35 @@
#include "customelement.h"
class CrossRefItem;
+class CommentItem;
+/**
+ * @brief The MasterElement class
+ * This class is a custom element, with extended behavior
+ * to be a master element. Master element can be linked with slave element
+ * and display a cross ref item for know with what other element he is linked
+ */
class MasterElement : public CustomElement
{
Q_OBJECT
public:
- explicit MasterElement(const ElementsLocation &, QGraphicsItem * = 0, Diagram * = 0, int * = 0);
- ~MasterElement();
- virtual void linkToElement(Element *elmt);
- virtual void unlinkAllElements();
- virtual void unlinkElement(Element *elmt);
+ explicit MasterElement(const ElementsLocation &, QGraphicsItem * = 0, Diagram * = 0, int * = 0);
+ ~MasterElement();
+
+ virtual void linkToElement (Element *elmt);
+ virtual void unlinkAllElements ();
+ virtual void unlinkElement (Element *elmt);
+ virtual void initLink (QETProject *project);
signals:
public slots:
- void updateLabel();
+ void updateLabel();
private:
- CrossRefItem *cri_;
+ CrossRefItem *cri_;
+ CommentItem *m_ci;
};
#endif // MASTERELEMENT_H
Modified: trunk/sources/ui/elementinfopartwidget.cpp
===================================================================
--- trunk/sources/ui/elementinfopartwidget.cpp 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/ui/elementinfopartwidget.cpp 2014-10-28 15:45:28 UTC (rev 3414)
@@ -70,6 +70,20 @@
return (ui->checkBox->isChecked());
}
-void ElementInfoPartWidget::setShow(bool s) {
+/**
+ * @brief ElementInfoPartWidget::setShow
+ * Check or not the ckeck box
+ * @param s true-> checked
+ */
+void ElementInfoPartWidget::setShow(const bool &s) {
ui->checkBox->setChecked(s);
}
+
+/**
+ * @brief ElementInfoPartWidget::setHideShow
+ * Hide or not the check box
+ * @param hide true -> hidden
+ */
+void ElementInfoPartWidget::setHideShow(const bool &hide) {
+ ui -> checkBox -> setHidden(hide);
+}
Modified: trunk/sources/ui/elementinfopartwidget.h
===================================================================
--- trunk/sources/ui/elementinfopartwidget.h 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/ui/elementinfopartwidget.h 2014-10-28 15:45:28 UTC (rev 3414)
@@ -27,20 +27,22 @@
class ElementInfoPartWidget : public QWidget {
Q_OBJECT
- //METHODS
- public:
- explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = 0);
- ~ElementInfoPartWidget();
- QString key() const {return key_;}
- void setText(const QString &);
- QString text() const;
- bool mustShow() const;
- void setShow(bool);
+ //METHODS
+ public:
+ explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = 0);
+ ~ElementInfoPartWidget();
- //ATTRIBUTES
- private:
- Ui::ElementInfoPartWidget *ui;
- QString key_;
+ QString key () const {return key_;}
+ void setText (const QString &);
+ QString text () const;
+ bool mustShow () const;
+ void setShow (const bool &);
+ void setHideShow (const bool &);
+
+ //ATTRIBUTES
+ private:
+ Ui::ElementInfoPartWidget *ui;
+ QString key_;
};
#endif // ELEMENTINFOPARTWIDGET_H
Modified: trunk/sources/ui/elementinfowidget.cpp
===================================================================
--- trunk/sources/ui/elementinfowidget.cpp 2014-10-28 12:55:39 UTC (rev 3413)
+++ trunk/sources/ui/elementinfowidget.cpp 2014-10-28 15:45:28 UTC (rev 3414)
@@ -81,12 +81,17 @@
*/
void ElementInfoWidget::fillInfo() {
foreach (ElementInfoPartWidget *eipw, eipw_list) {
- eipw->setText(elmt_info[eipw->key()].toString());
- eipw->setShow(elmt_info.keyMustShow(eipw->key()));
- //check "show" if this eipw is label and if elmt_info haven't got value for label.
- if (eipw->key() == "label" && (elmt_info["label"].toString().isEmpty()))
- eipw->setShow(true);
- else if (eipw->key() == "comment" && (elmt_info["comment"].toString().isEmpty()))
- eipw->setShow(true);
+
+ eipw -> setText (elmt_info[eipw->key()].toString());
+ eipw -> setShow (elmt_info.keyMustShow(eipw->key()));
+
+ //If the current eipw is for label or comment and the text is empty
+ //we force the checkbox to ckecked
+ if (eipw -> key() == "label" || eipw -> key() == "comment") {
+ if (elmt_info[eipw->key()].toString().isEmpty())
+ eipw->setShow(true);
+ }
+ else //< for other eipw we hide the checkbox
+ eipw->setHideShow(true);
}
}