Merge pull request #452 from DmitryZagorodnev/feature/dataRoles

Feature/data roles
fralx · Mar 30, 2024 · 5139ac0 · 5139ac0
2 parents 0007495 + 4c1c0c4
commit 5139ac0
Show file tree

Hide file tree

Showing 11 changed files with 286 additions and 27 deletions.
diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp
@@ -77,10 +77,6 @@ TextItem::TextItem(QObject *owner, QGraphicsItem *parent)
 
 TextItem::~TextItem(){}
 
-int TextItem::fakeMarginSize() const{
-    return marginSize()+5;
-}
-
 void TextItem::preparePopUpMenu(QMenu &menu)
 {
     QAction* editAction = menu.addAction(QIcon(":/report/images/edit_pecil2.png"),tr("Edit"));
@@ -180,7 +176,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
     qreal hOffset = 0, vOffset = 0;
     switch (m_angle){
         case Angle0:
-            hOffset = fakeMarginSize();
+            hOffset = marginSize();
             if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){
                 vOffset = tmpSize.height() / 2;
             }
@@ -189,8 +185,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
             painter->translate(hOffset,vOffset);
         break;
         case Angle90:
-            hOffset = width() - fakeMarginSize();
-            vOffset = fakeMarginSize();
+            hOffset = width() - marginSize();
+            vOffset = marginSize();
             if (m_alignment & Qt::AlignVCenter){
                 hOffset = (width() - text->size().height()) / 2 + text->size().height();
             }
@@ -202,8 +198,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
             painter->rotate(90);
         break;
         case Angle180:
-            hOffset = width() - fakeMarginSize();
-            vOffset = height() - fakeMarginSize();
+            hOffset = width() - marginSize();
+            vOffset = height() - marginSize();
             if ((tmpSize.width()>0) && (m_alignment & Qt::AlignVCenter)){
                 vOffset = tmpSize.height() / 2+ text->size().height();
             }
@@ -214,8 +210,8 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
             painter->rotate(180);
         break;
         case Angle270:
-            hOffset = fakeMarginSize();
-            vOffset = height()-fakeMarginSize();
+            hOffset = marginSize();
+            vOffset = height()-marginSize();
             if (m_alignment & Qt::AlignVCenter){
                 hOffset = (width() - text->size().height())/2;
             }
@@ -321,7 +317,7 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i
         initTextSizes();
 
     if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){
-        setWidth(m_textSize.width() + fakeMarginSize()*2);
+        setWidth(m_textSize.width() + marginSize()*2);
     }
 
     if (m_textSize.height()>height()) {
@@ -380,9 +376,9 @@ QString TextItem::replaceReturns(QString text) const
 void TextItem::setTextFont(TextPtr text, const QFont& value) const {
     text->setDefaultFont(value);
     if ((m_angle==Angle0)||(m_angle==Angle180)){
-        text->setTextWidth(rect().width()-fakeMarginSize()*2);
+        text->setTextWidth(rect().width()-marginSize()*2);
     } else {
-        text->setTextWidth(rect().height()-fakeMarginSize()*2);
+        text->setTextWidth(rect().height()-marginSize()*2);
     }
 }
 
@@ -394,7 +390,7 @@ void TextItem::adaptFontSize(TextPtr text) const{
         if (_font.pixelSize()>2)
             _font.setPixelSize(_font.pixelSize()-1);
         else break;
-    } while(text->size().height()>this->height() || text->size().width()>(this->width()) - fakeMarginSize() * 2);
+    } while(text->size().height()>this->height() || text->size().width()>(this->width()) - marginSize() * 2);
 }
 
 int TextItem::underlineLineSize() const

diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h
@@ -192,7 +192,6 @@ class TextItem : public ContentItemDesignIntf, IPageInit {
     bool isNeedExpandContent() const;
     QString replaceBR(QString text) const;
     QString replaceReturns(QString text) const;
-    int fakeMarginSize() const;
     QString getTextPart(int height, int skipHeight);
     void restoreLinksEvent();
     void preparePopUpMenu(QMenu &menu);

diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
@@ -272,6 +272,24 @@ QVariant ModelToDataSource::dataByRowIndex(const QString &columnName, int rowInd
     return QVariant();
 }
 
+QVariant ModelToDataSource::dataByRowIndex(const QString &columnName, int rowIndex, int roleName)
+{
+    if(m_model->rowCount() > rowIndex)
+        return m_model->data(m_model->index(rowIndex, columnIndexByName(columnName)));
+    return QVariant();
+}
+
+QVariant ModelToDataSource::dataByRowIndex(const QString &columnName, int rowIndex, const QString &roleName)
+{
+    if(m_model->rowCount() > rowIndex) {
+        int roleCode{roleName.isEmpty() ? Qt::DisplayRole
+                                        : m_model->roleNames().key(roleName.toUtf8(), Qt::DisplayRole)};
+        return m_model->data(m_model->index(rowIndex, columnIndexByName(columnName)), roleCode);
+    }
+
+    return QVariant();
+}
+
 QVariant ModelToDataSource::dataByKeyField(const QString& columnName, const QString& keyColumnName, QVariant keyData)
 {
    for( int i=0; i < m_model->rowCount(); ++i ){
@@ -310,6 +328,13 @@ int ModelToDataSource::columnIndexByName(QString name)
     return -1;
 }
 
+QVariant ModelToDataSource::headerData(const QString &columnName, const QString &roleName)
+{
+    int roleCode{roleName.isEmpty() ? Qt::DisplayRole
+                                    : m_model->roleNames().key(roleName.toUtf8(), Qt::DisplayRole)};
+    return m_model->headerData(columnIndexByName(columnName), Qt::Horizontal, roleCode);
+}
+
 QString ModelToDataSource::lastError()
 {
     return m_lastError;
@@ -722,6 +747,18 @@ QVariant CallbackDatasource::dataByRowIndex(const QString &columnName, int rowIn
     return result;
 }
 
+QVariant CallbackDatasource::dataByRowIndex(const QString &columnName, int rowIndex, int roleName)
+{
+    Q_UNUSED(roleName)
+    return dataByRowIndex(columnName, rowIndex);
+}
+
+QVariant CallbackDatasource::dataByRowIndex(const QString &columnName, int rowIndex, const QString &roleName)
+{
+    Q_UNUSED(roleName)
+    return dataByRowIndex(columnName, rowIndex);
+}
+
 QVariant CallbackDatasource::dataByKeyField(const QString& columnName, const QString& keyColumnName, QVariant keyData)
 {
     int backupCurrentRow = m_currentRow;
@@ -816,6 +853,12 @@ int CallbackDatasource::columnIndexByName(QString name)
     return -1;
 }
 
+QVariant CallbackDatasource::headerData(const QString &columnName, const QString &roleName)
+{
+    Q_UNUSED(roleName)
+    return columnName; // STUB
+}
+
 bool CallbackDatasource::checkNextRecord(int recordNum){
     if (bof()) checkIfEmpty();
     if (m_rowCount > 0) {

diff --git a/limereport/lrdatadesignintf.h b/limereport/lrdatadesignintf.h
@@ -388,10 +388,13 @@ class ModelToDataSource : public QObject, public IDataSource{
     bool bof();
     QVariant data(const QString& columnName);
     QVariant dataByRowIndex(const QString &columnName, int rowIndex);
+    QVariant dataByRowIndex(const QString &columnName, int rowIndex, int roleName);
+    QVariant dataByRowIndex(const QString &columnName, int rowIndex, const QString &roleName);
     QVariant dataByKeyField(const QString& columnName, const QString& keyColumnName, QVariant keyData);
     int columnCount();
     QString columnNameByIndex(int columnIndex);
     int columnIndexByName(QString name);
+    QVariant headerData(const QString &columnName, const QString &roleName);
     QString lastError();
     virtual QAbstractItemModel* model();
     int currentRow();
@@ -421,13 +424,16 @@ class CallbackDatasource :public ICallbackDatasource, public IDataSource {
     bool eof(){return m_eof;}
     QVariant data(const QString &columnName);
     QVariant dataByRowIndex(const QString& columnName, int rowIndex);
+    QVariant dataByRowIndex(const QString &columnName, int rowIndex, int roleName);
+    QVariant dataByRowIndex(const QString &columnName, int rowIndex, const QString &roleName);
     QVariant dataByKeyField(const QString& columnName, const QString& keyColumnName, QVariant keyData);
     int columnCount();
     QString columnNameByIndex(int columnIndex);
     int columnIndexByName(QString name);
     bool isInvalid() const{ return false;}
     QString lastError(){ return "";}
     QAbstractItemModel *model(){return 0;}
+    QVariant headerData(const QString &columnName, const QString &roleName);
 private:
     bool checkNextRecord(int recordNum);
     bool checkIfEmpty();
@@ -441,6 +447,7 @@ class CallbackDatasource :public ICallbackDatasource, public IDataSource {
     QHash<QString, QVariant> m_valuesCache;
     bool m_getDataFromCache;
     int m_lastKeyRow;
+
 };
 
 class CallbackDatasourceHolder :public QObject, public IDataSourceHolder{

diff --git a/limereport/lrdatasourceintf.h b/limereport/lrdatasourceintf.h
@@ -18,9 +18,12 @@ class IDataSource {
     virtual bool eof() = 0;
     virtual QVariant data(const QString& columnName) = 0;
     virtual QVariant dataByRowIndex(const QString& columnName, int rowIndex) = 0;
+    virtual QVariant dataByRowIndex(const QString &columnName, int rowIndex, int roleName) = 0;
+    virtual QVariant dataByRowIndex(const QString &columnName, int rowIndex, const QString &roleName) = 0;
     virtual QVariant dataByKeyField(const QString& columnName, const QString& keyColumnName, QVariant keyData) = 0;
     virtual int columnCount() = 0;
     virtual QString columnNameByIndex(int columnIndex) = 0;
+    virtual QVariant headerData(const QString &columnName, const QString &roleName) = 0;
     virtual int columnIndexByName(QString name) = 0;
     virtual bool isInvalid() const = 0;
     virtual QString lastError() = 0;

diff --git a/limereport/lrdatasourcemanager.cpp b/limereport/lrdatasourcemanager.cpp
@@ -1689,6 +1689,28 @@ QVariant DataSourceManager::fieldDataByRowIndex(const QString &fieldName, int ro
     return QVariant();
 }
 
+QVariant DataSourceManager::fieldDataByRowIndex(const QString &fieldName, int rowIndex, int role)
+{
+    if(containsField(fieldName)) {
+        IDataSource *ds = dataSource(extractDataSource(fieldName));
+        if(ds) {
+            return ds->dataByRowIndex(extractFieldName(fieldName), rowIndex, role);
+        }
+    }
+    return QVariant();
+}
+
+QVariant DataSourceManager::fieldDataByRowIndex(const QString &fieldName, int rowIndex, const QString &roleName)
+{
+    if(containsField(fieldName)) {
+        IDataSource *ds = dataSource(extractDataSource(fieldName));
+        if(ds) {
+            return ds->dataByRowIndex(extractFieldName(fieldName), rowIndex, roleName);
+        }
+    }
+    return QVariant();
+}
+
 QVariant DataSourceManager::fieldDataByKey(const QString& datasourceName, const QString& valueFieldName, const QString& keyFieldName, QVariant keyValue)
 {
     IDataSource* ds = dataSource(datasourceName);
@@ -1698,6 +1720,36 @@ QVariant DataSourceManager::fieldDataByKey(const QString& datasourceName, const
     return QVariant();
 }
 
+QVariant DataSourceManager::headerData(const QString &fieldName, const QString &roleName)
+{
+    if(containsField(fieldName)) {
+        IDataSource *ds = dataSource(extractDataSource(fieldName));
+        if(ds) {
+            return ds->headerData(extractFieldName(fieldName), roleName);
+        }
+    }
+    return QVariant();
+}
+
+QString DataSourceManager::columnName(const QString &datasourceName, int index)
+{
+    IDataSource *ds = dataSource(datasourceName);
+    if(ds && !ds->isInvalid() && ds->columnCount() > index) {
+        return ds->columnNameByIndex(index);
+    }
+    return QString("unknown");
+}
+
+int DataSourceManager::columnCount(const QString &datasourceName)
+{
+    IDataSource *ds = dataSource(datasourceName);
+    if(ds && !ds->isInvalid()) {
+        return ds->columnCount();
+    }
+
+    return -1;
+}
+
 void DataSourceManager::reopenDatasource(const QString& datasourceName)
 {
     QueryHolder* qh = dynamic_cast<QueryHolder*>(dataSourceHolder(datasourceName));

diff --git a/limereport/lrdatasourcemanager.h b/limereport/lrdatasourcemanager.h
@@ -173,12 +173,17 @@ class DataSourceManager : public QObject, public ICollectionContainer, public IV
     bool        containsField(const QString& fieldName);
     QVariant    fieldData(const QString& fieldName);
     QVariant    fieldDataByRowIndex(const QString& fieldName, int rowIndex);
+    QVariant    fieldDataByRowIndex(const QString &fieldName, int rowIndex, int role);
+    QVariant    fieldDataByRowIndex(const QString &fieldName, int rowIndex, const QString &roleName);
     QVariant    fieldDataByKey(
             const QString& datasourceName,
             const QString& valueFieldName,
             const QString& keyFieldName,
             QVariant keyValue
     );
+    QVariant headerData(const QString &fieldName, const QString &roleName);
+    QString columnName(const QString &datasourceName, int index);
+    int columnCount(const QString &datasourceName);
     void    reopenDatasource(const QString& datasourceName);
 
     QString extractDataSource(const QString& fieldName);