caiyu/nim_duilib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified variable of tree nodes

Browse Source 
Signed-off-by: jiajia_deng <2894220@gmail.com>
This commit is contained in:
jiajia_deng 2019-07-25 11:51:29 +08:00
parent c627eff95d
commit babf0c2237
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tool_kits/duilib/Control/TreeView.cpp
View File

@ -10,7 +10,7 @@ TreeNode::TreeNode() :
m_pTreeView(nullptr), m_pTreeView(nullptr),
m_pParentTreeNode(nullptr), m_pParentTreeNode(nullptr),
m_iDepth(ROOT_NODE_DEPTH), m_iDepth(ROOT_NODE_DEPTH),
mTreeNodes() m_aTreeNodes()
{ {
} }
@ -37,7 +37,7 @@ void TreeNode::SetInternVisible(bool bVisible)
void TreeNode::SetWindow(Window* pManager, Box* pParent, bool bInit) void TreeNode::SetWindow(Window* pManager, Box* pParent, bool bInit)
{ {
for (auto it = mTreeNodes.begin(); it != mTreeNodes.end(); it++) for (auto it = m_aTreeNodes.begin(); it != m_aTreeNodes.end(); it++)
{ {
(*it)->SetWindow(pManager, this, bInit); (*it)->SetWindow(pManager, this, bInit);
} }
@ -75,8 +75,8 @@ bool TreeNode::AddChildNode(TreeNode* pTreeNode)
bool TreeNode::AddChildNodeAt(TreeNode* pTreeNode, std::size_t iIndex) bool TreeNode::AddChildNodeAt(TreeNode* pTreeNode, std::size_t iIndex)
{ {
if( iIndex < 0 || iIndex > mTreeNodes.size() ) return false; if( iIndex < 0 || iIndex > m_aTreeNodes.size() ) return false;
mTreeNodes.insert(mTreeNodes.begin() + iIndex, pTreeNode); m_aTreeNodes.insert(m_aTreeNodes.begin() + iIndex, pTreeNode);
pTreeNode->m_iDepth = m_iDepth + 1; pTreeNode->m_iDepth = m_iDepth + 1;
pTreeNode->SetParentNode(this); pTreeNode->SetParentNode(this);
@ -95,7 +95,7 @@ bool TreeNode::AddChildNodeAt(TreeNode* pTreeNode, std::size_t iIndex)
std::size_t nGlobalIndex = iIndex; std::size_t nGlobalIndex = iIndex;
for (std::size_t i = 0; i < iIndex; i++) for (std::size_t i = 0; i < iIndex; i++)
{ {
nGlobalIndex += ((TreeNode*)mTreeNodes[i])->GetDescendantNodeCount(); nGlobalIndex += ((TreeNode*)m_aTreeNodes[i])->GetDescendantNodeCount();
} }
return m_pTreeView->ListBox::AddAt(pTreeNode, (int)(nodeIndex + nGlobalIndex + 1)); return m_pTreeView->ListBox::AddAt(pTreeNode, (int)(nodeIndex + nGlobalIndex + 1));
@ -103,30 +103,30 @@ bool TreeNode::AddChildNodeAt(TreeNode* pTreeNode, std::size_t iIndex)
bool TreeNode::RemoveChildNodeAt(std::size_t iIndex) bool TreeNode::RemoveChildNodeAt(std::size_t iIndex)
{ {
if (iIndex < 0 || iIndex >= mTreeNodes.size()) { if (iIndex < 0 || iIndex >= m_aTreeNodes.size()) {
return false; return false;
} }
TreeNode* pTreeNode = ((TreeNode*)mTreeNodes[iIndex]); TreeNode* pTreeNode = ((TreeNode*)m_aTreeNodes[iIndex]);
mTreeNodes.erase(mTreeNodes.begin() + iIndex); m_aTreeNodes.erase(m_aTreeNodes.begin() + iIndex);
return pTreeNode->RemoveSelf(); return pTreeNode->RemoveSelf();
} }
bool TreeNode::RemoveChildNode(TreeNode* pTreeNode) bool TreeNode::RemoveChildNode(TreeNode* pTreeNode)
{ {
auto it = std::find(mTreeNodes.begin(), mTreeNodes.end(), pTreeNode); auto it = std::find(m_aTreeNodes.begin(), m_aTreeNodes.end(), pTreeNode);
if (it == mTreeNodes.end()) { if (it == m_aTreeNodes.end()) {
return false; return false;
} }
int iIndex = it - mTreeNodes.begin(); int iIndex = it - m_aTreeNodes.begin();
return RemoveChildNodeAt(iIndex); return RemoveChildNodeAt(iIndex);
} }
void TreeNode::RemoveAllChildNode() void TreeNode::RemoveAllChildNode()
{ {
while (mTreeNodes.size() > 0) while (m_aTreeNodes.size() > 0)
{ {
RemoveChildNodeAt(0); RemoveChildNodeAt(0);
} }
@ -134,11 +134,11 @@ void TreeNode::RemoveAllChildNode()
bool TreeNode::RemoveSelf() bool TreeNode::RemoveSelf()
{ {
for( auto it = mTreeNodes.begin(); it != mTreeNodes.end(); it++ ) for( auto it = m_aTreeNodes.begin(); it != m_aTreeNodes.end(); it++ )
{ {
(*it)->RemoveSelf(); (*it)->RemoveSelf();
} }
mTreeNodes.clear(); m_aTreeNodes.clear();
if (m_iDepth != ROOT_NODE_DEPTH) { if (m_iDepth != ROOT_NODE_DEPTH) {
return m_pTreeView->ListBox::RemoveAt(GetIndex()); return m_pTreeView->ListBox::RemoveAt(GetIndex());
@ -150,7 +150,7 @@ bool TreeNode::RemoveSelf()
int TreeNode::GetDescendantNodeCount() int TreeNode::GetDescendantNodeCount()
{ {
int nodeCount = (int)GetChildNodeCount(); int nodeCount = (int)GetChildNodeCount();
for( auto it = mTreeNodes.begin(); it != mTreeNodes.end(); it++ ) for( auto it = m_aTreeNodes.begin(); it != m_aTreeNodes.end(); it++ )
{ {
nodeCount += (*it)->GetDescendantNodeCount(); nodeCount += (*it)->GetDescendantNodeCount();
} }
@ -160,22 +160,22 @@ int TreeNode::GetDescendantNodeCount()
std::size_t TreeNode::GetChildNodeCount() std::size_t TreeNode::GetChildNodeCount()
{ {
return mTreeNodes.size(); return m_aTreeNodes.size();
} }
TreeNode* TreeNode::GetChildNode(std::size_t iIndex) TreeNode* TreeNode::GetChildNode(std::size_t iIndex)
{ {
if( iIndex < 0 || iIndex >= mTreeNodes.size() ) return NULL; if( iIndex < 0 || iIndex >= m_aTreeNodes.size() ) return NULL;
return static_cast<TreeNode*>(mTreeNodes[iIndex]); return static_cast<TreeNode*>(m_aTreeNodes[iIndex]);
} }
int TreeNode::GetChildNodeIndex(TreeNode* pTreeNode) int TreeNode::GetChildNodeIndex(TreeNode* pTreeNode)
{ {
auto it = std::find(mTreeNodes.begin(), mTreeNodes.end(), pTreeNode); auto it = std::find(m_aTreeNodes.begin(), m_aTreeNodes.end(), pTreeNode);
if (it == mTreeNodes.end()) { if (it == m_aTreeNodes.end()) {
return -1; return -1;
} }
return it - mTreeNodes.begin(); return it - m_aTreeNodes.begin();
} }
bool TreeNode::IsExpand() const bool TreeNode::IsExpand() const

2
tool_kits/duilib/Control/TreeView.h
View File

@ -140,7 +140,7 @@ private:
bool m_bExpand; bool m_bExpand;
TreeView *m_pTreeView; TreeView *m_pTreeView;
TreeNode *m_pParentTreeNode; TreeNode *m_pParentTreeNode;
std::vector<TreeNode*> mTreeNodes; std::vector<TreeNode*> m_aTreeNodes;
}; };
class UILIB_API TreeView : public ListBox class UILIB_API TreeView : public ListBox