mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

ChartItem: Series property editor has been added

Browse Source
This commit is contained in:
Arin Alexander 2020-01-31 20:00:28 +03:00
parent a75677ec51
commit 85b3c940d4
12 changed files with 121 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/base/lrattribsabstractfactory.h
View File

@ -54,11 +54,11 @@ private:
friend class Singleton< AttribsAbstractFactory< AbstractProduct,IdentifierType,ProductCreator,Attribs > >;
public:
bool registerCreator(const IdentifierType& id, Attribs attribs, ProductCreator creator){
return (m_factoryMap.insert(id,creator).value()==creator)&&
(m_attribsMap.insert(id,attribs).value()==attribs);
return (m_factoryMap.insert(id,creator).value() == creator) &&
(m_attribsMap.insert(id,attribs).value() == attribs);
}
bool unregisterCreator(const IdentifierType& id){
return (m_factoryMap.remove(id)==1)&&(m_attribsMap.remove(id)==1);
return (m_factoryMap.remove(id) == 1) && (m_attribsMap.remove(id) == 1);
}
ProductCreator objectCreator(const IdentifierType& id){
if (m_factoryMap.contains(id)){

2
limereport/designer.pri
View File

@ -28,6 +28,7 @@ SOURCES += \
$$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrmarginpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrseriespropitem.cpp \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \
@ -71,6 +72,7 @@ HEADERS += \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrmarginpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrseriespropitem.h \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.h \

2
limereport/items/lrchartitem.cpp
View File

@ -251,7 +251,7 @@ QWidget *ChartItem::defaultEditor()
QSettings* l_settings = (page()->settings() != 0) ?
page()->settings() :
(page()->reportEditor()!=0) ? page()->reportEditor()->settings() : 0;
QWidget* editor = new ChartItemEditor(this,page(),l_settings);
QWidget* editor = new ChartItemEditor(this, page(), l_settings);
editor->setAttribute(Qt::WA_DeleteOnClose);
return editor;
}

5
limereport/items/lrchartitem.h
View File

@ -117,7 +117,7 @@ class ChartItem : public LimeReport::ItemDesignIntf
Q_ENUMS(LegendAlign)
Q_ENUMS(TitleAlign)
Q_ENUMS(ChartType)
Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader)
Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader WRITE setSeries)
Q_PROPERTY(QString datasource READ datasource WRITE setDatasource)
Q_PROPERTY(QString chartTitle READ chartTitle WRITE setChartTitle)
Q_PROPERTY(bool drawLegendBorder READ drawLegendBorder WRITE setDrawLegendBorder)
@ -163,6 +163,7 @@ public:
QList<QString> labels() const;
void setLabels(const QList<QString> &labels);
QWidget* defaultEditor();
protected:
void paintChartTitle(QPainter* painter, QRectF titleRect);
@ -174,8 +175,8 @@ protected:
void collectionLoadFinished(const QString& collectionName){Q_UNUSED(collectionName)}
void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
void fillLabels(IDataSource* dataSource);
QWidget* defaultEditor();
bool isNeedUpdateSize(RenderPass pass) const;
void setSeries(ACollectionProperty series){Q_UNUSED(series)}
private:
QList<SeriesItem*> m_series;
QString m_datasource;

2
limereport/items/lrchartitemeditor.cpp
View File

@ -189,9 +189,9 @@ void ChartItemEditor::on_splitter_splitterMoved(int , int )
#endif
}
void ChartItemEditor::on_pbOk_clicked()
{
emit editingFinished();
close();
}

4
limereport/items/lrchartitemeditor.h
View File

@ -25,6 +25,10 @@ public:
protected:
void resizeEvent(QResizeEvent *);
void moveEvent(QMoveEvent *);
signals:
void editingFinished();
private slots:
void on_splitter_splitterMoved(int, int);
void on_pbOk_clicked();

8
limereport/objectinspector/lrobjectinspectorwidget.cpp
View File

