chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Feature:Daily,Search: allow multiple matches with 'AND'

Browse Source
This commit is contained in:
LoudSnorer 2024-01-02 19:18:52 -05:00
parent f3c7ea3aa2
commit 48e055a1b0
2 changed files with 638 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

814
oscar/dailySearchTab.cpp
View File

File diff suppressed because it is too large Load Diff

131
oscar/dailySearchTab.h
View File

@ -11,6 +11,7 @@
#include <QDate>
#include <QTextDocument>
#include <QListWidget>
#include <QListWidgetItem>
#include <QList>
#include <QWidget>
@ -40,6 +41,79 @@ class QSizeF ;
class Day; //forward declaration.
class Daily; //forward declaration.
enum ValueMode { invalidValueMode , notUsed , minutesToMs , hoursToMs , hundredths , opWhole , displayWhole , opString , displayString, secondsDisplayString};
enum SearchTopic { ST_NONE , ST_DAYS_SKIPPED , ST_DISABLED_SESSIONS , ST_NOTES , ST_NOTES_STRING , ST_BOOKMARKS , ST_BOOKMARKS_STRING , ST_AHI , ST_SESSION_LENGTH , ST_SESSIONS_QTY , ST_DAILY_USAGE , ST_APNEA_LENGTH , ST_EVENT };
enum OpCode {
//DO NOT CHANGE NUMERIC OP CODES because THESE VALUES impact compare operations.
// start of fixed codes - do not modifyusage bit1(1)==> Less ; bit2(2)==>greater bit3(4)==>Equal;
OP_INVALID , OP_LT , OP_GT , OP_NE , OP_EQ , OP_LE , OP_GE , OP_END_NUMERIC ,
// end of fixed codes
OP_CONTAINS , OP_WILDCARD , OP_NO_PARMS /*Self starting*/};
class Match
{
public:
void stateMachine();
Match(bool valid=false ) {this->valid=valid;};
virtual ~Match( ) {};
bool isValid() {return valid;};
bool isEmpty() {return !valid || searchTopic==ST_NONE;};
QString matchName;
QString opCodeStr;
QString compareString;
QString units;
QString createMatchDescription();
SearchTopic searchTopic = ST_NONE;
ChannelID channelId = 0;
OpCode operationOpCode = OP_INVALID;
ValueMode valueMode;
qint32 foundValue ;
QString foundString;
bool minMaxValid = false;
qint32 minInteger ;
qint32 maxInteger ;
qint32 compareValue=0;
void updateMinMaxValues(qint32 value) ;
bool compare(int,int);
bool compare(QString aa , QString bb);
QRegExp searchPatterToRegex (QString searchPattern);
QString formatTime (qint32) ;
int nextTab;
QString valueToString(int value, QString empty = "");
double maxDouble;
double minDouble;
QString label;
private:
bool valid=false;
};
class Matches
{
public:
Matches() ;
~Matches() ;
Match* addMatch();
void clear() ;
Match* at(int offset) {
if (offset<0 || offset>= size()) return empty();
return matchList[offset];
};
Match* empty();
int size() {return inuse;};
private:
int inuse = 0;
int created() {return matchList.size();};
Match _empty = Match();
QList<Match*> matchList;
};
class DailySearchTab : public QWidget
{
Q_OBJECT
@ -49,6 +123,9 @@ public:
void updateEvents(ChannelID id,QString fullname);
private:
enum STATE { INIT , waitForSearchParameters , waitForStart , searching , endOfSeaching , waitForContinue };
STATE state;
QString red = "#ff8080";
QString green="#80ff80";
QString grey= "#c0c0c0";
@ -68,18 +145,6 @@ private:
const int passDisplayLimit = 30;
const int stringDisplayLen = 80;
enum ValueMode { invalidValueMode , notUsed , minutesToMs , hoursToMs , hundredths , opWhole , displayWhole , opString , displayString, secondsDisplayString};
enum SearchTopic { ST_NONE = 0 , ST_DAYS_SKIPPED = 1 , ST_DISABLED_SESSIONS = 2 , ST_NOTES = 3 , ST_NOTES_STRING , ST_BOOKMARKS , ST_BOOKMARKS_STRING , ST_AHI , ST_SESSION_LENGTH , ST_SESSIONS_QTY , ST_DAILY_USAGE , ST_APNEA_LENGTH , ST_EVENT };
enum OpCode {
//DO NOT CHANGE NUMERIC OP CODES because THESE VALUES impact compare operations.
// start of fixed codes
OP_INVALID , OP_LT , OP_GT , OP_NE , OP_EQ , OP_LE , OP_GE , OP_END_NUMERIC ,
// end of fixed codes
OP_CONTAINS , OP_WILDCARD , OP_NO_PARMS };
Daily* daily;
QWidget* parent;
QWidget* searchTabWidget;
@ -88,12 +153,20 @@ enum OpCode {
QTableWidget* resultTable;
QFrame* cmdDescList;
quint32 cmdDescLabelsUsed = 0;
QVBoxLayout* cmdDescLayout;
QVector<QLabel*> cmdDescLabels;
QLabel* getCmdDescLabel();
void clrCmdDescList();
// start Widget
QWidget* startWidget;
QHBoxLayout* startLayout;
QPushButton* startButton;
QPushButton* matchButton;
QPushButton* clearButton;
QPushButton* startButton;
QPushButton* addMatchButton;
// Command command Widget
QWidget* commandWidget;
@ -130,23 +203,25 @@ enum OpCode {
QMap <QString,OpCode> opCodeMap;
QString opCodeStr(OpCode);
OpCode operationOpCode = OP_INVALID;
bool helpMode=false;
QString helpString = helpStr();
void clearMatch();
void createUi();
void populateControl();
QSize setText(QPushButton*,QString);
QSize setText(QLabel*,QString);
QSize textsize(QFont font ,QString text);
void setColor(QPushButton*,QString);
Matches matches;
Match* match = matches.empty();
void search(QDate date);
void find(QDate&);
bool matchFind(Match* myMatch ,Day* day,QDate& date , Qt::Alignment& alignment);
void criteriaChanged();
void endOfPass();
void displayStatistics();
void clearStatistics();
void setResult(int row,int column,QDate date,QString value);
@ -161,7 +236,6 @@ enum OpCode {
QString helpStr();
QString centerLine(QString line);
QString formatTime (qint32) ;
QString convertRichText2Plain (QString rich);
QRegExp searchPatterToRegex (QString wildcard);
QListWidgetItem* calculateMaxSize(QString str,int topic);
@ -170,15 +244,10 @@ enum OpCode {
QSet<QString> commandEventList;
EventDataType calculateAhi(Day* day);
bool compare(int,int );
bool compare(QString aa , QString bb);
bool createUiFinished=false;
bool startButtonMode=true;
bool commandPopupEnabled=false;
SearchTopic searchTopic;
int nextTab;
int channelId;
QDate earliestDate ;
QDate latestDate ;
@ -193,30 +262,16 @@ enum OpCode {
int DaysWithFileErrors;
void setoperation(OpCode opCode,ValueMode mode) ;
ValueMode valueMode;
qint32 selectValue=0;
bool minMaxValid;
qint32 minInteger;
qint32 maxInteger;
void updateValues(qint32);
QString valueToString(int value, QString empty = "");
qint32 foundValue;
QString foundString;
double maxDouble;
double minDouble;
QTextDocument richText;
public slots:
private slots:
void on_startButton_clicked();
void on_clearButton_clicked();
void on_matchButton_clicked();
void on_addMatchButton_clicked();
void on_helpButton_clicked();
void on_commandButton_clicked();