python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-25 04:54:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander 2016-09-09 21:50:04 +04:00
commit 5832d77112
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
limereport/lrbanddesignintf.cpp
View File

@ -295,11 +295,16 @@ void BandDesignIntf::setParentBandName(const QString &parentBandName)
{
m_parentBandName=parentBandName;
if (itemMode()&DesignMode && !m_parentBandName.isEmpty()){
if ((parentBand()==0)||(parentBand()->objectName()!=parentBandName))
setParentBand( findParentBand());
if ((parentBand() == 0 )||(parentBand()->objectName()!= parentBandName))
setParentBand(findParentBand());
}
}
QString BandDesignIntf::parentBandName(){
if (!m_parentBand) return m_parentBandName;
else return m_parentBand->objectName();
}
bool BandDesignIntf::isConnectedToBand(BandDesignIntf::BandsType bandType) const
{
foreach(BandDesignIntf* band,childBands()) if (band->bandType()==bandType) return true;

2
limereport/lrbanddesignintf.h
View File

@ -146,7 +146,7 @@ public:
void setParentBand(BandDesignIntf* band);
void setParentBandName(const QString& parentBandName);
QString parentBandName(){return m_parentBandName;}
QString parentBandName();
bool isConnectedToBand(BandDesignIntf::BandsType bandType) const;