Menu
▾
▴
[Seq-cvs-commit] showeq/src filter.cpp,1.6.6.3,1.6.6.4 filter.h,1.3.6.1,1.3.6.2 spawn.cpp,1.31.6.7,1.31.6.8
|
From: Chad M. <cmm...@us...> - 2005-07-04 15:37:25
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11160/src Modified Files: Tag: pre_5_0_beta filter.cpp filter.h spawn.cpp Log Message: Fixed the # handling in filters so that instead of stripping #'s off spawns, it instead makes the # in the matchin regex for Name: be optional. Index: spawn.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawn.cpp,v retrieving revision 1.31.6.7 retrieving revision 1.31.6.8 diff -u -d -r1.31.6.7 -r1.31.6.8 --- spawn.cpp 2 Jul 2005 17:22:53 -0000 1.31.6.7 +++ spawn.cpp 4 Jul 2005 15:37:16 -0000 1.31.6.8 @@ -862,20 +862,6 @@ { QString name = transformedName(); - // For the spawn name, remove the # off the front if it is there. This is - // because only some mobs have #, but there's no real rule to where it is - // there or not. To ease in filter writing, we just remove it before - // filtering, so you don't have to see the spawn in seq before writing a - // filter for it. - // - // If this turns out too slow, we could always cache the name without the # - // I guess, but transformedName already does string manipulation without - // caching, so what's another only if there's a # at the start *wink* - if (name.startsWith("#")) - { - name = name.mid(1); - } - QString buff; buff.sprintf("Name:%s:Level:%d:Race:%s:Class:%s:NPC:%d:X:%d:Y:%d:Z:%d:" "Light:%s:Deity:%s:RTeam:%d:DTeam:%d:Type:%s:LastName:%s:Guild:%s:", Index: filter.h =================================================================== RCS file: /cvsroot/seq/showeq/src/filter.h,v retrieving revision 1.3.6.1 retrieving revision 1.3.6.2 diff -u -d -r1.3.6.1 -r1.3.6.2 --- filter.h 7 Dec 2003 06:30:43 -0000 1.3.6.1 +++ filter.h 4 Jul 2005 15:37:16 -0000 1.3.6.2 @@ -58,7 +58,11 @@ bool valid() { return m_regexp.isValid(); } protected: + void init(const QString& filterPattern, bool caseSensitive, uint8_t minLevel, + uint8_t maxLevel); + QRegExp m_regexp; + QString m_regexpOriginalPattern; uint8_t m_minLevel; uint8_t m_maxLevel; }; Index: filter.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/filter.cpp,v retrieving revision 1.6.6.3 retrieving revision 1.6.6.4 diff -u -d -r1.6.6.3 -r1.6.6.4 --- filter.cpp 28 May 2005 03:55:20 -0000 1.6.6.3 +++ filter.cpp 4 Jul 2005 15:37:16 -0000 1.6.6.4 @@ -56,8 +56,8 @@ /* FilterItem Class - allows easy creation / deletion of regex types */ FilterItem::FilterItem(const QString& filterPattern, bool caseSensitive) { - m_minLevel = 0; - m_maxLevel = 0; + uint8_t minLevel = 0; + uint8_t maxLevel = 0; QString workString = filterPattern; @@ -95,11 +95,11 @@ // only use the number if it's ok if (ok) - m_minLevel = level; + minLevel = level; #ifdef DEBUG_FILTER seqDebug("filter min level decode levelStr='%s' level=%d ok=%1d minLevel=%d", - (const char*)levelString, level, ok, m_minLevel); + (const char*)levelString, level, ok, minLevel); #endif } else @@ -110,11 +110,11 @@ // only use the number if it's ok if (ok) - m_minLevel = level; + minLevel = level; #ifdef DEBUG_FILTER seqDebug("filter min level decode levelStr='%s' level=%d ok=%1d minLevel=%d", - (const char*)levelString.left(breakPoint), level, ok, m_minLevel); + (const char*)levelString.left(breakPoint), level, ok, minLevel); #endif // the rest of the string after the hyphen is the max @@ -123,37 +123,54 @@ // if a hyphen was specified, but no max value after it, it means // all values above min if (levelString.isEmpty()) - m_maxLevel = INT_MAX; + maxLevel = INT_MAX; else { - // get the max level - level = levelString.toInt(&ok); + // get the max level + level = levelString.toInt(&ok); - // only use the number if it's ok - if (ok) - m_maxLevel = level; + // only use the number if it's ok + if (ok) + maxLevel = level; #ifdef DEBUG_FILTER - seqDebug("filter max level decode levelStr='%s' level=%d ok=%1d maxLevel=%d", - (const char*)levelString, level, ok, m_maxLevel); + seqDebug("filter max level decode levelStr='%s' level=%d ok=%1d maxLevel=%d", + (const char*)levelString, level, ok, m_maxLevel); #endif } } // if no max level specified, or some dope set it below min, make it // equal the min - if(m_maxLevel < m_minLevel) - m_maxLevel = m_minLevel; + if(maxLevel < minLevel) + maxLevel = minLevel; } + init(regexString, caseSensitive, minLevel, maxLevel); +} + +void FilterItem::init(const QString& regexString, bool caseSensitive, + uint8_t minLevel, uint8_t maxLevel) +{ + m_minLevel = minLevel; + m_maxLevel = maxLevel; + #ifdef DEBUG_FILTER seqDebug("regexString=%s minLevel=%d maxLevel=%d", - (const char*)regexString, m_minLevel, m_maxLevel); + (const char*)regexString, minLevel, maxLevel); #endif m_regexp.setWildcard(false); m_regexp.setCaseSensitive(caseSensitive); - m_regexp.setPattern(regexString); + + // For the pattern, save off the original. This is what will be saved + // during save operations. But the actual regexp we filter with will + // mark the # in spawn names as optional to aid in filter writing. + m_regexpOriginalPattern = QString(regexString.ascii()); + + QString fixedFilterPattern = regexString; + fixedFilterPattern.replace("Name:", "Name:#?", false); + m_regexp.setPattern(fixedFilterPattern); if (!m_regexp.isValid()) { @@ -165,10 +182,9 @@ FilterItem::FilterItem(const QString& filterPattern, bool caseSensitive, uint8_t minLevel, uint8_t maxLevel) - : m_regexp(filterPattern, caseSensitive, false), - m_minLevel(minLevel), - m_maxLevel(maxLevel) { + init(filterPattern, caseSensitive, minLevel, maxLevel); + if (!m_regexp.isValid()) { seqWarn("Filter Error: '%s' - %s", @@ -186,7 +202,7 @@ out << indent << "<oldfilter>"; if (!m_regexp.pattern().isEmpty()) - out << "<regex>" << m_regexp.pattern() << "</regex>"; + out << "<regex>" << m_regexpOriginalPattern << "</regex>"; if (m_minLevel || m_maxLevel) { @@ -331,27 +347,17 @@ { FilterItem* re; - // Take the # off the front of the filters. - // - // This is showeq specific, since EQ puts #'s in front of some - // special mobs, but without being in the zone, it's hard to tell what - // has a # and what doesn't. In order to ease in filter writing, just - // strip it off here, and we'll strip it off the spawn names before matching - // too. - QString fixedFilterPattern = filterPattern; - fixedFilterPattern.replace("Name:#", "Name:", false); - // no duplicates allowed - if (findFilter(fixedFilterPattern)) + if (findFilter(filterPattern)) return false; - re = new FilterItem(fixedFilterPattern, m_caseSensitive); + re = new FilterItem(filterPattern, m_caseSensitive); // append it to the end of the list m_filterItems.append(re); #ifdef DEBUG_FILTER - seqDebug("Added Filter '%s'", (const char*)fixedFilterPattern); + seqDebug("Added Filter '%s'", (const char*)filterPattern); #endif return re->valid(); @@ -362,28 +368,18 @@ { FilterItem* re; - // Take the # off the front of the filters for name. - // - // This is showeq specific, since EQ puts #'s in front of some - // special mobs, but without being in the zone, it's hard to tell what - // has a # and what doesn't. In order to ease in filter writing, just - // strip it off here, and we'll strip it off the spawn names before matching - // too. - QString fixedFilterPattern = filterPattern; - fixedFilterPattern.replace("Name:#", "Name:", false); - // no duplicates allowed - if (findFilter(fixedFilterPattern)) + if (findFilter(filterPattern)) return false; - re = new FilterItem(fixedFilterPattern, m_caseSensitive, minLevel, maxLevel); + re = new FilterItem(filterPattern, m_caseSensitive, minLevel, maxLevel); // append it to the end of the list m_filterItems.append(re); #ifdef DEBUG_FILTER seqDebug("Added Filter '%s' (%d, %d)", - (const char*)fixedFilterPattern, minLevel, maxLevel); + (const char*)filterPattern, minLevel, maxLevel); #endif return re->valid(); |
