git-svn-id: svn://db.shs.com.ru/libs@334 a8b55f48-bf90-11e4-a774-851b48703e85

qad/widgets/clineedit.h

@@ -16,7 +16,7 @@ public:
 	explicit CLineEdit(QWidget * parent = 0);
 	~CLineEdit() {delete cw;}
 	
-	inline QString defaultText() const {return dt;}
+	const QString & defaultText() const {return dt;}
 	
 protected:
 	QWidget * cw;

qad/widgets/evalspinbox.cpp

@@ -0,0 +1,303 @@
+#include "evalspinbox.h"
+#include <QLineEdit>
+#include <QLabel>
+#include <QDebug>
+#include <QRegExp>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionSpinBox>
+#include "qad_types.h"
+
+
+EvalSpinBox::EvalSpinBox(QWidget * parent): QAbstractSpinBox(parent) {
+	status = new QWidget(lineEdit());
+	cw = new QWidget(lineEdit());
+	label = new QLabel(lineEdit());
+//	label->hide();
+	clear_im.load(":/icons/edit-clear-locationbar-rtl.png");
+	icon_ok.load(":/icons/dialog-ok-apply.png");
+	icon_fail.load(":/icons/dialog-warning.png");
+	icon_calc.load(":/icons/tools-wizard.png");
+	icon = icon_ok;
+	status->setCursor(Qt::ArrowCursor);
+	status->setToolTip("OK -> 0");
+	status->hide();
+	cw->setCursor(Qt::ArrowCursor);
+	cw->setToolTip(tr("Clear"));
+	cw->hide();
+	cw_visible = false;
+	//lineEdit()->setStyleSheet("color: darkgreen;");
+	//lineEdit()->setText(eval.expression() + " -> " + QString::number(value(), 'G', 10));
+	cw->installEventFilter(this);
+	status->installEventFilter(this);
+	connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(textChanged_(QString)));
+	connect(this, SIGNAL(editingFinished()), this, SLOT(setExpression_()));
+	label->setText("0");
+	//connect(cw, SIGNAL(mouseReleaseEvent(QMouseEvent * )), this, SLOT(clearMouseRelease(QMouseEvent * )));
+}
+
+
+EvalSpinBox::~EvalSpinBox() {
+	delete cw;
+	delete status;
+	delete label;
+}
+
+
+bool EvalSpinBox::eventFilter(QObject * o, QEvent * e) {
+	switch (e->type()) {
+	case QEvent::MouseButtonRelease:
+		if (o == cw) clearMouseRelease((QMouseEvent * )e);
+		break;
+	case QEvent::Paint:
+		if (o == status) statusPaintEvent();
+		if (o == cw) cwPaintEvent();
+		break;
+	default : break;
+	}
+	return QAbstractSpinBox::eventFilter(o, e);
+}
+
+
+void EvalSpinBox::resizeIcons() {
+	int is = fontHeight();
+	int tm = (lineEdit()->height() - is + 1) / 2;
+	QStyleOptionFrame so;
+	so.initFrom(lineEdit());
+	QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &so, lineEdit());
+	label->setGeometry(r.x() + 2, r.y() + (r.height() - fontMetrics().height() + 1) / 2, lineEdit()->width() - 2*tm - (is * 1.2) * ((status->isVisible() ? 1 : 0) + (cw->isVisible() ? 1 : 0)), lineEdit()->height() - 2*tm);
+	status->setGeometry(lineEdit()->width() - (is + tm) * (cw->isVisible() ? 2 : 1), tm, is, is);
+	cw->setGeometry(lineEdit()->width() - (is + tm) * 1, tm, is, is);
+	lineEdit()->setTextMargins(0, 0, (is * 1.2) * ((status->isVisible() ? 1 : 0) + (cw->isVisible() ? 1 : 0)), 0);
+}
+
+
+void EvalSpinBox::resizeEvent(QResizeEvent * e) {
+	QAbstractSpinBox::resizeEvent(e);
+	resizeIcons();
+}
+
+
+void EvalSpinBox::changeEvent(QEvent * e) {
+	if (e->type() == QEvent::LanguageChange) {
+		cw->setToolTip(tr("Clear"));
+		return;
+	}
+	QAbstractSpinBox::changeEvent(e);
+}
+
+
+void EvalSpinBox::cwPaintEvent() {
+	QPainter p(cw);
+	p.setRenderHint(QPainter::SmoothPixmapTransform);
+	p.drawImage(cw->rect(), clear_im);
+}
+
+
+void EvalSpinBox::statusPaintEvent() {
+	QPainter p(status);
+	p.setRenderHint(QPainter::SmoothPixmapTransform);
+	p.drawImage(status->rect(), icon);
+}
+
+
+void EvalSpinBox::clearMouseRelease(QMouseEvent * e) {
+	if (cw->rect().contains(e->pos())) clear();
+}
+
+
+void EvalSpinBox::textChanged_(const QString & text) {
+	double pv = value();
+	QString t = text;
+	cw->setVisible(text != dt && cw_visible);
+	bool td = false;
+	if (t.endsWith('=')) {
+		td = true;
+		t.chop(1);
+	}
+	bool ok = eval.check(t);
+	if (ok) {
+		eval.evaluate();
+		if (td) {
+			icon = icon_calc;
+			status->setToolTip("Enter to calc -> "+QString::number(value(), 'G', 10));
+		} else {
+			icon = icon_ok;
+			status->setToolTip("OK -> "+QString::number(value(), 'G', 10));
+		}
+//		qDebug() << "value =" << value();
+		if (pv != value()) emit valueChanged(value());
+	} else {
+		icon = icon_fail;
+		status->setToolTip(eval.error());
+	}
+	resizeIcons();
+}
+
+
+void EvalSpinBox::setExpression_() {
+	bool td = false;
+	double pv = value();
+	QString t = text();
+	if (t.endsWith('=')) {
+		td = true;
+		t.chop(1);
+	}
+	if (eval.check(t)) {
+		if (eval.expression() == "0") lineEdit()->clear();
+		else lineEdit()->setText(eval.expression());
+		eval.evaluate();
+		if (td) lineEdit()->setText(QString::number(value(), 'G', 10));
+		status->setToolTip("OK -> " + QString::number(value(), 'G', 10));
+		icon = icon_ok;
+	} else {
+		icon = icon_fail;
+		status->setToolTip(eval.error());
+//		qDebug() << eval.expression();
+	}
+	if (!label->isHidden()) {
+		if (eval.expression() != QString::number(value(), 'G', 10) && eval.expression() != QString::number(value(), 'G', 11) && eval.isCorrect())
+			label->setText("<html><head/><body><p>" + eval.expression() + " <span style=\"color:#005500;\">-&gt; " + QString::number(value(), 'G', 10) + "</span></p></body></html>");
+		else label->setText(eval.expression());
+		lineEdit()->blockSignals(true);
+		if (!eval.isCorrect()) {
+			lineEdit()->setStyleSheet("color: darkred;");
+			status->show();
+		} else {
+			lineEdit()->setStyleSheet("color: black;");
+			status->hide();
+		}
+	//	lineEdit()->setText(eval.expression() + " -> " + QString::number(value(), 'G', 10));
+		lineEdit()->setText("");
+		lineEdit()->blockSignals(false);
+	}
+
+//	qDebug() << "value =" << value();
+	if (pv != value()) emit valueChanged(value());
+}
+
+
+void EvalSpinBox::setExpression(const QString & expr) {
+	lineEdit()->setText(expr);
+	//if (eval.expression() == "0") lineEdit()->clear();
+	cw->setVisible(text() != dt && cw_visible);
+	setExpression_();
+}
+
+
+void EvalSpinBox::setValue(double val) {
+	lineEdit()->setText(QString::number(val));
+	//if (val == 0) lineEdit()->clear();
+	cw->setVisible(text() != dt && cw_visible);
+	setExpression_();
+}
+
+
+void EvalSpinBox::stepBy(int steps) {
+	QString t = text();
+	if (eval.check(t)) {
+		t = eval.expression();
+		QRegExp re("(\\-?\\d+)");
+		int pos = 0;
+		if ((pos = re.indexIn(t)) != -1) {
+			double v = t.mid(pos, re.matchedLength()).toDouble();
+			v += steps;
+			t.remove(pos, re.matchedLength());
+			t.insert(pos, QString::number(v));
+		} else {
+			double v = steps;
+			t = QString::number(v) + t;
+		}
+		eval.check(t);
+		lineEdit()->setText(eval.expression());
+	}
+}
+
+
+void EvalSpinBox::clear() {
+	lineEdit()->setText(dt);
+	setExpression_();
+	cw->hide();
+	resizeIcons();
+	emit cleared();
+}
+
+
+double EvalSpinBox::value() const {
+	if (eval.isCorrect()) {
+		return eval.lastResult().real();
+	}
+	return 0;
+}
+
+
+const QString & EvalSpinBox::expression() const {
+	return eval.expression();
+}
+
+
+bool EvalSpinBox::isCleared() const {
+	return (dt == eval.expression() || (value() == 0 && dt.isEmpty()));
+}
+
+
+QSize EvalSpinBox::sizeHint() const {
+	QSize s = QAbstractSpinBox::sizeHint();
+	s.setWidth(120);
+	return s;
+}
+
+
+QAbstractSpinBox::StepEnabled EvalSpinBox::stepEnabled() const {
+	return StepUpEnabled | StepDownEnabled;
+}
+
+
+void EvalSpinBox::focusInEvent(QFocusEvent * event) {
+//	qDebug() << "focus_in";
+	label->hide();
+	status->show();
+	lineEdit()->blockSignals(true);
+	lineEdit()->setStyleSheet("color: black;");
+	if (eval.expression() != "0") lineEdit()->setText(eval.expression());
+	lineEdit()->blockSignals(false);
+	QAbstractSpinBox::focusInEvent(event);
+	resizeIcons();
+}
+
+
+void EvalSpinBox::focusOutEvent(QFocusEvent * event) {
+	QAbstractSpinBox::focusOutEvent(event);
+//	qDebug() << eval.expression() << QString::number(value(), 'G', 10);
+	if (eval.expression() != QString::number(value(), 'G', 10) && eval.expression() != QString::number(value(), 'G', 11) && eval.isCorrect())
+		label->setText("<html><head/><body><p>" + eval.expression() + " <span style=\"color:#005500;\">-&gt; " + QString::number(value(), 'G', 10) + "</span></p></body></html>");
+	else label->setText(eval.expression());
+	label->show();
+	lineEdit()->blockSignals(true);
+	if (!eval.isCorrect()) lineEdit()->setStyleSheet("color: darkred;");
+	else status->hide();
+//	lineEdit()->setText(eval.expression() + " -> " + QString::number(value(), 'G', 10));
+	lineEdit()->clear();
+	lineEdit()->blockSignals(false);
+	resizeIcons();
+}
+
+
+void EvalSpinBox::setDefaultText(const QString & t) {
+//	bool def = (!cw->isHidden());
+	dt = t;
+//	if (def) {
+//		lineEdit()->setText(dt);
+//		setExpression_();
+//	}
+	//if (t == eval.expression() || (value() == 0 && t.isEmpty())) clear();
+	cw->setVisible((eval.expression() != dt || (dt.isEmpty() && eval.expression() == "0")) && cw_visible);
+	resizeIcons();
+}
+
+
+void EvalSpinBox::setClearButtonVisible(bool visible) {
+	cw_visible = visible;
+	cw->setVisible((eval.expression() != dt || (dt.isEmpty() && eval.expression() == "0")) && cw_visible);
+	resizeIcons();
+}

