Merge branch 'master' of ssh://101.43.129.26:10022/chengxr/QFD2

QFD/CCanvas/CMindView.cpp

@@ -43,6 +43,7 @@ void CMindView::setNodeList(QList<CNodeData> list)
 
 void CMindView::addNode(CNodeData n)
 {
+    qDebug() << __FUNCTION__ << __LINE__ << n.name << n.number << n.pNumber << endl;
     m_mind->addNode(n);
     CNodeItem *item = new CNodeItem(n);
     connect(item, &CNodeItem::sigAddSubItem, this, &CMindView::slotAddSubNode);
@@ -198,6 +199,7 @@ void CMindView::testData()
 
 void CMindView::slotAddSubNode(int pNumber)
 {
+    qDebug() << __FUNCTION__ << __LINE__ << pNumber << endl;
     if (pNumber < 0) {
         return;
     }
@@ -209,6 +211,7 @@ void CMindView::slotAddSubNode(int pNumber)
 
 void CMindView::slotRemoveNode(int number)
 {
+    qDebug() << __FUNCTION__ << __LINE__ << number << endl;
     m_mind->removeNode(number);
     if (number == m_root->data().number) {
         clear();

QFD/CCanvas/CNodeItem.cpp

@@ -210,18 +210,11 @@ int CNodeItem::sizeOfLevel(int lev) const
 
 qreal CNodeItem::textWidth() const
 {
-    //    qreal w = CTextItem::textSize(data().name).width();
-    //    w       = std::min(w, maxWidth());
-    //    w       = std::max(w, minWidth());
-    //    return w;
-
     return m_textItem->boundingRect().width();
 }
 
 qreal CNodeItem::textHeight() const
 {
-    //    qreal h = CTextItem::textSize(data().name, textWidth()).height();
-    //    return h;
     return m_textItem->boundingRect().height();
 }
 
@@ -308,22 +301,18 @@ void CNodeItem::slotSelect()
 
 void CNodeItem::slotSubNode()
 {
+    qDebug() << __FUNCTION__ << __LINE__ << data().number << endl;
     emit sigAddSubItem(data().number);
 }
 
 void CNodeItem::slotRemove()
 {
+    qDebug() << __FUNCTION__ << __LINE__ << data().number << endl;
     emit sigRemoveItem(data().number);
 }
 
 void CNodeItem::slotTextChanged()
 {
-    //    qDebug() << __FUNCTION__ << __LINE__ << m_textItem->toPlainText() << endl;
-    //    qreal w = CTextItem::textSize(m_textItem->toPlainText()).width();
-    //    w       = std::min(w, maxWidth());
-    //    w       = std::max(w, minWidth());
-    //    m_textItem->setTextWidth(w);
-
     data().name = m_textItem->toPlainText();
     emit sigTextChanged();
 }