kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: fix Expression _moveCells()

Browse Source 
The problem is caused by not refreshing ObjectIdentifier internal cache
after change.
This commit is contained in:
Zheng, Lei
2019-12-16 11:34:52 +08:00
committed by wwmayer
parent 6562946e36
commit d5a4996d25
4 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/App/ObjectIdentifier.cpp
View File

@@ -185,25 +185,36 @@ std::string App::ObjectIdentifier::getPropertyName() const
/**
* @brief Get Component at given index \a i.
* @param i Index to get
* @param i: Index to get
* @param idx: optional return of adjusted component index
* @return A component.
*/
const App::ObjectIdentifier::Component &App::ObjectIdentifier::getPropertyComponent(int i) const
const App::ObjectIdentifier::Component &App::ObjectIdentifier::getPropertyComponent(int i, int *idx) const
{
ResolveResults result(*this);
assert(result.propertyIndex + i >=0 && static_cast<std::size_t>(result.propertyIndex) + i < components.size());
i += result.propertyIndex;
if (i < 0 || i >= static_cast<int>(components.size()))
FC_THROWM(Base::ValueError, "Invalid property component index");
return components[result.propertyIndex + i];
if (idx)
*idx = i;
return components[i];
}
App::ObjectIdentifier::Component &App::ObjectIdentifier::getPropertyComponent(int i)
void App::ObjectIdentifier::setComponent(int idx, Component &&comp)
{
ResolveResults result(*this);
assert(result.propertyIndex + i >=0 &&
static_cast<std::size_t>(result.propertyIndex) + i < components.size());
return components[result.propertyIndex + i];
if (idx < 0 || idx >= static_cast<int>(components.size()))
FC_THROWM(Base::ValueError, "Invalid component index");
components[idx] = std::move(comp);
_cache.clear();
}
void App::ObjectIdentifier::setComponent(int idx, const Component &comp)
{
setComponent(idx, Component(comp));
}
std::vector<ObjectIdentifier::Component> ObjectIdentifier::getPropertyComponents() const {