qad/widgets/evalspinbox.h

@@ -0,0 +1,77 @@
+#ifndef EVALSPINBOX_H
+#define EVALSPINBOX_H
+
+#include <QAbstractSpinBox>
+#include <QMouseEvent>
+#include "qpievaluator.h"
+
+class QLabel;
+
+class EvalSpinBox: public QAbstractSpinBox
+{
+	Q_OBJECT
+	Q_PROPERTY(double value READ value WRITE setValue NOTIFY valueChanged USER true)
+	Q_PROPERTY(QString expression READ expression WRITE setExpression USER true)
+	Q_PROPERTY(QString defaultText READ defaultText WRITE setDefaultText)
+	Q_PROPERTY(bool clearButtonVisible READ isClearButtonVisible WRITE setClearButtonVisible)
+
+public:
+	explicit EvalSpinBox(QWidget * parent = 0);
+	~EvalSpinBox();
+
+	double value() const;
+	const QString & expression() const;
+	const QString & defaultText() const {return dt;}
+	bool isClearButtonVisible() const {return cw_visible;}
+	bool isCleared() const;
+
+	
+protected:
+	QWidget * status;
+	QWidget * cw;
+	QPIEvaluator eval;
+	QLabel * label;
+	QImage icon_ok;
+	QImage icon_fail;
+	QImage icon_calc;
+	QImage icon;
+	QImage clear_im;
+	QString dt;
+	bool cw_visible;
+	
+private:
+	bool eventFilter(QObject * o, QEvent * e);
+	void resizeEvent(QResizeEvent * );
+	void changeEvent(QEvent * e);
+	void statusPaintEvent();
+	void cwPaintEvent();
+	void resizeIcons();
+	
+private slots:
+	void clearMouseRelease(QMouseEvent * e);
+	void textChanged_(const QString & text);
+	void setExpression_();
+	
+public slots:
+	void setExpression(const QString & expr);
+	void setValue(double val);
+	void setDefaultText(const QString & t);
+	void setClearButtonVisible(bool visible);
+
+public:
+	virtual void stepBy(int steps);
+	virtual void clear();
+	virtual QSize sizeHint() const;
+
+protected:
+	virtual StepEnabled stepEnabled() const;
+	virtual void focusInEvent(QFocusEvent *event);
+	virtual void focusOutEvent(QFocusEvent *event);
+
+
+signals:
+	void valueChanged(double val);
+	void cleared();
+};
+
+#endif // EVALSPINBOX_H

