mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-31 05:11:56 +03:00
Code Activity

1.4.3

Browse Source
This commit is contained in:
Arin Alexander
2017-03-03 00:31:18 +03:00
parent c0b4c65e9e ef712cca5f
commit 727b6c9436
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
limereport/lrdatasourcemanager.cpp
View File

@@ -1081,33 +1081,58 @@ QObject* DataSourceManager::elementAt(const QString &collectionName, int index)
void DataSourceManager::collectionLoadFinished(const QString &collectionName) void DataSourceManager::collectionLoadFinished(const QString &collectionName)
{ {
if (collectionName.compare("connections",Qt::CaseInsensitive)==0){ if (collectionName.compare("connections",Qt::CaseInsensitive) == 0){
} }
if (collectionName.compare("queries",Qt::CaseInsensitive)==0){ if (collectionName.compare("queries",Qt::CaseInsensitive) == 0){
foreach(QueryDesc* query,m_queries){
connect(query, SIGNAL(queryTextChanged(QString,QString)), QMutableListIterator<QueryDesc*> it(m_queries);
this, SLOT(slotQueryTextChanged(QString,QString))); while (it.hasNext()){
putHolder(query->queryName(),new QueryHolder(query->queryText(), query->connectionName(), this)); it.next();
if (!m_datasources.contains(it.value()->queryName().toLower())){
connect(it.value(), SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
putHolder(it.value()->queryName(),new QueryHolder(it.value()->queryText(), it.value()->connectionName(), this));
} else {
delete it.value();
it.remove();
}
}
}
if (collectionName.compare("subqueries",Qt::CaseInsensitive) == 0){
QMutableListIterator<SubQueryDesc*> it(m_subqueries);
while (it.hasNext()){
it.next();
if (!m_datasources.contains(it.value()->queryName().toLower())){
connect(it.value(), SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
putHolder(it.value()->queryName(),new QueryHolder(it.value()->queryText(), it.value()->connectionName(), this));
} else {
delete it.value();
it.remove();
}
}
}
if (collectionName.compare("subproxies",Qt::CaseInsensitive) == 0){
QMutableListIterator<ProxyDesc*> it(m_proxies);
while (it.hasNext()){
it.next();
if (!m_datasources.contains(it.value()->name().toLower())){
putHolder(it.value()->name(),new ProxyHolder(it.value(), this));
} else {
delete it.value();
it.remove();
}
} }
} }
if (collectionName.compare("subqueries",Qt::CaseInsensitive)==0){ if (collectionName.compare("variables",Qt::CaseInsensitive) == 0){
foreach(SubQueryDesc* query,m_subqueries){
connect(query, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
putHolder(query->queryName(),new SubQueryHolder(query->queryText(), query->connectionName(), query->master(), this));
}
}
if(collectionName.compare("subproxies",Qt::CaseInsensitive)==0){
foreach(ProxyDesc* proxy,m_proxies){
putHolder(proxy->name(),new ProxyHolder(proxy, this));
}
}
if(collectionName.compare("variables",Qt::CaseInsensitive)==0){
foreach (VarDesc* item, m_tempVars) { foreach (VarDesc* item, m_tempVars) {
if (!m_reportVariables.containsVariable(item->name())){ if (!m_reportVariables.containsVariable(item->name())){
m_reportVariables.addVariable(item->name(),item->value(),VarDesc::Report,FirstPass); m_reportVariables.addVariable(item->name(),item->value(),VarDesc::Report,FirstPass);

2
limereport/lrreportrender.cpp
View File

@@ -433,7 +433,7 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
bandClone->setBackgroundColor( bandClone->setBackgroundColor(
(datasources()->variable(QLatin1String("line_")+patternBand->objectName().toLower()).toInt()%2!=0 ? (datasources()->variable(QLatin1String("line_")+patternBand->objectName().toLower()).toInt() %2 !=0 ?
bandClone->backgroundColor(): bandClone->backgroundColor():
bandClone->alternateBackgroundColor() bandClone->alternateBackgroundColor()
) )