+#include "jkqtcommon/jkqtpmathtools.h"
+#include "jkqtcommon/jkqtpexpected.h"
+
+
+/*! \brief A simple parser for certain CSS subsets
+ \ingroup jkqtptools_math_parser
+
+ \section jkqtpcss_ebnf EBNF definition of the parsed expressions
+
+
+ -> linear-gradient( ? , )
+ ->
+ | to (left|right|bottom|top) (left|right|bottom|top)?
+ -> [A-Za-z%]*
+ -> | ,
+ -> (%)?
+ -> NAME
+ | #
+ | (rgb | rgba | hsl | hsv | gray | grey | red | green | blue) ( ( [,/]? ){1-4} )
+
+ -> floating-point-number, i.e. "[+-]?\d+\.?\d*"
+ -> RGB | RRGGBB | RGBA | RRGGBBAA
+
+
+
+ */
+class JKQTCOMMON_LIB_EXPORT JKQTPCSSParser
+{
+public:
+
+ /** \brief encodes a number with its unit, e.g. \c 100% or \c 45deg or ... */
+ struct NumberWithUnit {
+ inline NumberWithUnit(double val=0.0, const QString& unit_=QString()): unit(unit_), number(val) {};
+ /** \bref unit as string */
+ QString unit;
+ /** \brief the number value ittself */
+ double number;
+ /** \brief partly evaluates the unit and transforms the number accordingly.
+ *
+ * This will do these transformations:
+ * - unit == \c % --> returns number/100.0;
+ * - unit == angle unit : returns number in degrees:
+ * - unit == \c rad --> returns number/M_PI*180.0
+ * - unit == \c turn --> returns number*360.0
+ * - unit == \c grad --> returns number/400.0*360.0
+ * .
+ * .
+ */
+ inline double normNumber() const {
+ const QString nu=normUnit();
+ if (nu=="%") return number/100.0;
+ if (nu=="rad") return number/JKQTPSTATISTICS_PI*180.0;
+ if (nu=="turn") return number*360.0;
+ if (nu=="grad") return number/400.0*360.0;
+ return number;
+ }
+ /** \brief returns number as a normalized number for RGB, output is in the range 0..1
+ *
+ * This interprets %-values and all other values as from the range 0..255 and noralizes both to 0..1
+ */
+ inline double normRGBNumber() const {
+ const QString nu=normUnit();
+ if (nu=="%") return jkqtp_bounded(0.0,number/100.0, 1.0);
+ return jkqtp_bounded(0.0,number/255.0, 1.0);
+ }
+ /** \brief returns number as a normalized number for Hue, output is in the range 0..1
+ *
+ * This interprets %-values and all other values as from the range 0..360 and noralizes both to 0..1
+ */
+ inline double normHueNumber() const {
+ const QString nu=normUnit();
+ if (nu=="%") return jkqtp_bounded(0.0,number/100.0, 1.0);
+ if (nu=="rad") return fmod(number/(JKQTPSTATISTICS_PI*2.0),1.0);
+ if (nu=="turn") return fmod(number,1.0);
+ if (nu=="grad") return fmod(number/400.0,1.0);
+ return fmod(number/360.0, 1.0);
+ }
+ /** \brief returns a normalized version of the unit, i.e. all lower-case, timmed and simplified */
+ inline QString normUnit() const { return unit.simplified().trimmed().toLower(); }
+
+ inline bool operator==(const NumberWithUnit& other) const {
+ return number==other.number && unit==other.unit;
+ }
+ };
+
+
+
+protected:
+ /** @name Tokenizer */
+ /**@{*/
+
+ struct Token {
+ /** \brief the possible Token that can be recognized by the tokenizer in JKQTPCSSParser::getToken() */
+ enum TokenType {
+ END, /*!< \brief end token */
+ NAME, /*!< \brief a name (consisting of characters) of a variable or function */
+ NUMBER, /*!< \brief a number, possibly with a unit(string) */
+ HEXSTRING, /*!< \brief a string in HEX notation (i.e. 0-9a-fA-F) */
+ LBRACKET, /*!< \brief left brackets '(' */
+ RBRACKET, /*!< \brief right brackets ')' */
+ COMMA, /*!< \brief a comma ',' */
+ SLASH, /*!< \brief a slash '/' */
+ };
+
+ static QString toString(TokenType type);
+
+ Token();
+ Token(TokenType type);
+ Token(double num, const QString& unit_=QString());
+ Token(const QString& str, TokenType type=NAME);
+ TokenType type;
+ /** \brief the string value of the current token (when applicable) during the parsing step */
+ QString StringValue;
+
+ /** \brief the string value of the current token (when applicable) during the parsing step */
+ double NumberValue;
+
+ /** \brief checks whether the current token is of the given type (does not compare any other field) */
+ inline bool is(TokenType othertype) const {
+ return (type==othertype);
+ }
+ /** \brief checks whether the current token is of type TokenType::NAME and the String value equals \a name (case-insensitive commparison, trimmer, simplified) */
+ inline bool isNormString(const QString& name) const {
+ return (type==TokenType::NAME) && (getNormString()==name.toLower().simplified().trimmed());
+ }
+ /** \brief checks whether the current token is of type TokenType::NAME and the String value equals any of the entries in \a names (case-insensitive commparison, trimmer, simplified) */
+ inline bool isNormStringAnyOf(const QStringList& names) const {
+ if (type==TokenType::NAME) {
+ const QString ns=getNormString();
+ for (const auto&name: names) {
+ if (ns==name.toLower().simplified().trimmed()) return true;
+ }
+ }
+ return false;
+ }
+ /** \brief normlizes the StringValue (i.e. lower-case, trimmer, simmplified) */
+ inline QString getNormString() const {
+ return StringValue.toLower().simplified().trimmed();
+ }
+ /** \brief converts the TOken information to a string */
+ QString toString() const;
+ };
+
+
+
+ /** \brief Tokenizer: look at the next token from the input, but don't set it as CurrentToken and don't move the read pointer pos */
+ Token peekNextToken(int* endPos=nullptr);
+ /** \brief Tokenizer: extract the next token from the input */
+ Token getToken();
+
+ /** \brief the current token while parsing a string */
+ Token CurrentToken;
+
+
+ /** \brief this stream is used to read in the program. An object is created and assigned
+ * (and destroyed) by the parse()-function */
+ QString text;
+ /** \brief current reading position in text */
+ int pos;
+
+ /** \brief indicates whether pos points to the end of text */
+ inline bool textAtEnd() const {
+ return pos<0 || pos>=text.size()-1;
+ }
+
+ inline bool getCh(QChar& ch) {
+ if (pos<0 || pos>=text.size()) return false;
+ ch=text[pos];
+ pos++;
+ return true;
+ }
+
+ inline bool peekCh(QChar& ch) {
+ if (pos<0 || pos>=text.size()) return false;
+ ch=text[pos];
+ return true;
+ }
+
+ inline void putBackCh() {
+ pos--;
+ }
+
+
+ /**@}*/
+
+ /** @name Error Handling */
+ /**@{*/
+
+ struct RawErrorTag_t {};
+ static RawErrorTag_t RawErrorTag;
+ struct GeneralError {
+ inline GeneralError(const QString& err=QString("unspecified error"), int p=-1): error(QString("%1 at pos.%2").arg(err).arg(p)), pos(p) {}
+ inline GeneralError(RawErrorTag_t, const QString& err, int p=-1): error(err), pos(p) { }
+ inline GeneralError(const QString& context, const QString& err, int p=-1): error(QString("%1 in context %3 at pos.%2").arg(err).arg(p).arg(context)), pos(p) {}
+ QString error;
+ int pos;
+ };
+ /** \brief Exception for unexpected Token */
+ struct UnexpectedTokenError: public GeneralError {
+ inline UnexpectedTokenError(Token::TokenType expectedToken, Token::TokenType foundToken, int pos):
+ GeneralError(RawErrorTag, QString("unexpected token at pos.%1 (found: %2, expected: %3)").arg(pos).arg(Token::toString(foundToken)).arg(Token::toString(expectedToken)), pos)
+ {}
+ inline UnexpectedTokenError(Token::TokenType expectedToken, const Token& foundToken, int pos):
+ GeneralError(RawErrorTag, QString("unexpected token at pos.%1 (found: %2, expected: %3)").arg(pos).arg(foundToken.toString()).arg(Token::toString(expectedToken)), pos)
+ {}
+ inline UnexpectedTokenError(const QString& context, Token::TokenType expectedToken, const Token& foundToken, int pos):
+ GeneralError(RawErrorTag, QString("unexpected token at pos.%1 in context %4 (found: %2, expected: %3)").arg(pos).arg(foundToken.toString()).arg(Token::toString(expectedToken)).arg(context), pos)
+ {}
+ };
+ /** \brief Exception for unexpected Term */
+ struct UnexpectedTermError: public GeneralError {
+ inline UnexpectedTermError(const QString& expectedToken, const Token& foundToken, int pos):
+ GeneralError(RawErrorTag, QString("unexpected term at pos.%1 (found: %2, expected: %3)").arg(pos).arg(foundToken.toString()).arg(expectedToken), pos)
+ {}
+ inline UnexpectedTermError(const QString& context, const QString& expectedToken, const Token& foundToken, int pos):
+ GeneralError(RawErrorTag, QString("unexpected term at pos.%1 in context %4 (found: %2, expected: %3)").arg(pos).arg(foundToken.toString()).arg(expectedToken).arg(context), pos)
+ {}
+ };
+ /** \brief Exception for wrong number of function arguments */
+ struct WrongNumberOfArgumentError: public GeneralError {
+ inline WrongNumberOfArgumentError(const QString& func, int numArgs, int minArgs, int maxArgs, int pos):
+ GeneralError(RawErrorTag, QString("wrong number of function arguments for %2() found at pos.%1 (found: %3, expected: %4...%5)").arg(pos).arg(func).arg(numArgs).arg(minArgs).arg(maxArgs), pos)
+ {}
+ };
+ /** \brief Exception when a string cannot be converted properly */
+ struct UnconvertobleError: public GeneralError {
+ inline UnconvertobleError(const QString& str, const QString& target, int pos):
+ GeneralError(RawErrorTag, QString("Could not convert '%2' to %3 at pos.%1").arg(pos).arg(str).arg(target), pos)
+ {}
+ };
+ /**@}*/
+
+
+ /** @name Parser */
+ /**@{*/
+
+ /** \brief parses a number with unit */
+ JKQTPExpected parseNumberWithUnit(bool get);
+ /** \brief parses a color definition */
+ JKQTPExpected parseColor(bool get);
+ /** \brief parses a color definition */
+ JKQTPExpected parseGradient(bool get);
+
+ /**@}*/
+
+
+
+
+ /** \brief class constructor
+ *
+ * \note This also registers all standatd functions and constants by calling addStandardFunctions() and addStandardVariables()
+ */
+ JKQTPCSSParser(const QString& text);
+
+public:
+
+
+
+
+
+
+ /** \brief parses the given expression*/
+ static NumberWithUnit readNumberWithUnit(const QString& prog);
+ /** \brief parses the given expression, which should represent a color (incl. color-functions like \c rgb() ) */
+ static QColor readColor(const QString& prog);
+ /** \brief parses the given expression, which should represent a QGradient */
+ static QGradient readGradient(const QString& prog);
+
+};
+
+
+#endif // JKQTPCSSTOOLS_H_INCLUDED
diff --git a/lib/jkqtcommon/jkqtpstringtools.cpp b/lib/jkqtcommon/jkqtpstringtools.cpp
index e4ed74735c..29355c389f 100644
--- a/lib/jkqtcommon/jkqtpstringtools.cpp
+++ b/lib/jkqtcommon/jkqtpstringtools.cpp
@@ -20,6 +20,7 @@
#include "jkqtcommon/jkqtpstringtools.h"
#include "jkqtcommon/jkqtpmathtools.h"
+#include "jkqtcommon/jkqtpcsstools.h"
#include
#include
#include
@@ -34,6 +35,11 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
#if (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
#include
#include
@@ -330,26 +336,73 @@ QString jkqtp_QBrushStyle2String(Qt::BrushStyle style) {
}
}
+namespace {
+ static QMap s_String2QBrushStyleMap = []() {
+ QMap m;
+ m["none"]=Qt::NoBrush;
+ m["d1"]=Qt::Dense1Pattern;
+ m["d2"]=Qt::Dense2Pattern;
+ m["d3"]=Qt::Dense3Pattern;
+ m["d4"]=Qt::Dense4Pattern;
+ m["d5"]=Qt::Dense5Pattern;
+ m["d6"]=Qt::Dense6Pattern;
+ m["d7"]=Qt::Dense7Pattern;
+ m["hor"]=Qt::HorPattern;
+ m["ver"]=Qt::VerPattern;
+ m["cross"]=Qt::CrossPattern;
+ m["bdiag"]=Qt::BDiagPattern;
+ m["vdiag"]=Qt::FDiagPattern;
+ m["diagcross"]=Qt::DiagCrossPattern;
+ return m;
+ }();
+
+ static QMap s_GradientPresets = []() {
+ QMap m;
+ for (int i=1; i().valueToKey(static_cast(i))).toLower().trimmed().simplified();
+ if (id.size()>0) m[id]=static_cast(i);
+ }
+ return m;
+ }();
+
+}
+
Qt::BrushStyle jkqtp_String2QBrushStyle(const QString& style) {
QString s=style.toLower().trimmed();
- if (s=="none") return Qt::NoBrush;
- if (s=="d1") return Qt::Dense1Pattern;
- if (s=="d2") return Qt::Dense2Pattern;
- if (s=="d3") return Qt::Dense3Pattern;
- if (s=="d4") return Qt::Dense4Pattern;
- if (s=="d5") return Qt::Dense5Pattern;
- if (s=="d6") return Qt::Dense6Pattern;
- if (s=="d7") return Qt::Dense7Pattern;
- if (s=="hor") return Qt::HorPattern;
- if (s=="ver") return Qt::VerPattern;
- if (s=="cross") return Qt::CrossPattern;
- if (s=="bdiag") return Qt::BDiagPattern;
- if (s=="vdiag") return Qt::FDiagPattern;
- if (s=="diagcross") return Qt::DiagCrossPattern;
- /*if (s=="lingrad") return Qt::LinearGradientPattern;
- if (s=="radgrad") return Qt::RadialGradientPattern;
- if (s=="congrad") return Qt::ConicalGradientPattern;*/
- return Qt::SolidPattern;
+ return s_String2QBrushStyleMap.value(s, Qt::SolidPattern);
+}
+
+
+Qt::BrushStyle jkqtp_String2QBrushStyleExt(const QString &style, QColor *color, QGradient *gradient, QPixmap *image, double* rotationAngleDeg)
+{
+ const QString s=style.toLower().trimmed().simplified();
+ QStringList caps;
+
+ if (s.startsWith("linear-gradient(")) {
+ try {
+ const auto grad=JKQTPCSSParser::readGradient(s);
+ if (gradient) *gradient=grad;
+ return Qt::LinearGradientPattern;
+ } catch(std::exception& E) {
+ qWarning()<<"error converting '"<=QT_VERSION_CHECK(5, 12, 0))
- if (col=="placeholdertext") return QGuiApplication::palette().color(QPalette::PlaceholderText);
+ if (col=="placeholdertext") return QGuiApplication::palette().color(QPalette::PlaceholderText);
#endif
- for (int i=0; i=QT_VERSION_CHECK(6, 0, 0))
- static QRegularExpression rxP("(.+)\\s*,\\s*t?\\s*(\\d+\\.?\\d+)\\%");
+ static QRegularExpression rxP("([^,\\(\\)]+)\\s*,\\s*t?\\s*(\\d+\\.?\\d+)\\%");
static QRegularExpression rxFrac("([a-zA-Z]{3,})(\\d{1,3})\\%?");
- static QRegularExpression rxColMod("\\s*(rgb|hsl|hsv|rgba|gray|grey|red|green|blue)\\(\\s*(\\d+\\.?\\d*)(%|deg)?(?:\\s+|\\s*,\\s*|\\s\\/\\s)?(\\d+\\.?\\d*)?(%)?(?:\\s+|\\s*,\\s*|\\s\\/\\s)?(\\d+\\.?\\d*)?(%)?(?:\\s+|\\s*,\\s*|\\s*\\/\\s*)?(\\d+\\.?\\d*)?(%)?\\s*\\)\\s*");
- static QRegularExpression rxAP("(.+)\\s*,\\s*a\\s*(\\d+\\.?\\d+)\\%");
- static QRegularExpression rxNP("(.+)\\s*,\\s*a?\\s*([\\d]+)");
+ static QRegularExpression rxAP("([^,\\(\\)]+)\\s*,\\s*a\\s*(\\d+\\.?\\d+)\\%");
+ static QRegularExpression rxNP("([^,\\(\\)]+)\\s*,\\s*a?\\s*([\\d]+)");
const auto mP=rxP.match(color);
- const auto mColMod=rxColMod.match(color);
- if (mColMod.hasMatch()) {
- QColor col(Qt::black);
- const QString name=mColMod.captured(1);
- const int v1=valUnitToInt(mColMod.captured(2), mColMod.captured(3));
- const int h1=valUnitToInt(mColMod.captured(2), mColMod.captured(3), INT_MAX);
- const int v2=valUnitToInt(mColMod.captured(4), mColMod.captured(5));
- const int a2=valUnitToAlphaInt(mColMod.captured(4), mColMod.captured(5));
- const int v3=valUnitToInt(mColMod.captured(6), mColMod.captured(7));
- const int a4=valUnitToAlphaInt(mColMod.captured(8), mColMod.captured(9));
- if (name=="gray"||name=="grey") {
- if (v2<0) col.setRgb(v1,v1,v1);
- else col.setRgb(v1,v1,v1,a2);
- return col;
- }
- else if (name=="red") {
- col.setRed(v1);
- if (v2>=0) col.setAlpha(a2);
- return col;
- }
- else if (name=="green") {
- col.setGreen(v1);
- if (v2>=0) col.setAlpha(a2);
- return col;
- }
- else if (name=="blue") {
- col.setBlue(v1);
- if (v2>=0) col.setAlpha(a2);
- return col;
- }
- else if (name=="rgb") {
- if (a4<0) col.setRgb(v1,v2,v3);
- else col.setRgb(v1,v2,v3,a2);
- return col;
- }
- else if (name=="rgba") {
- col.setRgb(v1,v2,v3,a2);
- return col;
- }
- else if (name=="hsl") {
- if (a4<0) col.setHsl(h1,v2,v3);
- else col.setHsl(h1,v2,v3,a2);
- return col;
- }
- else if (name=="hsv") {
- if (a4<0) col.setHsv(h1,v2,v3);
- else col.setHsv(h1,v2,v3,a2);
- return col;
- } else {
- qDebug()<<"unrecognized CSS-color:'"<(QLocale::c().toInt(mFrac.captured(2)))/100.0;
if (mFrac.captured(1)=="grey"||mFrac.captured(1)=="gray") col.setRgbF(a,a,a);
@@ -744,62 +743,10 @@ QColor jkqtp_String2QColor(QString color)
return col;
}
#else
- QRegExp rxP("(.+)\\s*,\\s*t?\\s*(\\d+\\.?\\d+)\\%");
- QRegExp rxAP("(.+)\\s*,\\s*a\\s*(\\d+\\.?\\d+)\\%");
- QRegExp rxNP("(.+)\\s*,\\s*a?\\s*([\\d]+)");
+ QRegExp rxP("([^,\\(\\)]+)\\s*,\\s*t?\\s*(\\d+\\.?\\d+)\\%");
+ QRegExp rxAP("([^,\\(\\)]+)\\s*,\\s*a\\s*(\\d+\\.?\\d+)\\%");
+ QRegExp rxNP("([^,\\(\\)]+)\\s*,\\s*a?\\s*([\\d]+)");
QRegExp rxFrac("([a-zA-Z]{3,})(\\d{1,3})\\%?");
- QRegExp rxColMod("\\s*(rgb|hsl|hsv|rgba|gray|grey|red|green|blue)\\(\\s*(\\d+\\.?\\d*)(%|deg)?(?:\\s+|\\s*,\\s*|\\s\\/\\s)?(\\d+\\.?\\d*)?(%)?(?:\\s+|\\s*,\\s*|\\s\\/\\s)?(\\d+\\.?\\d*)?(%)?(?:\\s+|\\s*,\\s*|\\s*\\/\\s*)?(\\d+\\.?\\d*)?(%)?\\s*\\)\\s*");
- if (rxColMod.exactMatch(color)) {
- QColor col(Qt::black);
- const QString name=rxColMod.cap(1);
- const int v1=valUnitToInt(rxColMod.cap(2), rxColMod.cap(3));
- const int h1=valUnitToInt(rxColMod.cap(2), rxColMod.cap(3), INT_MAX);
- const int v2=valUnitToInt(rxColMod.cap(4), rxColMod.cap(5));
- const int a2=valUnitToAlphaInt(rxColMod.cap(4), rxColMod.cap(5));
- const int v3=valUnitToInt(rxColMod.cap(6), rxColMod.cap(7));
- const int a4=valUnitToAlphaInt(rxColMod.cap(8), rxColMod.cap(9));
- if (name=="gray"||name=="grey") {
- if (v2<0) col.setRgb(v1,v1,v1);
- else col.setRgb(v1,v1,v1,a2);
- return col;
- }
- else if (name=="red") {
- col.setRed(v1);
- if (v2>=0) col.setAlpha(a2);
- return col;
- }
- else if (name=="green") {
- col.setGreen(v1);
- if (v2>=0) col.setAlpha(a2);
- return col;
- }
- else if (name=="blue") {
- col.setBlue(v1);
- if (v2>=0) col.setAlpha(a2);
- return col;
- }
- else if (name=="rgb") {
- if (a4<0) col.setRgb(v1,v2,v3);
- else col.setRgb(v1,v2,v3,a2);
- return col;
- }
- else if (name=="rgba") {
- col.setRgb(v1,v2,v3,a2);
- return col;
- }
- else if (name=="hsl") {
- if (a4<0) col.setHsl(h1,v2,v3);
- else col.setHsl(h1,v2,v3,a2);
- return col;
- }
- else if (name=="hsv") {
- if (a4<0) col.setHsv(h1,v2,v3);
- else col.setHsv(h1,v2,v3,a2);
- return col;
- } else {
- qDebug()<<"unrecognized CSS-color:'"<=QT_VERSION_CHECK(6, 0, 0))
+ thread_local QCache rxCache(500);
+#else
+ thread_local QCache rxCache(500);
+#endif
+}
+
+bool jkqtp_rxContains(const QString& text, const QString ®ex, qsizetype offset, QStringList* caps)
+{
+#if (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegularExpression(regex));
+ QRegularExpression* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegularExpression(regex));
+ rx=tempRX.data();
+ }
+ const auto m=rx->match(text, offset);
+ if (caps) *caps=m.capturedTexts();
+ return m.hasMatch();
+#else
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegExp(regex));
+ QRegExp* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegExp(regex));
+ rx=tempRX.data();
+ }
+ const bool res= rx->indexIn(text, offset)>=0;
+ if (caps) *caps=rx->capturedTexts();
+ return res;
+#endif
+}
+
+
+qsizetype jkqtp_rxIndexIn(const QString& text, const QString ®ex, qsizetype offset, QStringList* caps)
+{
+#if (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegularExpression(regex));
+ QRegularExpression* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegularExpression(regex));
+ rx=tempRX.data();
+ }
+ QRegularExpressionMatch rmatch;
+ const qsizetype idx=text.indexOf(*rx, offset, &rmatch);
+ if (caps) *caps=rmatch.capturedTexts();
+ return idx;
+#else
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegExp(regex));
+ QRegExp* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegExp(regex));
+ rx=tempRX.data();
+ }
+ const qsizetype idx = rx->indexIn(text, offset);
+ if (caps) *caps=rx->capturedTexts();
+ return idx;
+#endif
+}
+
+
+bool jkqtp_rxPartiallyMatchesAt(const QString& text, const QString ®ex, qsizetype offset, QStringList* caps)
+{
+#if (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegularExpression(regex));
+ QRegularExpression* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegularExpression(regex));
+ rx=tempRX.data();
+ }
+ const auto m=rx->match(text, offset, QRegularExpression::NormalMatch, QRegularExpression::AnchorAtOffsetMatchOption);
+ if (caps) *caps=m.capturedTexts();
+ return m.hasMatch();
+#else
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegExp(regex));
+ QRegExp* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegExp(regex));
+ rx=tempRX.data();
+ }
+ const bool res= (rx->indexIn(text, offset)==offset);
+ if (caps) *caps=rx->capturedTexts();
+ return res;
+#endif
+}
+
+
+
+bool jkqtp_rxExactlyMatches(const QString& text, const QString ®ex, QStringList* caps)
+{
+#if (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegularExpression(regex));
+ QRegularExpression* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegularExpression(regex));
+ rx=tempRX.data();
+ }
+ const auto m=rx->match(text);
+ if (caps) *caps=m.capturedTexts();
+ return m.hasMatch() && m.captured(0).size()==text.size();
+#else
+ if (!JKQTCommon_private::rxCache.contains(regex)) JKQTCommon_private::rxCache.insert(regex, new QRegExp(regex));
+ QRegExp* rx=JKQTCommon_private::rxCache.object(regex);
+ QSharedPointer tempRX;
+ if (!rx) {
+ tempRX.reset(new QRegExp(regex));
+ rx=tempRX.data();
+ }
+ const bool res= rx->exactMatch(text);
+ if (caps) *caps=rx->capturedTexts();
+ return res;
+#endif
+}
diff --git a/lib/jkqtcommon/jkqtpstringtools.h b/lib/jkqtcommon/jkqtpstringtools.h
index 4267a44ce7..180ded6ce1 100644
--- a/lib/jkqtcommon/jkqtpstringtools.h
+++ b/lib/jkqtcommon/jkqtpstringtools.h
@@ -28,6 +28,8 @@
#include
#include
+class QGradient; // forward
+
/** \brief converts a QT::PenStyle into a string
* \ingroup jkqtptools_string
*/
@@ -45,9 +47,24 @@ JKQTCOMMON_LIB_EXPORT QString jkqtp_QBrushStyle2String(Qt::BrushStyle style);
/** \brief converts a QString into a Qt::BrushStyle
* \ingroup jkqtptools_string
+ * \see jkqtp_String2QBrushStyleExt() for a more complex parser
*/
JKQTCOMMON_LIB_EXPORT Qt::BrushStyle jkqtp_String2QBrushStyle(const QString& style);
+/** \brief converts a QString into a Qt::BrushStyle. commpared to jkqtp_String2QBrushStyle(), this method can parse
+ * more complex pattern/brush descriptions, such as for colors, gradients or images, which are output in \a color, \a gradient and \a image
+ * \ingroup jkqtptools_string
+ *
+ * \param style the string to be parsed
+ * \param[out] color output parameter for a parsed color
+ * \param[out] gradient output parameter for a parsed gradient
+ * \param[out] image output parameter for a parsed image
+ * \param[out] rotationAngleDeg output parameter for a parsed rotation angle of the pattern in degrees, where the direction equals the direction of a clock hand, i.e. 0=12o'clock, 180=6o'clock, ...
+ *
+ * \see jkqtp_String2QBrushStyle()
+ */
+JKQTCOMMON_LIB_EXPORT Qt::BrushStyle jkqtp_String2QBrushStyleExt(const QString& style, QColor* color=nullptr, QGradient* gradient=nullptr, QPixmap* image=nullptr, double *rotationAngleDeg=nullptr);
+
/** \brief converts a Unicode codepoint into a UTF8-sequence
* \ingroup jkqtptools_string
@@ -326,5 +343,51 @@ JKQTCOMMON_LIB_EXPORT QString jkqtp_MouseButton2String(Qt::MouseButton button, b
*/
JKQTCOMMON_LIB_EXPORT Qt::MouseButton jkqtp_String2MouseButton(const QString &button);
+/** \brief returns \c true, if \a text contains a match to the given regular expression \a regex,
+ * starts from \a offset and optionally returns the match in \a caps \c =[fullmatch, cap1,cap2,...]
+ * \ingroup jkqtptools_string
+ *
+ * \note this function uses an internal cache, so the \a regex does not have
+ * to be compiled every time this is called (with the same \a regex ).
+ *
+ * \see jkqtp_rxExactlyMatches(), jkqtp_rxIndexIn(), jkqtp_rxContains(), jkqtp_rxPartiallyMatchesAt()
+ */
+JKQTCOMMON_LIB_EXPORT bool jkqtp_rxContains(const QString& text, const QString ®ex, qsizetype offset=0, QStringList* caps=nullptr);
+
+/** \brief returns the next match (i.e. its index) of the given regular expression \a regex within \a text,
+ * starts from \a offset and optionally returns the match in \a caps \c =[fullmatch, cap1,cap2,...]
+ * \ingroup jkqtptools_string
+ *
+ * \note this function uses an internal cache, so the \a regex does not have
+ * to be compiled every time this is called (with the same \a regex ).
+ *
+ * \see jkqtp_rxExactlyMatches(), jkqtp_rxIndexIn(), jkqtp_rxContains(), jkqtp_rxPartiallyMatchesAt()
+ */
+JKQTCOMMON_LIB_EXPORT qsizetype jkqtp_rxIndexIn(const QString& text, const QString ®ex, qsizetype offset=0, QStringList* caps=nullptr);
+
+/** \brief returns \c true, if \a text exactly matches the given regular expression \a regex,
+ * starts from \a offset and optionally returns the match in \a caps \c =[fullmatch, cap1,cap2,...]
+ * \ingroup jkqtptools_string
+ *
+ * \note this function uses an internal cache, so the \a regex does not have
+ * to be compiled every time this is called (with the same \a regex ).
+ *
+ * \see jkqtp_rxExactlyMatches(), jkqtp_rxIndexIn(), jkqtp_rxContains(), jkqtp_rxPartiallyMatchesAt()
+ */
+JKQTCOMMON_LIB_EXPORT bool jkqtp_rxExactlyMatches(const QString& text, const QString ®ex, QStringList* caps=nullptr);
+
+
+/** \brief returns \c true, if \a text partially matches the given regular expression \a regex,
+ * starting from \a offset (and the match starts at \a offset !!!)
+ * and optionally returns the match in \a caps \c =[fullmatch, cap1,cap2,...]
+ * \ingroup jkqtptools_string
+ *
+ * \note this function uses an internal cache, so the \a regex does not have
+ * to be compiled every time this is called (with the same \a regex ).
+ *
+ * \see jkqtp_rxExactlyMatches(), jkqtp_rxIndexIn(), jkqtp_rxContains(), jkqtp_rxPartiallyMatchesAt()
+ */
+JKQTCOMMON_LIB_EXPORT bool jkqtp_rxPartiallyMatchesAt(const QString& text, const QString ®ex, qsizetype offset=0, QStringList* caps=nullptr);
+
#endif // JKQTPSTRINGTOOLS_H_INCLUDED