qad/widgets/plugin/evalspinboxplugin.cpp

@@ -0,0 +1,69 @@
+#include "evalspinbox.h"
+#include "evalspinboxplugin.h"
+#include <QtCore/QtPlugin>
+
+
+EvalSpinBoxPlugin::EvalSpinBoxPlugin(QObject * parent): QObject(parent) {
+	m_initialized = false;
+}
+
+
+void EvalSpinBoxPlugin::initialize(QDesignerFormEditorInterface * /* core */) {
+	if (m_initialized)
+		return;
+
+	// Add extension registrations, etc. here
+
+	m_initialized = true;
+}
+
+
+bool EvalSpinBoxPlugin::isInitialized() const {
+	return m_initialized;
+}
+
+
+QWidget * EvalSpinBoxPlugin::createWidget(QWidget * parent) {
+	return new EvalSpinBox(parent);
+}
+
+
+QString EvalSpinBoxPlugin::name() const {
+	return QLatin1String("EvalSpinBox");
+}
+
+
+QString EvalSpinBoxPlugin::group() const {
+	return QLatin1String("Input Widgets");
+}
+
+
+QIcon EvalSpinBoxPlugin::icon() const {
+	return QIcon(":/icons/evalspinbox.png");
+}
+
+
+QString EvalSpinBoxPlugin::toolTip() const {
+	return QLatin1String("Evaluation double SpinBox");
+}
+
+
+QString EvalSpinBoxPlugin::whatsThis() const {
+	return QLatin1String("Evaluation double SpinBox");
+}
+
+
+bool EvalSpinBoxPlugin::isContainer() const {
+	return false;
+}
+
+
+QString EvalSpinBoxPlugin::domXml() const {
+	return QLatin1String("<widget class=\"EvalSpinBox\" name=\"evalSpin\">\n</widget>\n");
+}
+
+
+QString EvalSpinBoxPlugin::includeFile() const {
+	return QLatin1String("evalspinbox.h");
+}
+

