AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 16:11:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactorisation

Browse Source
This commit is contained in:
Marek Kochanowicz 2014-02-21 10:27:23 +01:00
parent 1c35a85adf
commit 55e9083570
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apps/opencs/view/filter/editwidget.cpp
View File

@ -65,7 +65,7 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
const unsigned count = filterSource.size(); const unsigned count = filterSource.size();
bool multipleElements = false; bool multipleElements = false;
switch (count) switch (count) //setting multipleElements;
{ {
case 0: //empty case 0: //empty
return; //nothing to do here return; //nothing to do here
@ -83,17 +83,17 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
QString oldContent (text()); QString oldContent (text());
bool replaceMode = false; bool replaceMode = false;
bool orMode = true; std::string orAnd;
switch (key) switch (key) //setting replaceMode and string used to glue expressions
{ {
case Qt::ShiftModifier: case Qt::ShiftModifier:
orMode = true; orAnd = "!or(";
replaceMode = false; replaceMode = false;
break; break;
case Qt::ControlModifier: case Qt::ControlModifier:
orMode = false; orAnd = "!and(";
replaceMode = false; replaceMode = false;
break; break;
@ -102,32 +102,16 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
break; break;
} }
if (oldContent.isEmpty() || if (oldContent.isEmpty() || !oldContent.contains (QRegExp ("^!.*$", Qt::CaseInsensitive))) //if line edit is empty or it does not contain one shot filter go into replace mode
!oldContent.contains (QRegExp ("^!.*$", Qt::CaseInsensitive)))
{ {
replaceMode = true; replaceMode = true;
} }
if (!replaceMode) if (!replaceMode)
{
int index = oldContent.indexOf ('(');
if (index != 0)
{ {
oldContent.remove ('!'); oldContent.remove ('!');
} }
}
std::string orAnd;
if (orMode)
{
orAnd = "!or(";
} else {
orAnd = "!and(";
}
clear();
std::stringstream ss; std::stringstream ss;
if (multipleElements) if (multipleElements)
@ -150,11 +134,6 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
} }
ss<<')'; ss<<')';
if (ss.str().length() >5)
{
insert (QString::fromUtf8 (ss.str().c_str()));
}
} else { } else {
if (!replaceMode) if (!replaceMode)
{ {
@ -164,17 +143,20 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
} }
ss << generateFilter (filterSource[0]); ss << generateFilter (filterSource[0]);
if (!replaceMode) if (!replaceMode)
{ {
ss<<')'; ss<<')';
} }
}
if (ss.str().length() >4) if (ss.str().length() >4)
{ {
clear();
insert (QString::fromStdString (ss.str().c_str())); insert (QString::fromStdString (ss.str().c_str()));
} }
} }
}
std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString) const std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString) const
{ {