@ -95,13 +95,17 @@ void ObjectInspectorTreeView::mousePressEvent(QMouseEvent *event)
if ((event->button()==Qt::LeftButton)){
QModelIndex index=indexAt(event->pos());
if (index.isValid()){
if (event->pos().x()<indentation()) {
if (event->pos().x() < indentation()) {
if (!nodeFromIndex(index)->isHaveValue())
setExpanded(index,!isExpanded(index));
} else {
if ((index.column()==1)&&(!nodeFromIndex(index)->isHaveChildren())) {
setCurrentIndex(index);
edit(index);
Qt::ItemFlags flags = index.model()->flags(index);
if ( !(((flags & Qt::ItemIsEditable) == 0) || ((flags & Qt::ItemIsEnabled) == 0)) )
edit(index);
return ;
}
}

10
limereport/objectinspector/lrobjectitemmodel.cpp
View File

@ -363,14 +363,14 @@ QModelIndex QObjectPropertyModel::parent(const QModelIndex &child) const
Qt::ItemFlags QObjectPropertyModel::flags(const QModelIndex &index) const
{
if ((index.column()==1)&&(!nodeFromIndex(index)->isValueReadonly())) return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable;
if ((index.column() == 1) && (!nodeFromIndex(index)->isValueReadonly())) return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable;
else return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
}
CreatePropItem QObjectPropertyModel::propertyItemCreator(QMetaProperty prop)
{
CreatePropItem creator=0;
creator=ObjectPropFactory::instance().objectCreator(APropIdent(prop.name(),prop.enclosingMetaObject()->className()));
CreatePropItem creator = 0;
creator = ObjectPropFactory::instance().objectCreator(APropIdent(prop.name(),prop.enclosingMetaObject()->className()));
if (!creator){
if (prop.isFlagType()){
creator=ObjectPropFactory::instance().objectCreator(APropIdent("flags",""));
@ -390,7 +390,7 @@ CreatePropItem QObjectPropertyModel::propertyItemCreator(QMetaProperty prop)
return 0;
}
}
creator=ObjectPropFactory::instance().objectCreator(APropIdent(prop.typeName(),""));
creator = ObjectPropFactory::instance().objectCreator(APropIdent(prop.typeName(),""));
if (!creator) {qDebug()<<"Editor for propperty name = \""<<prop.name()<<"\" & property type =\""<<prop.typeName()<<"\" not found!";}
}
return creator;
@ -409,7 +409,7 @@ ObjectPropItem * QObjectPropertyModel::createPropertyItem(QMetaProperty prop, QO
QString(tr(prop.name())),
object->property(prop.name()),
parent,
!(prop.isWritable()&&prop.isDesignable())
!(prop.isWritable() && prop.isDesignable())
);
} else {
propertyItem=new ObjectPropItem(

4
limereport/objectinspector/propertyItems/lrimagepropitem.cpp
View File

@ -48,12 +48,12 @@ QWidget* ImagePropItem::createProperyEditor(QWidget *parent) const
QString ImagePropItem::displayValue() const
{
return (propertyValue().isNull())?"":"Picture";
return (propertyValue().isNull()) ? "" : QObject::tr("image");
}
void ImagePropItem::setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const
{
ImageEditor *editor =qobject_cast<ImageEditor*>(propertyEditor);
ImageEditor *editor = qobject_cast<ImageEditor*>(propertyEditor);
editor->setImage(propertyValue().value<QImage>());
}

51
limereport/objectinspector/propertyItems/lrseriespropitem.cpp Normal file
View File

@ -0,0 +1,51 @@
#include "lrseriespropitem.h"
#include <QToolButton>
#include <lrchartitemeditor.h>
#include <lrpagedesignintf.h>
#include <lrreportengine_p.h>
namespace{
LimeReport::ObjectPropItem * createSeriesPropItem(
QObject *object, LimeReport::ObjectPropItem::ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& data, LimeReport::ObjectPropItem* parent, bool readonly)
{
return new LimeReport::SeriesPropItem(object, objects, name, displayName, data, parent, readonly);
}
bool VARIABLE_IS_NOT_USED registredSeriesProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("series", "LimeReport::ChartItem"), QObject::tr("series"), createSeriesPropItem);
}
namespace LimeReport {
QWidget *SeriesPropItem::createProperyEditor(QWidget *parent) const
{
return new SeriesPropEditor(qobject_cast<ChartItem*>(object()), parent);
}
QString SeriesPropItem::displayValue() const
{
return QObject::tr("Series");
}
SeriesPropEditor::SeriesPropEditor(ChartItem *chart, QWidget *parent)
: QWidget(parent), m_button(new QPushButton(this)), m_chart(chart)
{
m_button->setText("...");
QHBoxLayout* layout = new QHBoxLayout(this);
layout->addWidget(m_button);
layout->setSpacing(1);
layout->setContentsMargins(1,0,1,1);
setLayout(layout);
setFocusProxy(m_button);
setAutoFillBackground(true);
connect(m_button,SIGNAL(clicked()),this,SLOT(slotButtonClicked()));
}
void SeriesPropEditor::slotButtonClicked()
{
m_chart->showEditorDialog();
emit editingFinished();
}
}

41
limereport/objectinspector/propertyItems/lrseriespropitem.h Normal file
View File

@ -0,0 +1,41 @@
#ifndef SERIESPROPITEM_H
#define SERIESPROPITEM_H
#include <QPushButton>
#include <QHBoxLayout>
#include <lrobjectpropitem.h>
#include <lrchartitem.h>
namespace LimeReport {
class SeriesPropEditor : public QWidget
{
Q_OBJECT
public:
SeriesPropEditor(ChartItem* chart, QWidget *parent = 0);
signals:
void editingFinished();
private slots:
void slotButtonClicked();
private:
QPushButton* m_button;
ChartItem* m_chart;
};
class SeriesPropItem : public LimeReport::ObjectPropItem{
Q_OBJECT
public:
SeriesPropItem():ObjectPropItem(){}
SeriesPropItem(QObject* object, ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& value, ObjectPropItem* parent, bool readonly)
:ObjectPropItem(object, objects, name, displayName, value, parent, readonly){}
QWidget* createProperyEditor(QWidget *parent) const;
QString displayValue() const;
};
} // namespace LimeReport
#endif // SERIESPROPITEM_H

2
limereport/objectinspector/propertyItems/lrstringpropitem.cpp
View File

@ -54,7 +54,7 @@ QWidget * StringPropItem::createProperyEditor(QWidget *parent) const
void StringPropItem::setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const
{
ButtonLineEditor *editor =qobject_cast<ButtonLineEditor *>(propertyEditor);
ButtonLineEditor *editor = qobject_cast<ButtonLineEditor *>(propertyEditor);
editor->setText(propertyValue().toString());
}