HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update buffer tree

Browse Source
This commit is contained in:
Edouard DUPIN 2018-10-23 22:27:42 +02:00
parent 432fa5bf2e
commit b7b962c3f5
3 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sources/appl/Gui/MainWindows.cpp
View File

@ -115,6 +115,7 @@ void MainWindows::init() {
mySizerVert->subWidgetAdd(mySizerHori);
m_viewBuffer = appl::widget::BufferList::create();
m_viewBuffer->propertyHide.set(true);
m_viewBuffer->propertyName.set("appl-buffer-view");
m_viewBuffer->propertyExpand.set(bvec2(false,true));
m_viewBuffer->propertyFill.set(bvec2(true,true));
@ -122,8 +123,8 @@ void MainWindows::init() {
mySizerHori->subWidgetAdd(m_viewBuffer);
m_viewTree = appl::widget::BufferTree::create();
m_viewTree->propertyHide.set(true);
m_viewTree->propertyName.set("appl-tree-view");
//m_viewTree->propertyHide.set(true);
m_viewTree->propertyExpand.set(bvec2(false,true));
m_viewTree->propertyFill.set(bvec2(true,true));
m_viewTree->propertyMinSize.set(gale::Dimension(vec2(300,2), gale::distance::pixel));
@ -247,7 +248,7 @@ void MainWindows::init() {
shortCutAdd("ctrl+l", "menu:goto-line");
shortCutAdd("ctrl+f", "menu:search");
shortCutAdd("F12", "menu:reloade-shader");
shortCutAdd("alt+F12", "menu:reloade-shader");
shortCutAdd("alt+F4", "menu:exit");
// TODO : auto-connect on shortcut event ==> maybe do beter later ...
signalShortcut.connect(sharedFromThis(), &MainWindows::onCallbackShortCut);

8
sources/appl/widget/BufferList.cpp
View File

@ -134,7 +134,7 @@ void appl::widget::BufferList::onCallbackChangeName() {
}
void appl::widget::BufferList::onCallbackBufferRemoved(const ememory::SharedPtr<appl::Buffer>& _buffer) {
APPL_ERROR("request remove buffer:");
APPL_DEBUG("request remove buffer:");
auto it = m_list.begin();
while (it != m_list.end()) {
if (it->m_buffer == _buffer) {
@ -180,7 +180,7 @@ fluorine::Variant appl::widget::BufferList::getData(int32_t _role, const ivec2&
return (*m_paintingProperties)[m_colorTextModify].getForeground();
}
case ewol::widget::ListRole::BgColor:
APPL_ERROR( m_colorBackground1 << " => " << (*m_paintingProperties)[m_colorBackground1].getForeground());
APPL_VERBOSE( m_colorBackground1 << " => " << (*m_paintingProperties)[m_colorBackground1].getForeground());
if (m_selectedID == _pos.y()) {
return (*m_paintingProperties)[m_colorBackgroundSelect].getForeground();
}
@ -198,12 +198,12 @@ fluorine::Variant appl::widget::BufferList::getData(int32_t _role, const ivec2&
bool appl::widget::BufferList::onItemEvent(const ewol::event::Input& _event, const ivec2& _pos, const vec2& _mousePosition) {
if ( _event.getId() == 1
&& _event.getStatus() == gale::key::status::pressSingle) {
APPL_INFO("Event on List: " << _event << " pos=" << _pos );
APPL_VERBOSE("Event on List: " << _event << " pos=" << _pos );
if( _pos.y() >= 0
&& _pos.y() < (int64_t)m_list.size()) {
if (m_list[_pos.y()].m_buffer != null) {
if (m_bufferManager != null) {
APPL_INFO("Select file: '" << m_list[_pos.y()].m_buffer->getFileName() << "' in list");
APPL_VERBOSE("Select file: '" << m_list[_pos.y()].m_buffer->getFileName() << "' in list");
m_bufferManager->open(m_list[_pos.y()].m_buffer->getFileName());
}
return true;

91
sources/appl/widget/BufferTree.cpp
View File

@ -15,7 +15,7 @@
appl::widget::BufferTree::BufferTree() :
propertyShowUnNeeded(this, "show-un-needed",
false,
true,
"show element that is not open",
&appl::widget::BufferTree::onChangePropertyShowUnNeeded),
m_openOrderMode(false) {
@ -53,9 +53,14 @@ void appl::widget::BufferTree::init() {
static etk::String getCommonPathPart(const etk::Path& _left, const etk::Path& _right) {
etk::String out;
for (size_t iii=0; iii < etk::min(_left.getString().size(), _right.getString().size()); ++iii) {
if (_left.getString()[iii] == _right.getString()[iii]) {
out += _left.getString()[iii];
etk::String left = _left.getString() + "/";
etk::String right = _right.getString() + "/";
APPL_VERBOSE("Common Part:");
APPL_VERBOSE(" _left = " << left);
APPL_VERBOSE(" _right = " << right);
for (size_t iii=0; iii < etk::min(left.size(), right.size()); ++iii) {
if (left[iii] == right[iii]) {
out += left[iii];
continue;
}
break;
@ -64,6 +69,10 @@ static etk::String getCommonPathPart(const etk::Path& _left, const etk::Path& _r
if (pos != etk::String::npos) {
out = out.extract(0, pos);
}
if (out.isEmpty() == true) {
out = "/";
}
APPL_VERBOSE(" out = " << out);
return out;
}
@ -98,9 +107,9 @@ void appl::widget::BufferTree::populateNodeIfNeeded(ememory::SharedPtr<etk::Tree
}
etk::Vector<etk::Path> child = etk::path::list(value.m_path, etk::path::LIST_FOLDER|etk::path::LIST_FILE);
etk::algorithm::quickSort(child, localSort);
APPL_ERROR(" nbChilds: " << child.size() << " for path: " << value.m_path);
APPL_VERBOSE(" nbChilds: " << child.size() << " for path: " << value.m_path);
for (auto& it: child) {
APPL_ERROR("add element: " << it);
APPL_VERBOSE("add element: " << it);
auto elem = etk::TreeNode<appl::TreeElement>::create(TreeElement(it, false));
_node->addChild(elem);
// TODO: ETK_FREE(etk::FSNode, it);
@ -108,7 +117,7 @@ void appl::widget::BufferTree::populateNodeIfNeeded(ememory::SharedPtr<etk::Tree
}
void appl::widget::BufferTree::goUpper() {
APPL_ERROR("Go upper ...");
APPL_VERBOSE("Go upper ...");
if (m_tree == null) {
generateFlatTree();
return;
@ -240,34 +249,47 @@ etk::Path appl::widget::BufferTree::getRootPath() {
etk::Path nodeName = it->getFileName();
if (upperParent.isEmpty() == true) {
upperParent = nodeName.getParent();
APPL_ERROR("init root: " << nodeName << " root=" << upperParent);
APPL_DEBUG("init root: " << nodeName << " root=" << upperParent);
continue;
}
upperParent = getCommonPathPart(upperParent, nodeName.getParent());
APPL_ERROR("Update: " << nodeName << " " << nodeName.getParent() << " root=" << upperParent);
APPL_DEBUG("Update: " << nodeName << " " << nodeName.getParent() << " root=" << upperParent);
}
if (upperParent == "") {
APPL_ERROR("Nothing find ==> get home path...");
APPL_DEBUG("Nothing find ==> get home path...");
upperParent = etk::path::getHomePath();
}
APPL_ERROR("update tree: " << upperParent);
APPL_DEBUG("update tree: " << upperParent);
return upperParent;
}
void appl::widget::BufferTree::onNewBuffer(const ememory::SharedPtr<appl::Buffer>& _buffer) {
APPL_INFO("New Buffer open: '" << _buffer->getFileName() << "'");
ememory::SharedPtr<appl::Buffer> buffer = _buffer;
buffer->signalIsSave.connect(sharedFromThis(), &appl::widget::BufferTree::onCallbackIsSave);
buffer->signalIsModify.connect(sharedFromThis(), &appl::widget::BufferTree::onCallbackIsModify);
buffer->signalChangeName.connect(sharedFromThis(), &appl::widget::BufferTree::onCallbackChangeName);
if (m_tree == null) {
generateFlatTree();
} else {
etk::Path rootPath = getRootPath();
while (rootPath != m_tree->getData().m_path ) {
APPL_ERROR("rootPath=" << rootPath << " != " << m_tree->getData().m_path);
goUpper();
APPL_VERBOSE("=============================================================================================================");
APPL_VERBOSE("== file: " << _buffer->getFileName());
APPL_VERBOSE("== root: " << rootPath);
APPL_VERBOSE("== tree: " << m_tree->getData().m_path);
APPL_VERBOSE("=============================================================================================================");
if (rootPath.getString().startWith(m_tree->getData().m_path.getString()) == false) {
APPL_VERBOSE(" ==> not contained");
while ( rootPath != m_tree->getData().m_path
&& m_tree->getData().m_path.getString() != "/") {
APPL_VERBOSE("rootPath=" << rootPath << " != " << m_tree->getData().m_path);
goUpper();
}
}
}
expandToPath(m_tree, _buffer->getFileName());
auto listElements = m_tree->findIf([&](const etk::TreeNode<TreeElement>& _node) {
APPL_WARNING("Compare : '" << _node.getData().m_path << "' =?= '" << _buffer->getFileName() << "'");
APPL_VERBOSE("Compare : '" << _node.getData().m_path << "' =?= '" << _buffer->getFileName() << "'");
if (_node.getData().m_path == _buffer->getFileName()) {
return true;
}
@ -278,32 +300,7 @@ void appl::widget::BufferTree::onNewBuffer(const ememory::SharedPtr<appl::Buffer
} else {
listElements[0]->getData().m_buffer = _buffer;
}
updateFlatTree();
/*
ememory::SharedPtr<appl::Buffer> buffer = m_bufferManager->get(_value);
if (buffer == null) {
APPL_ERROR("event on element nor exist : " << _value);
return;
}
buffer->signalIsSave.connect(sharedFromThis(), &BufferTree::onCallbackIsSave);
buffer->signalIsModify.connect(sharedFromThis(), &BufferTree::onCallbackIsModify);
buffer->signalChangeName.connect(sharedFromThis(), &BufferTree::onCallbackChangeName);
appl::dataBufferStruct tmp(_value, buffer);
if (m_openOrderMode == true) {
m_list.pushBack(tmp);
} else {
insertAlphabetic(tmp);
}
if (m_list.size() <= 1) {
propertyHide.set(true);
propertySetOnWidgetNamed("appl-Buffer-viewer-separator", "hide", "true");
} else {
propertyHide.set(false);
propertySetOnWidgetNamed("appl-Buffer-viewer-separator", "hide", "false");
}
markToRedraw();
*/
}
void appl::widget::BufferTree::onSelectBuffer(const ememory::SharedPtr<appl::Buffer>& _buffer) {
@ -344,7 +341,7 @@ void appl::widget::BufferTree::onCallbackChangeName() {
}
void appl::widget::BufferTree::onRemoveBuffer(const ememory::SharedPtr<appl::Buffer>& _buffer) {
APPL_ERROR("request remove buffer:");
APPL_DEBUG("request remove buffer:");
auto elem = m_tree->findIf([&](const etk::TreeNode<TreeElement>& _element) {
if (_element.getData().m_buffer == _buffer) {
return true;
@ -375,7 +372,7 @@ ivec2 appl::widget::BufferTree::getMatrixSize() const {
}
void appl::widget::BufferTree::onItemExpandEvent(const ivec2& _pos) {
APPL_WARNING("Event on expand on " << _pos);
APPL_DEBUG("Event on expand on " << _pos);
m_flatTree[_pos.y()]->getData().m_isExpand = m_flatTree[_pos.y()]->getData().m_isExpand?false:true;
updateFlatTree();
}
@ -392,7 +389,7 @@ fluorine::Variant appl::widget::BufferTree::getData(int32_t _role, const ivec2&
return (*m_paintingProperties)[m_colorTextNormal].getForeground();
}
if (value.m_buffer == null) {
//APPL_ERROR( m_colorBackgroundHide << " => " << (*m_paintingProperties)[m_colorBackgroundHide].getForeground());
APPL_VERBOSE( m_colorBackgroundHide << " => " << (*m_paintingProperties)[m_colorBackgroundHide].getForeground());
return (*m_paintingProperties)[m_colorTextNotOpen].getForeground();
}
if (value.m_buffer->isModify() == false) {
@ -401,7 +398,7 @@ fluorine::Variant appl::widget::BufferTree::getData(int32_t _role, const ivec2&
return (*m_paintingProperties)[m_colorTextModify].getForeground();
case ewol::widget::ListRole::BgColor:
//return fluorine::Variant();
//APPL_ERROR( m_colorBackground1 << " => " << (*m_paintingProperties)[m_colorBackground1].getForeground());
APPL_VERBOSE( m_colorBackground1 << " => " << (*m_paintingProperties)[m_colorBackground1].getForeground());
if ( value.m_buffer == m_selection
&& m_selection != null) {
return (*m_paintingProperties)[m_colorBackgroundSelect].getForeground();
@ -457,7 +454,7 @@ bool appl::widget::BufferTree::onItemEvent(const ewol::event::Input& _event, con
return true;
} else if (value.m_buffer == null) {
if (m_bufferManager != null) {
APPL_INFO("Select file: '" << value.m_path << "' in list");
APPL_VERBOSE("Select file: '" << value.m_path << "' in list");
m_bufferManager->open(value.m_path);
value.m_buffer = m_bufferManager->get(value.m_path);
}
@ -465,10 +462,10 @@ bool appl::widget::BufferTree::onItemEvent(const ewol::event::Input& _event, con
}
}
if (_event.getStatus() == gale::key::status::pressSingle) {
APPL_INFO("Event on List: " << _event << " pos=" << _pos );
APPL_VERBOSE("Event on List: " << _event << " pos=" << _pos );
if (value.m_buffer != null) {
if (m_bufferManager != null) {
APPL_INFO("Select file: '" << value.m_path << "' in list");
APPL_VERBOSE("Select file: '" << value.m_path << "' in list");
m_bufferManager->open(value.m_path);
}
return true;