zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Group::IsVisible(), GroupsInOrder().

pull/144/head
EvilSpirit 2016-12-21 22:56:53 +07:00 committed by whitequark
parent 43db2201fd
commit 022d012a44
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/generate.cpp
View File

@ -57,15 +57,8 @@ bool SolveSpaceUI::PruneOrphans() {
bool SolveSpaceUI::GroupsInOrder(hGroup before, hGroup after) { bool SolveSpaceUI::GroupsInOrder(hGroup before, hGroup after) {
if(before.v == 0) return true; if(before.v == 0) return true;
if(after.v == 0) return true; if(after.v == 0) return true;
int beforep = SK.GetGroup(before)->order;
int beforep = -1, afterp = -1; int afterp = SK.GetGroup(after)->order;
int i;
for(i = 0; i < SK.groupOrder.n; i++) {
hGroup hg = SK.groupOrder.elem[i];
if(hg.v == before.v) beforep = i;
if(hg.v == after.v) afterp = i;
}
if(beforep < 0 || afterp < 0) return false;
if(beforep >= afterp) return false; if(beforep >= afterp) return false;
return true; return true;
} }

3
src/group.cpp
View File

@ -44,7 +44,8 @@ void Group::AddParam(IdList<Param,hParam> *param, hParam hp, double v) {
bool Group::IsVisible() { bool Group::IsVisible() {
if(!visible) return false; if(!visible) return false;
if(SS.GroupsInOrder(SS.GW.activeGroup, h)) return false; Group *active = SK.GetGroup(SS.GW.activeGroup);
if(order > active->order) return false;
return true; return true;
} }