qad/widgets/plugin/evalspinboxplugin.h

@@ -0,0 +1,36 @@
+#ifndef EVALSPINBOXPLUGIN_H
+#define EVALSPINBOXPLUGIN_H
+
+#include <QObject>
+#if QT_VERSION >= 0x050000
+#  include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
+#  include <QDesignerCustomWidgetInterface>
+#endif
+
+class EvalSpinBoxPlugin: public QObject, public QDesignerCustomWidgetInterface
+{
+	Q_OBJECT
+	Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+public:
+	EvalSpinBoxPlugin(QObject * parent = 0);
+
+	bool isContainer() const;
+	bool isInitialized() const;
+	QIcon icon() const;
+	QString domXml() const;
+	QString group() const;
+	QString includeFile() const;
+	QString name() const;
+	QString toolTip() const;
+	QString whatsThis() const;
+	QWidget * createWidget(QWidget * parent);
+	void initialize(QDesignerFormEditorInterface * core);
+
+private:
+	bool m_initialized;
+
+};
+
+#endif // EVALSPINBOXPLUGIN_H

qad/widgets/plugin/qad_widgets.cpp

@@ -13,9 +13,10 @@
 #include "qcodeeditplugin.h"
 #include "qvarianteditplugin.h"
 #include "qpiconfigplugin.h"
+#include "evalspinboxplugin.h"
 
-QADWidgets::QADWidgets(QObject * parent): QObject(parent)
-{
+
+QADWidgets::QADWidgets(QObject * parent): QObject(parent) {
 	m_widgets.append(new SpinSliderPlugin(this));
 	m_widgets.append(new ColorButtonPlugin(this));
 	m_widgets.append(new CharDialogPlugin(this));
@@ -30,6 +31,7 @@ QADWidgets::QADWidgets(QObject * parent): QObject(parent)
 	m_widgets.append(new QCodeEditPlugin(this));
 	m_widgets.append(new QVariantEditPlugin(this));
 	m_widgets.append(new QPIConfigPlugin(this));
+	m_widgets.append(new EvalSpinBoxPlugin(this));
 }
 
 

qad/widgets/qad_widgets.qrc

@@ -36,5 +36,9 @@
 		<file>../icons/qvariantedit.png</file>
 		<file>../icons/code-word.png</file>
 		<file>../icons/f1.png</file>
+		<file>../icons/dialog-ok-apply.png</file>
+		<file>../icons/dialog-warning.png</file>
+		<file>../icons/tools-wizard.png</file>
+		<file>../icons/evalspinbox.png</file>
     </qresource>
 </RCC>

qad/widgets/qvariantedit.cpp

@@ -149,6 +149,7 @@ QVariantEdit::QVariantEdit(QWidget * parent): QWidget(parent) {
 	_list = 0;
 	_date = 0;
 	_spin = 0;
+	_espin = 0;
 	_rect = 0;
 	_point = 0;
 	_path = 0;
@@ -222,11 +223,11 @@ void QVariantEdit::_recreate(const QVariant & new_value) {
 		connect(_spin, SIGNAL(valueChanged(double)), this, SLOT(_changed()));
 		break;
 	case QVariant::Double:
-		_spin = new QDoubleSpinBox(this);
-		_spin->setDecimals(5);
-		_spin->setRange(-1E+199, 1E+199);
-		_cur_edit = _spin;
-		connect(_spin, SIGNAL(valueChanged(double)), this, SLOT(_changed()));
+		_espin = new EvalSpinBox(this);
+		//_spin->setDecimals(5);
+		//_spin->setRange(-1E+199, 1E+199);
+		_cur_edit = _espin;
+		connect(_espin, SIGNAL(valueChanged(double)), this, SLOT(_changed()));
 		break;
 	case QVariant::Color:
 		_color = new ColorButton(this);
@@ -321,7 +322,7 @@ QVariant QVariantEdit::value() const {
 	case QVariant::UInt: return (unsigned int)(_spin->value());
 	case QVariant::LongLong: return qlonglong(_spin->value());
 	case QVariant::ULongLong: return qulonglong(_spin->value());
-	case QVariant::Double: return double(_spin->value());
+	case QVariant::Double: return _espin->value();
 	case QVariant::Color: return _color->color();
 	case QVariant::String: return _line->text();
 	case QVariant::StringList: return _list->value();
@@ -372,6 +373,7 @@ void QVariantEdit::setValue(const QVariant & v) {
 	if (_list) {_list->setValue(v.toStringList());}
 	if (_date) {_date->setDateTime(v.toDateTime());}
 	if (_spin) {_spin->setValue(v.toDouble());}
+	if (_espin) {_espin->setValue(v.toDouble());}
 	if (_rect) {_rect->setValue(v.toRectF());}
 	if (_point) {_point->setValue(v.toPointF());}
 	if (_path) {
@@ -394,6 +396,7 @@ void QVariantEdit::_delete() {
 	_list = 0;
 	_date = 0;
 	_spin = 0;
+	_espin = 0;
 	_rect = 0;
 	_point = 0;
 	_path = 0;

qad/widgets/qvariantedit.h

@@ -1,12 +1,13 @@
 #ifndef QVARIANTEDIT_H
 #define QVARIANTEDIT_H
 
+#include "qad_types.h"
 #include "clineedit.h"
 #include "ecombobox.h"
 #include "colorbutton.h"
 #include "qrectedit.h"
 #include "qpointedit.h"
-#include "qad_types.h"
+#include "evalspinbox.h"
 #include <QCheckBox>
 #include <QDoubleSpinBox>
 
@@ -108,6 +109,7 @@ protected:
 	StringListEdit * _list;
 	QDateTimeEdit * _date;
 	QDoubleSpinBox * _spin;
+	EvalSpinBox * _espin;
 	QRectEdit * _rect;
 	QPointEdit * _point;
 	PathEdit * _path;