From fa7ad0056e116d8297ccda05dd6cf4274fb08fed Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Mon, 8 May 2023 08:47:18 -0400 Subject: [PATCH] redesign gui layout to work isame on both windows and linux. --- oscar/dailySearchTab.cpp | 845 ++++++++++++++++++++++----------------- oscar/dailySearchTab.h | 120 ++++-- 2 files changed, 551 insertions(+), 414 deletions(-) diff --git a/oscar/dailySearchTab.cpp b/oscar/dailySearchTab.cpp index 821475d9..ded8b2c9 100644 --- a/oscar/dailySearchTab.cpp +++ b/oscar/dailySearchTab.cpp @@ -1,7 +1,6 @@ /* user graph settings Implementation * * Copyright (c) 2019-2022 The OSCAR Team - * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code @@ -13,13 +12,13 @@ #include #include +#include #include #include #include #include #include #include -// Never include this does not work with other platforms. include #include #include #include @@ -30,63 +29,43 @@ #include "SleepLib/profiles.h" #include "daily.h" +enum DS_COL { DS_COL_LEFT=0, DS_COL_MID, DS_COL_RIGHT, DS_COL_MAX }; +enum DS_ROW{ DS_ROW_CTL=0, DS_ROW_CMD, DS_ROW_LIST, DS_ROW_PROGRESS, DS_ROW_SUMMARY, DS_ROW_HEADER, DS_ROW_DATA }; +#define DS_ROW_MAX (passDisplayLimit+DS_ROW_DATA) + + +/* layout of searchTAB ++========================+ +| HELP | ++========================+ +| HELPText | ++========================+ +| Match | Clear | start | +|------------------------| +| control:cmd op value | ++========================+ +| Progress | ++========================+ +| Summary | ++========================+ +| RESULTS | ++========================+ +*/ + DailySearchTab::DailySearchTab(Daily* daily , QWidget* searchTabWidget , QTabWidget* dailyTabWidget) : daily(daily) , parent(daily) , searchTabWidget(searchTabWidget) ,dailyTabWidget(dailyTabWidget) { + //DEBUGFW Q(this->font()); m_icon_selected = new QIcon(":/icons/checkmark.png"); m_icon_notSelected = new QIcon(":/icons/empty_box.png"); m_icon_configure = new QIcon(":/icons/cog.png"); - - #if 0 - // method of find the daily tabWidgets works for english. - // the question will it work for all other langauges??? - // Right now they are const int in the header file. - int maxIndex = dailyTabWidget->count(); - for (int index=0 ; indextabText(index); - if (title.contains("detail",Qt::CaseInsensitive) ) {TW_DETAILED = index; continue;}; - if (title.contains("event",Qt::CaseInsensitive) ) {TW_EVENTS = index; continue;}; - if (title.contains("note",Qt::CaseInsensitive) ) {TW_NOTES = index; continue;}; - if (title.contains("bookmark",Qt::CaseInsensitive) ) {TW_BOOKMARK = index; continue;}; - if (title.contains("search",Qt::CaseInsensitive) ) {TW_SEARCH = index; continue;}; - } - #endif - createUi(); - daily->connect(selectString, SIGNAL(textEdited(QString)), this, SLOT(on_textEdited(QString)) ); - daily->connect(selectInteger, SIGNAL(valueChanged(int)), this, SLOT(on_intValueChanged(int)) ); - daily->connect(selectDouble, SIGNAL(valueChanged(double)), this, SLOT(on_doubleValueChanged(double)) ); - daily->connect(selectCommandCombo, SIGNAL(activated(int)), this, SLOT(on_selectCommandCombo_activated(int) )); - daily->connect(selectCommandButton, SIGNAL(clicked()), this, SLOT(on_selectCommandButton_clicked()) ); - daily->connect(selectOperationCombo,SIGNAL(activated(int)), this, SLOT(on_selectOperationCombo_activated(int) )); - daily->connect(selectOperationButton,SIGNAL(clicked()), this, SLOT(on_selectOperationButton_clicked()) ); - daily->connect(selectMatch, SIGNAL(clicked()), this, SLOT(on_selectMatch_clicked()) ); - daily->connect(startButton, SIGNAL(clicked()), this, SLOT(on_startButton_clicked()) ); - daily->connect(clearButton, SIGNAL(clicked()), this, SLOT(on_clearButton_clicked()) ); - daily->connect(helpButton , SIGNAL(clicked()), this, SLOT(on_helpButton_clicked()) ); - daily->connect(guiDisplayTable, SIGNAL(itemClicked(QTableWidgetItem*)), this, SLOT(on_dateItemClicked(QTableWidgetItem*) )); - daily->connect(guiDisplayTable, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(on_dateItemClicked(QTableWidgetItem*) )); - daily->connect(guiDisplayTable, SIGNAL(itemActivated(QTableWidgetItem*)), this, SLOT(on_dateItemClicked(QTableWidgetItem*) )); - daily->connect(dailyTabWidget, SIGNAL(currentChanged(int)), this, SLOT(on_dailyTabWidgetCurrentChanged(int) )); + connectUi(true); } DailySearchTab::~DailySearchTab() { - daily->disconnect(selectString, SIGNAL(textEdited(QString)), this, SLOT(on_textEdited(QString)) ); - daily->disconnect(dailyTabWidget, SIGNAL(currentChanged(int)), this, SLOT(on_dailyTabWidgetCurrentChanged(int) )); - daily->disconnect(selectInteger, SIGNAL(valueChanged(int)), this, SLOT(on_intValueChanged(int)) ); - daily->disconnect(selectDouble, SIGNAL(valueChanged(double)), this, SLOT(on_doubleValueChanged(double)) ); - daily->disconnect(selectCommandCombo, SIGNAL(activated(int)), this, SLOT(on_selectCommandCombo_activated(int) )); - daily->disconnect(selectCommandButton,SIGNAL(clicked()), this, SLOT(on_selectCommandButton_clicked()) ); - daily->disconnect(selectOperationCombo,SIGNAL(activated(int)), this, SLOT(on_selectOperationCombo_activated(int) )); - daily->disconnect(selectOperationButton,SIGNAL(clicked()), this, SLOT(on_selectOperationButton_clicked()) ); - daily->disconnect(selectMatch, SIGNAL(clicked()), this, SLOT(on_selectMatch_clicked()) ); - daily->disconnect(helpButton , SIGNAL(clicked()), this, SLOT(on_helpButton_clicked()) ); - daily->disconnect(guiDisplayTable, SIGNAL(itemClicked(QTableWidgetItem*)), this, SLOT(on_dateItemClicked(QTableWidgetItem*) )); - daily->disconnect(guiDisplayTable, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(on_dateItemClicked(QTableWidgetItem*) )); - daily->disconnect(guiDisplayTable, SIGNAL(itemActivated(QTableWidgetItem*)), this, SLOT(on_dateItemClicked(QTableWidgetItem*) )); - daily->disconnect(startButton, SIGNAL(clicked()), this, SLOT(on_startButton_clicked()) ); - daily->connect(clearButton, SIGNAL(clicked()), this, SLOT(on_clearButton_clicked()) ); + connectUi(false); delete m_icon_selected; delete m_icon_notSelected; delete m_icon_configure ; @@ -94,202 +73,231 @@ DailySearchTab::~DailySearchTab() { void DailySearchTab::createUi() { - QFont baseFont = this->font(); - searchTabWidget ->setFont(baseFont); - searchTabLayout = new QVBoxLayout(searchTabWidget); - criteriaLayout = new QHBoxLayout(); - innerCriteriaFrame = new QFrame(this); - innerCriteriaLayout = new QHBoxLayout(innerCriteriaFrame); - searchLayout = new QHBoxLayout(); + controlTable = new QTableWidget(DS_ROW_MAX,DS_COL_MAX,searchTabWidget); + + commandWidget = new QWidget(this); + commandLayout = new QHBoxLayout(); + + summaryWidget = new QWidget(this); summaryLayout = new QHBoxLayout(); - searchTabLayout ->setContentsMargins(4, 4, 4, 4); - helpButton = new QPushButton(this); - helpText = new QTextEdit(this); - selectMatch = new QPushButton(this); - selectUnits = new QLabel(this); - selectCommandCombo = new QComboBox(this); - selectCommandButton = new QPushButton(this); - selectOperationCombo = new QComboBox(this); - selectOperationButton = new QPushButton(this); - startButton = new QPushButton(this); - clearButton = new QPushButton(this); - selectDouble = new QDoubleSpinBox(this); - selectInteger = new QSpinBox(this); - selectString = new QLineEdit(this); - statusProgress = new QLabel(this); - summaryProgress = new QLabel(this); - summaryFound = new QLabel(this); - summaryMinMax = new QLabel(this); - guiProgressBar = new QProgressBar(this); - guiDisplayTable = new QTableWidget(this); + helpButton = new QPushButton(this); + helpText = new QTextEdit(this); + matchButton = new QPushButton(this); + clearButton = new QPushButton(this); + + commandList = new QListWidget(controlTable); + commandButton = new QPushButton(commandWidget); + + operationCombo = new QComboBox(commandWidget); + operationButton = new QPushButton(commandWidget); + selectDouble = new QDoubleSpinBox(commandWidget); + selectInteger = new QSpinBox(commandWidget); + selectString = new QLineEdit(commandWidget); + selectUnits = new QLabel(commandWidget); + + startButton = new QPushButton(this); + statusProgress = new QLabel(this); + summaryProgress = new QLabel(this); + summaryFound = new QLabel(this); + summaryMinMax = new QLabel(this); + guiProgressBar = new QProgressBar(this); + + populateControl(); + + commandLayout->addWidget(commandButton); + commandLayout->addWidget(operationCombo); + commandLayout->addWidget(operationButton); + commandLayout->addWidget(selectInteger); + commandLayout->addWidget(selectString); + commandLayout->addWidget(selectDouble); + commandLayout->addWidget(selectUnits); + + commandLayout->setMargin(2); + commandLayout->setSpacing(2); + commandLayout->addStretch(0); + commandWidget->setLayout(commandLayout); + + summaryLayout->addWidget(summaryProgress); + summaryLayout->addWidget(summaryFound); + summaryLayout->addWidget(summaryMinMax); + + summaryLayout->setMargin(2); + summaryLayout->setSpacing(2); + summaryWidget->setLayout(summaryLayout); + + + controlTable->setCellWidget(DS_ROW_CTL,DS_COL_LEFT,matchButton); + controlTable->setCellWidget(DS_ROW_CTL,DS_COL_MID,clearButton); + controlTable->setCellWidget(DS_ROW_CTL,DS_COL_RIGHT,startButton); + + controlTable->setCellWidget(DS_ROW_LIST,DS_COL_LEFT,commandList); + controlTable->setCellWidget(DS_ROW_CMD,DS_COL_LEFT,commandWidget); + + controlTable->setCellWidget( DS_ROW_SUMMARY , 0 ,summaryWidget); + controlTable->setCellWidget( DS_ROW_PROGRESS , 0 , guiProgressBar); + + controlTable->setRowHeight(DS_ROW_LIST,commandList->size().height()); + controlTable->setRowHeight(DS_ROW_PROGRESS,guiProgressBar->size().height()); + + controlTable->setSpan( DS_ROW_CMD ,DS_COL_LEFT,1,3); + controlTable->setSpan( DS_ROW_LIST ,DS_COL_LEFT,1,3); + controlTable->setSpan( DS_ROW_SUMMARY ,DS_COL_LEFT,1,3); + controlTable->setSpan( DS_ROW_PROGRESS ,DS_COL_LEFT,1,3); + for (int index = DS_ROW_HEADER; indexsetSpan(index,DS_COL_MID,1,2); + } searchTabLayout ->addWidget(helpButton); searchTabLayout ->addWidget(helpText); + searchTabLayout ->addWidget(controlTable); - innerCriteriaLayout ->addWidget(selectCommandCombo); - innerCriteriaLayout ->addWidget(selectCommandButton); - innerCriteriaLayout ->addWidget(selectOperationCombo); - innerCriteriaLayout ->addWidget(selectOperationButton); - innerCriteriaLayout ->addWidget(selectInteger); - innerCriteriaLayout ->addWidget(selectString); - innerCriteriaLayout ->addWidget(selectDouble); - innerCriteriaLayout ->addWidget(selectUnits); - innerCriteriaLayout ->insertStretch(-1,5); // will center match command - - criteriaLayout ->addWidget(selectMatch); - criteriaLayout ->addWidget(innerCriteriaFrame); - criteriaLayout ->insertStretch(-1,5); - - searchTabLayout ->addLayout(criteriaLayout); - - searchLayout ->addWidget(clearButton); - searchLayout ->addWidget(startButton); - searchLayout ->insertStretch(2,5); - searchLayout ->addWidget(statusProgress); - searchLayout ->insertStretch(-1,5); - searchTabLayout ->addLayout(searchLayout); - - summaryLayout ->addWidget(summaryProgress); - summaryLayout ->insertStretch(1,5); - summaryLayout ->addWidget(summaryFound); - summaryLayout ->insertStretch(3,5); - summaryLayout ->addWidget(summaryMinMax); - searchTabLayout ->addLayout(summaryLayout); - - searchTabLayout ->addWidget(guiProgressBar); - searchTabLayout ->addWidget(guiDisplayTable); // End of UI creatation + //Setup each BUtton / control item - // Initialize ui contents + QString styleButton=QString( + "QPushButton { color: black; border: 1px solid black; padding: 5px ;background-color:white; }" + "QPushButton:disabled { color: #333333; border: 1px solid #333333; background-color: #dddddd;}" + ); - QString styleButton=QString("QPushButton { color: black; border: 1px solid black; padding: 5px ; } QPushButton:disabled { color: #606060; border: 1px solid #606060; }" ); + helpText->setReadOnly(true); + helpText->setLineWrapMode(QTextEdit::NoWrap); + QSize size = QFontMetrics(this->font()).size(0, helpString); + size.rheight() += 35 ; // scrollbar + size.rwidth() += 35 ; // scrollbar + helpText->setText(helpString); + helpText->setMinimumSize(textsize(this->font(),helpString)); + helpText->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); - searchTabWidget ->setFont(baseFont); - helpButton ->setFont(baseFont); - - helpText ->setFont(baseFont); - helpText ->setReadOnly(true); - helpText ->setLineWrapMode(QTextEdit::NoWrap); - helpMode = true; + helpButton->setStyleSheet( styleButton ); + // helpButton->setText(tr("Help")); + helpMode = true; on_helpButton_clicked(); - helpText ->setText(helpStr()); - selectMatch->setText(tr("Match:")); - selectMatch->setIcon(*m_icon_configure); - selectMatch->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - selectMatch->setStyleSheet( styleButton ); + matchButton->setIcon(*m_icon_configure); + matchButton->setStyleSheet( styleButton ); + setText(matchButton,tr("Match")); + clearButton->setStyleSheet( styleButton ); + setText(clearButton,tr("Clear")); - selectOperationButton->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - selectOperationButton->setText(""); - selectOperationButton->setStyleSheet("border:none;"); - selectOperationButton->hide(); + startButton->setStyleSheet( styleButton ); + //setText(startButton,tr("Start Search")); + //startButton->setEnabled(false); - selectCommandButton->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - selectCommandButton->setText(tr("Select Match")); - selectCommandButton->setStyleSheet("border:none;"); + //setText(commandButton,(tr("Select Match"))); + commandButton->setStyleSheet("border:none;"); - selectCommandCombo->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - selectCommandCombo->setFont(baseFont); + //float height = float(1+commandList->count())*commandListItemHeight ; + float height = float(commandList->count())*commandListItemHeight ; + commandList->setMinimumHeight(height); + commandList->setMinimumWidth(commandListItemMaxWidth); setCommandPopupEnabled(false); - selectOperationCombo->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - selectOperationCombo->setFont(baseFont); + + setText(operationButton,""); + operationButton->setStyleSheet("border:none;"); + operationButton->hide(); + operationCombo->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); setOperationPopupEnabled(false); selectDouble->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); selectInteger->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); selectString->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - - selectUnits->setText(""); selectUnits->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); + setText(selectUnits,""); - clearButton ->setStyleSheet( styleButton ); - clearButton ->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - startButton ->setStyleSheet( styleButton ); - startButton ->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - helpButton ->setStyleSheet( styleButton ); + summaryProgress->setStyleSheet("padding:4px;background-color: #ffffff;" ); + summaryFound->setStyleSheet("padding:4px;background-color: #f0f0f0;" ); + summaryMinMax->setStyleSheet("padding:4px;background-color: #ffffff;" ); + controlTable->horizontalHeader()->hide(); // hides numbers above each column + //controlTable->verticalHeader()->hide(); // hides numbers before each row. + controlTable->horizontalHeader()->setStretchLastSection(true); + // get rid of selection coloring + controlTable->setStyleSheet("QTableView{background-color: white; selection-background-color: white; }"); - summaryProgress ->setFont(baseFont); - summaryFound ->setFont(baseFont); - summaryMinMax ->setFont(baseFont); - summaryMinMax ->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); + float width = 14/*styleSheet:padding+border*/ + QFontMetrics(this->font()).size(Qt::TextSingleLine ,"WWW MMM 99 2222").width(); + controlTable->setColumnWidth(DS_COL_LEFT, width); - summaryProgress ->setStyleSheet("padding:4px;background-color: #ffffff;" ); - summaryFound ->setStyleSheet("padding:4px;background-color: #f0f0f0;" ); - summaryMinMax ->setStyleSheet("padding:4px;background-color: #ffffff;" ); + width = 30/*iconWidthPlus*/+QFontMetrics(this->font()).size(Qt::TextSingleLine ,clearButton->text()).width(); + //width = clearButton->width(); + controlTable->setColumnWidth(DS_COL_MID, width); + controlTable->setShowGrid(false); - searchTopic = ST_NONE; - - clearButton->setText(tr("Clear")); - startButton->setText(tr("Start Search")); - startButton->setEnabled(false); - - guiDisplayTable->setFont(baseFont); - if (guiDisplayTable->columnCount() <2) guiDisplayTable->setColumnCount(2); - horizontalHeader0 = new QTableWidgetItem(); - guiDisplayTable->setHorizontalHeaderItem ( 0, horizontalHeader0); - - horizontalHeader1 = new QTableWidgetItem(); - guiDisplayTable->setHorizontalHeaderItem ( 1, horizontalHeader1); - - guiDisplayTable->setObjectName(QString::fromUtf8("guiDisplayTable")); - guiDisplayTable->setAlternatingRowColors(true); - guiDisplayTable->setSelectionMode(QAbstractItemView::SingleSelection); - guiDisplayTable->setAlternatingRowColors(true); - guiDisplayTable->setSelectionBehavior(QAbstractItemView::SelectRows); - guiDisplayTable->setSortingEnabled(false); - guiDisplayTable->horizontalHeader()->setStretchLastSection(true); - // should make the following based on a real date ei based on locale. - guiDisplayTable->setColumnWidth(0, 30/*iconWidthPlus*/ + QFontMetrics(baseFont).size(Qt::TextSingleLine , "WWW MMM 99 2222").width()); - - - horizontalHeader0->setText(tr("DATE\nJumps to Date")); - horizontalHeader1->setText(""); + searchTabLayout->setContentsMargins(4, 4, 4, 4); + //DEBUGFW Q(QWidget::logicalDpiX()) Q(QWidget::logicalDpiY()) Q(QWidget::physicalDpiX()) Q(QWidget::physicalDpiY()); + setResult(DS_ROW_HEADER,0,QDate(),tr("DATE\nJumps to Date")); on_clearButton_clicked(); } -void DailySearchTab::delayedCreateUi() { - // meed delay to insure days are populated. - if (createUiFinished) return; - createUiFinished = true; +void DailySearchTab::connectUi(bool doConnect) { + if (doConnect) { + daily->connect(startButton, SIGNAL(clicked()), this, SLOT(on_startButton_clicked()) ); + daily->connect(clearButton, SIGNAL(clicked()), this, SLOT(on_clearButton_clicked()) ); + daily->connect(matchButton, SIGNAL(clicked()), this, SLOT(on_matchButton_clicked()) ); + daily->connect(helpButton , SIGNAL(clicked()), this, SLOT(on_helpButton_clicked()) ); - selectCommandCombo->clear(); - selectCommandCombo->addItem(tr("Notes"),ST_NOTES); - selectCommandCombo->addItem(tr("Notes containing"),ST_NOTES_STRING); - selectCommandCombo->addItem(tr("Bookmarks"),ST_BOOKMARKS); - selectCommandCombo->addItem(tr("Bookmarks containing"),ST_BOOKMARKS_STRING); - selectCommandCombo->addItem(tr("AHI "),ST_AHI); - selectCommandCombo->addItem(tr("Daily Duration"),ST_DAILY_USAGE); - selectCommandCombo->addItem(tr("Session Duration" ),ST_SESSION_LENGTH); - selectCommandCombo->addItem(tr("Days Skipped"),ST_DAYS_SKIPPED); - selectCommandCombo->addItem(tr("Disabled Sessions"),ST_DISABLED_SESSIONS); - selectCommandCombo->addItem(tr("Number of Sessions"),ST_SESSIONS_QTY); - selectCommandCombo->insertSeparator(selectCommandCombo->count()); // separate from events + daily->connect(commandButton, SIGNAL(clicked()), this, SLOT(on_commandButton_clicked()) ); + daily->connect(operationButton, SIGNAL(clicked()), this, SLOT(on_operationButton_clicked()) ); + + daily->connect(commandList, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(on_commandList_activated(QListWidgetItem*) )); + daily->connect(commandList, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(on_commandList_activated(QListWidgetItem*) )); + daily->connect(operationCombo, SIGNAL(activated(int)), this, SLOT(on_operationCombo_activated(int) )); - opCodeMap.clear(); - opCodeMap.insert( opCodeStr(OP_LT),OP_LT); - opCodeMap.insert( opCodeStr(OP_GT),OP_GT); - opCodeMap.insert( opCodeStr(OP_NE),OP_NE); - opCodeMap.insert( opCodeStr(OP_LE),OP_LE); - opCodeMap.insert( opCodeStr(OP_GE),OP_GE); - opCodeMap.insert( opCodeStr(OP_EQ),OP_EQ); - opCodeMap.insert( opCodeStr(OP_NE),OP_NE); - opCodeMap.insert( opCodeStr(OP_CONTAINS),OP_CONTAINS); - opCodeMap.insert( opCodeStr(OP_WILDCARD),OP_WILDCARD); + daily->connect(selectInteger, SIGNAL(valueChanged(int)), this, SLOT(on_intValueChanged(int)) ); + daily->connect(selectDouble, SIGNAL(valueChanged(double)), this, SLOT(on_doubleValueChanged(double)) ); + daily->connect(selectString, SIGNAL(textEdited(QString)), this, SLOT(on_textEdited(QString)) ); - // The order here is the order in the popup box - selectOperationCombo->clear(); - selectOperationCombo->addItem(opCodeStr(OP_LT)); - selectOperationCombo->addItem(opCodeStr(OP_GT)); - selectOperationCombo->addItem(opCodeStr(OP_LE)); - selectOperationCombo->addItem(opCodeStr(OP_GE)); - selectOperationCombo->addItem(opCodeStr(OP_EQ)); - selectOperationCombo->addItem(opCodeStr(OP_NE)); + } else { + daily->disconnect(startButton, SIGNAL(clicked()), this, SLOT(on_startButton_clicked()) ); + daily->disconnect(clearButton, SIGNAL(clicked()), this, SLOT(on_clearButton_clicked()) ); + daily->disconnect(matchButton, SIGNAL(clicked()), this, SLOT(on_matchButton_clicked()) ); + daily->disconnect(helpButton , SIGNAL(clicked()), this, SLOT(on_helpButton_clicked()) ); + + daily->disconnect(commandButton, SIGNAL(clicked()), this, SLOT(on_commandButton_clicked()) ); + daily->disconnect(operationButton, SIGNAL(clicked()), this, SLOT(on_operationButton_clicked()) ); + + daily->disconnect(commandList, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(on_commandList_activated(QListWidgetItem*) )); + daily->disconnect(commandList, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(on_commandList_activated(QListWidgetItem*) )); + daily->disconnect(operationCombo, SIGNAL(activated(int)), this, SLOT(on_operationCombo_activated(int) )); + + daily->disconnect(selectInteger, SIGNAL(valueChanged(int)), this, SLOT(on_intValueChanged(int)) ); + daily->disconnect(selectDouble, SIGNAL(valueChanged(double)), this, SLOT(on_doubleValueChanged(double)) ); + daily->disconnect(selectString, SIGNAL(textEdited(QString)), this, SLOT(on_textEdited(QString)) ); + + } +} + +QListWidgetItem* DailySearchTab::calculateMaxSize(QString str,int topic) { //calculate max size of strings + float scaleX= (float)(QWidget::logicalDpiX()*100.0)/(float)(QWidget::physicalDpiX()); + float percentX = scaleX/100.0; + float width = QFontMetricsF(this->font()).size(Qt::TextSingleLine , str).width(); + width += 30 ; // account for scrollbar width; + //DEBUGFW Q(scaleX) Q(percentX) Q(width) Q(width*percentX); + commandListItemMaxWidth = max (commandListItemMaxWidth, (width*percentX)); + commandListItemHeight = QFontMetricsF(this->font()).size(Qt::TextSingleLine , str).height(); + QListWidgetItem* item = new QListWidgetItem(str); + item->setData(Qt::UserRole,topic); + return item; +} + +void DailySearchTab::populateControl() { + + commandList->clear(); + commandList->addItem(calculateMaxSize(tr("Notes"),ST_NOTES)); + commandList->addItem(calculateMaxSize(tr("Notes containing"),ST_NOTES_STRING)); + commandList->addItem(calculateMaxSize(tr("Bookmarks"),ST_BOOKMARKS)); + commandList->addItem(calculateMaxSize(tr("Bookmarks containing"),ST_BOOKMARKS_STRING)); + commandList->addItem(calculateMaxSize(tr("AHI "),ST_AHI)); + commandList->addItem(calculateMaxSize(tr("Daily Duration"),ST_DAILY_USAGE)); + commandList->addItem(calculateMaxSize(tr("Session Duration" ),ST_SESSION_LENGTH)); + commandList->addItem(calculateMaxSize(tr("Days Skipped"),ST_DAYS_SKIPPED)); + commandList->addItem(calculateMaxSize(tr("Disabled Sessions"),ST_DISABLED_SESSIONS)); + commandList->addItem(calculateMaxSize(tr("Number of Sessions"),ST_SESSIONS_QTY)); + //commandList->insertSeparator(commandList->count()); // separate from events // Now add events QDate date = p_profile->LastDay(MT_CPAP); @@ -307,18 +315,45 @@ void DailySearchTab::delayedCreateUi() { schema::Channel chan = schema::channel[ id ]; // new stuff now QString displayName= chan.fullname(); - selectCommandCombo->addItem(displayName,id); + commandList->addItem(calculateMaxSize(displayName,id)); } - on_clearButton_clicked(); + + opCodeMap.clear(); + opCodeMap.insert( opCodeStr(OP_LT),OP_LT); + opCodeMap.insert( opCodeStr(OP_GT),OP_GT); + opCodeMap.insert( opCodeStr(OP_NE),OP_NE); + opCodeMap.insert( opCodeStr(OP_LE),OP_LE); + opCodeMap.insert( opCodeStr(OP_GE),OP_GE); + opCodeMap.insert( opCodeStr(OP_EQ),OP_EQ); + opCodeMap.insert( opCodeStr(OP_NE),OP_NE); + opCodeMap.insert( opCodeStr(OP_CONTAINS),OP_CONTAINS); + opCodeMap.insert( opCodeStr(OP_WILDCARD),OP_WILDCARD); + + // The order here is the order in the popup box + operationCombo->clear(); + operationCombo->addItem(opCodeStr(OP_LT)); + operationCombo->addItem(opCodeStr(OP_GT)); + operationCombo->addItem(opCodeStr(OP_LE)); + operationCombo->addItem(opCodeStr(OP_GE)); + operationCombo->addItem(opCodeStr(OP_EQ)); + operationCombo->addItem(opCodeStr(OP_NE)); + } + void DailySearchTab::on_helpButton_clicked() { helpMode = !helpMode; if (helpMode) { + //DEBUGFW Q(textsize(helpText->font(),helpString)) Q(controlTable->size()); + controlTable->setMinimumSize(QSize(50,200)+textsize(helpText->font(),helpString)); + controlTable->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding); + //setText(helpButton,tr("Click HERE to close Help")); helpButton->setText(tr("Click HERE to close Help")); - helpText ->setVisible(true); + helpText ->show(); } else { - helpText ->setVisible(false); + controlTable->setMinimumWidth(250); + helpText ->hide(); + //setText(helpButton,tr("Help")); helpButton->setText(tr("Help")); } } @@ -425,7 +460,7 @@ QRegExp DailySearchTab::searchPatterToRegex (QString searchPattern) { } bool DailySearchTab::compare(QString find , QString target) { - OpCode opCode = selectOperationOpCode; + OpCode opCode = operationOpCode; bool ret=false; if (opCode==OP_CONTAINS) { ret = target.contains(find,Qt::CaseInsensitive); @@ -437,7 +472,7 @@ bool DailySearchTab::compare(QString find , QString target) { } bool DailySearchTab::compare(int aa , int bb) { - OpCode opCode = selectOperationOpCode; + OpCode opCode = operationOpCode; if (opCode>=OP_END_NUMERIC) return false; int mode=0; if (aa itemText(index); +void DailySearchTab::on_operationCombo_activated(int index) { + QString text = operationCombo->itemText(index); OpCode opCode = opCodeMap[text]; if (opCode>OP_INVALID && opCode < OP_END_NUMERIC) { - selectOperationOpCode = opCode; - selectOperationButton->setText(opCodeStr(selectOperationOpCode)); + operationOpCode = opCode; + setText(operationButton,opCodeStr(operationOpCode)); } else if (opCode == OP_CONTAINS || opCode == OP_WILDCARD) { - selectOperationOpCode = opCode; - selectOperationButton->setText(opCodeStr(selectOperationOpCode)); + operationOpCode = opCode; + setText(operationButton,opCodeStr(operationOpCode)); } else { // null case; } setOperationPopupEnabled(false); criteriaChanged(); - - }; -void DailySearchTab::on_selectCommandCombo_activated(int index) { +QSize DailySearchTab::setText(QLabel* label ,QString text) { + QSize size = textsize(label->font(),text); + int width = size.width(); + width += 20 ; //margings + label->setMinimumWidth(width); + label->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); + //label->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Fixed); + label->setText(text); + return size; +} + +QSize DailySearchTab::setText(QPushButton* but ,QString text) { + QSize size = textsize(but->font(),text); + int width = size.width(); + width += but->iconSize().width(); + width += 4 ; //margings + but->setMinimumWidth(width); + but->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); + //but->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Fixed); + but->setText(text); + return size; +} + +void DailySearchTab::on_commandList_activated(QListWidgetItem* item) { // here to select new search criteria // must reset all variables and label, button, etc on_clearButton_clicked() ; @@ -503,12 +559,13 @@ void DailySearchTab::on_selectCommandCombo_activated(int index) { // workaround for combo box alignmnet and sizing. // copy selections to a pushbutton. hide combobox and show pushButton. Pushbutton activation can show popup. // always hide first before show. allows for best fit - selectCommandButton->setText(selectCommandCombo->itemText(index)); + setText(commandButton, item->text()); + setCommandPopupEnabled(false); - selectOperationOpCode = OP_INVALID; + operationOpCode = OP_INVALID; // get item selected - int itemTopic = selectCommandCombo->itemData(index).toInt(); + int itemTopic = item->data(Qt::UserRole).toInt(); if (itemTopic>=ST_EVENT) { channelId = itemTopic; searchTopic = ST_EVENT; @@ -518,85 +575,84 @@ void DailySearchTab::on_selectCommandCombo_activated(int index) { switch (searchTopic) { case ST_NONE : // should never get here. - horizontalHeader1->setText(""); + setResult(DS_ROW_HEADER,1,QDate(),""); nextTab = TW_NONE ; - setSelectOperation( OP_INVALID ,notUsed); + setoperation( OP_INVALID ,notUsed); break; case ST_DAYS_SKIPPED : - horizontalHeader1->setText(tr("No Data\nJumps to Date's Details ")); + setResult(DS_ROW_HEADER,1,QDate(),tr("No Data\nJumps to Date's Details ")); nextTab = TW_DETAILED ; - setSelectOperation(OP_NO_PARMS,notUsed); + setoperation(OP_NO_PARMS,notUsed); break; case ST_DISABLED_SESSIONS : - horizontalHeader1->setText(tr("Number Disabled Session\nJumps to Date's Details ")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Number Disabled Session\nJumps to Date's Details ")); nextTab = TW_DETAILED ; selectInteger->setValue(0); - setSelectOperation(OP_NO_PARMS,displayWhole); + setoperation(OP_NO_PARMS,displayWhole); break; case ST_NOTES : - horizontalHeader1->setText(tr("Note\nJumps to Date's Notes")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Note\nJumps to Date's Notes")); nextTab = TW_NOTES ; - setSelectOperation( OP_NO_PARMS ,displayString); + setoperation( OP_NO_PARMS ,displayString); break; case ST_BOOKMARKS : - horizontalHeader1->setText(tr("Jumps to Date's Bookmark")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Bookmark\nJumps to Date's Bookmark")); nextTab = TW_BOOKMARK ; - setSelectOperation( OP_NO_PARMS ,displayString); + setoperation( OP_NO_PARMS ,displayString); break; case ST_BOOKMARKS_STRING : - horizontalHeader1->setText(tr("Jumps to Date's Bookmark")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Bookmark\nJumps to Date's Bookmark")); nextTab = TW_BOOKMARK ; - //setSelectOperation(OP_CONTAINS,opString); - setSelectOperation(OP_WILDCARD,opString); + //setoperation(OP_CONTAINS,opString); + setoperation(OP_WILDCARD,opString); selectString->clear(); break; case ST_NOTES_STRING : - horizontalHeader1->setText(tr("Note\nJumps to Date's Notes")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Note\nJumps to Date's Notes")); nextTab = TW_NOTES ; - //setSelectOperation(OP_CONTAINS,opString); - setSelectOperation(OP_WILDCARD,opString); + //setoperation(OP_CONTAINS,opString); + setoperation(OP_WILDCARD,opString); selectString->clear(); break; case ST_AHI : - horizontalHeader1->setText(tr("AHI\nJumps to Date's Details")); + setResult(DS_ROW_HEADER,1,QDate(),tr("AHI\nJumps to Date's Details")); nextTab = TW_DETAILED ; - setSelectOperation(OP_GT,hundredths); + setoperation(OP_GT,hundredths); selectDouble->setValue(5.0); break; case ST_SESSION_LENGTH : - horizontalHeader1->setText(tr("Session Duration\nJumps to Date's Details")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Session Duration\nJumps to Date's Details")); nextTab = TW_DETAILED ; - setSelectOperation(OP_LT,minutesToMs); + setoperation(OP_LT,minutesToMs); selectDouble->setValue(5.0); selectInteger->setValue((int)selectDouble->value()*60000.0); //convert to ms break; case ST_SESSIONS_QTY : - horizontalHeader1->setText(tr("Number of Sessions\nJumps to Date's Details")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Number of Sessions\nJumps to Date's Details")); nextTab = TW_DETAILED ; - setSelectOperation(OP_GT,opWhole); + setoperation(OP_GT,opWhole); selectInteger->setRange(0,999); selectInteger->setValue(2); break; case ST_DAILY_USAGE : - horizontalHeader1->setText(tr("Daily Duration\nJumps to Date's Details")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Daily Duration\nJumps to Date's Details")); nextTab = TW_DETAILED ; - setSelectOperation(OP_LT,hoursToMs); + setoperation(OP_LT,hoursToMs); selectDouble->setValue(p_profile->cpap->complianceHours()); selectInteger->setValue((int)selectDouble->value()*3600000.0); //convert to ms break; case ST_EVENT: // Have an Event - horizontalHeader1->setText(tr("Number of events\nJumps to Date's Events")); + setResult(DS_ROW_HEADER,1,QDate(),tr("Number of events\nJumps to Date's Events")); nextTab = TW_EVENTS ; - setSelectOperation(OP_GT,opWhole); + setoperation(OP_GT,opWhole); selectInteger->setValue(0); break; } - criteriaChanged(); - if (selectOperationOpCode == OP_NO_PARMS ) { + if (operationOpCode == OP_NO_PARMS ) { // auto start searching - startButton->setText(tr("Automatic start")); + setText(startButton,tr("Automatic start")); startButtonMode=true; on_startButton_clicked(); return; @@ -604,6 +660,48 @@ void DailySearchTab::on_selectCommandCombo_activated(int index) { return; } +void DailySearchTab::setResult(int row,int column,QDate date,QString text) { + if(column<0 || column>1) { + DEBUGTFW O("Column out of range ERROR") Q(row) Q(column) Q(date) Q(text); + return; + } else if ( row < DS_ROW_HEADER || row >= DS_ROW_MAX) { + DEBUGTFW O("Row out of range ERROR") Q(row) Q(column) Q(date) Q(text); + return; + } + + QWidget* header = controlTable->cellWidget(row,column); + GPushButton* item; + if (header == nullptr) { + item = new GPushButton(row,column,date,this); + //item->setStyleSheet("QPushButton {text-align: left;vertical-align:top;}"); + item->setStyleSheet( + "QPushButton { text-align: left;color: black; border: 1px solid black; padding: 5px ;background-color:white; }" ); + controlTable->setCellWidget(row,column,item); + } else { + item = dynamic_cast(header); + if (item == nullptr) { + DEBUGFW Q(header) Q(item) Q(row) Q(column) Q(text) QQ("error","======================="); + return; + } + item->setDate(date); + } + if (row == DS_ROW_HEADER) { + QSize size=setText(item,text); + controlTable->setRowHeight(DS_ROW_HEADER,8/*margins*/+size.height()); + } else { + item->setIcon(*m_icon_notSelected); + if (column == 0) { + setText(item,date.toString()); + } else { + setText(item,text); + } + } + if ( row == DS_ROW_DATA ) { + controlTable->setRowHidden(DS_ROW_HEADER,false); + } + controlTable->setRowHidden(row,false); +} + void DailySearchTab::updateValues(qint32 value) { foundValue = value; if (!minMaxValid ) { @@ -772,12 +870,7 @@ void DailySearchTab::search(QDate date) qWarning() << "DailySearchTab::find invalid date." << date; return; } - guiProgressBar->show(); - statusProgress->show(); - guiDisplayTable->clearContents(); - for (int index=0; indexrowCount();index++) { - guiDisplayTable->setRowHidden(index,true); - } + hideResults(false); foundString.clear(); passFound=0; while (date >= earliestDate) { @@ -794,121 +887,97 @@ void DailySearchTab::search(QDate date) void DailySearchTab::addItem(QDate date, QString value,Qt::Alignment alignment) { int row = passFound; - - QTableWidgetItem *item = new QTableWidgetItem(*m_icon_notSelected,date.toString()); - item->setData(dateRole,date); - item->setData(valueRole,value); - item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled); - - QTableWidgetItem *item2 = new QTableWidgetItem(*m_icon_notSelected,value); - item2->setTextAlignment(alignment|Qt::AlignVCenter); - item2->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled); - if (guiDisplayTable->rowCount()<(row+1)) { - guiDisplayTable->insertRow(row); - } - - guiDisplayTable->setItem(row,0,item); - guiDisplayTable->setItem(row,1,item2); - guiDisplayTable->setRowHidden(row,false); + Q_UNUSED(alignment); + setResult(DS_ROW_DATA+row,0,date,value); + setResult(DS_ROW_DATA+row,1,date,value); } void DailySearchTab::endOfPass() { startButtonMode=false; // display Continue; QString display; if ((passFound >= passDisplayLimit) && (daysProcessedsetText(centerLine(tr("More to Search"))); - statusProgress->show(); + //setText(statusProgress,centerLine(tr("More to Search"))); + //statusProgress->show(); startButton->setEnabled(true); - startButton->setText(tr("Continue Search")); - guiDisplayTable->horizontalHeader()->show(); + setText(startButton,(tr("Continue Search"))); } else if (daysFound>0) { - statusProgress->setText(centerLine(tr("End of Search"))); - statusProgress->show(); + //setText(statusProgress,centerLine(tr("End of Search"))); + //statusProgress->show(); startButton->setEnabled(false); - guiDisplayTable->horizontalHeader()->show(); + setText(startButton,tr("End of Search")); } else { - statusProgress->setText(centerLine(tr("No Matches"))); - statusProgress->show(); + //setText(statusProgress,centerLine(tr("No Matches"))); + //statusProgress->show(); startButton->setEnabled(false); - guiDisplayTable->horizontalHeader()->hide(); + //setText(startButton,(tr("End of Search"))); + setText(startButton,tr("No Matches")); } displayStatistics(); } -void DailySearchTab::on_dateItemClicked(QTableWidgetItem *item) -{ - int row = item->row(); - int col = item->column(); - guiDisplayTable->setCurrentItem(item,QItemSelectionModel::Clear); - item->setIcon (*m_icon_selected); - item=guiDisplayTable->item(row,col); - if (col!=0) { - item = guiDisplayTable->item(item->row(),0); - } - QDate date = item->data(dateRole).toDate(); - daily->LoadDate( date ); - if ((col!=0) && nextTab>=0 && nextTab < dailyTabWidget->count()) { - dailyTabWidget->setCurrentIndex(nextTab); // 0 = details ; 1=events =2 notes ; 3=bookarks; - } -} - void DailySearchTab::setCommandPopupEnabled(bool on) { + DEBUGFW; if (on) { - selectCommandButton->show(); - selectCommandCombo->setEnabled(true); - selectCommandCombo->showPopup(); + commandPopupEnabled=true; + controlTable->setRowHidden(DS_ROW_CMD,true); + controlTable->setRowHidden(DS_ROW_LIST,false); + hideResults(true); } else { - selectCommandCombo->hidePopup(); - selectCommandCombo->setEnabled(false); - selectCommandCombo->hide(); - selectCommandButton->show(); + commandPopupEnabled=false; + controlTable->setRowHidden(DS_ROW_LIST,true); + controlTable->setRowHidden(DS_ROW_CMD,false); } } -void DailySearchTab::on_selectOperationButton_clicked() { - if (selectOperationOpCode == OP_CONTAINS ) { - selectOperationOpCode = OP_WILDCARD; - } else if (selectOperationOpCode == OP_WILDCARD) { - selectOperationOpCode = OP_CONTAINS ; +void DailySearchTab::on_operationButton_clicked() { + DEBUGFW; + if (operationOpCode == OP_CONTAINS ) { + operationOpCode = OP_WILDCARD; + } else if (operationOpCode == OP_WILDCARD) { + operationOpCode = OP_CONTAINS ; } else { setOperationPopupEnabled(true); return; } - selectOperationButton->setText(opCodeStr(selectOperationOpCode)); + QString text=opCodeStr(operationOpCode); + setText(operationButton,text); criteriaChanged(); }; -void DailySearchTab::on_selectMatch_clicked() { - setCommandPopupEnabled(true); +void DailySearchTab::on_matchButton_clicked() { + DEBUGFW; + setCommandPopupEnabled(!commandPopupEnabled); } -void DailySearchTab::on_selectCommandButton_clicked() +void DailySearchTab::on_commandButton_clicked() { + DEBUGFW; setCommandPopupEnabled(true); } void DailySearchTab::setOperationPopupEnabled(bool on) { - //if (selectOperationOpCode= OP_END_NUMERIC) return; + //if (operationOpCode= OP_END_NUMERIC) return; if (on) { - selectOperationCombo->setEnabled(true); - selectOperationCombo->showPopup(); - selectOperationButton->show(); + operationButton->hide(); + operationCombo->show(); + //operationCombo->setEnabled(true); + operationCombo->showPopup(); } else { - selectOperationCombo->hidePopup(); - selectOperationCombo->setEnabled(false); - selectOperationCombo->hide(); - selectOperationButton->show(); + operationCombo->hidePopup(); + //operationCombo->setEnabled(false); + operationCombo->hide(); + operationButton->show(); } } -void DailySearchTab::setSelectOperation(OpCode opCode,ValueMode mode) { +void DailySearchTab::setoperation(OpCode opCode,ValueMode mode) { valueMode = mode; - selectOperationOpCode = opCode; - selectOperationButton->setText(opCodeStr(selectOperationOpCode)); + operationOpCode = opCode; + setText(operationButton,opCodeStr(operationOpCode)); setOperationPopupEnabled(false); if (opCode > OP_INVALID && opCode show(); break; case hoursToMs: - selectUnits->setText(" Hours"); + setText(selectUnits,tr(" Hours")); selectUnits->show(); selectDouble->show(); break; case minutesToMs: - selectUnits->setText(" Minutes"); + setText(selectUnits,tr(" Minutes")); selectUnits->show(); selectDouble->setRange(0,9999); selectDouble->show(); @@ -940,7 +1009,7 @@ void DailySearchTab::setSelectOperation(OpCode opCode,ValueMode mode) { selectInteger->hide(); break; case opString: - selectOperationButton->show(); + operationButton->show(); selectString ->show(); break; case displayString: @@ -953,26 +1022,24 @@ void DailySearchTab::setSelectOperation(OpCode opCode,ValueMode mode) { } -void DailySearchTab::hideResults() { - - guiProgressBar->hide(); - // clear display table && hide - guiDisplayTable->horizontalHeader()->hide(); - for (int index=0; indexrowCount();index++) { - guiDisplayTable->setRowHidden(index,true); +void DailySearchTab::hideResults(bool hide) { + controlTable->setRowHidden(DS_ROW_SUMMARY,hide); + controlTable->setRowHidden(DS_ROW_PROGRESS,hide); + if (hide) { + for (int index = DS_ROW_HEADER; indexsetRowHidden(index,true); + } } - guiDisplayTable->horizontalHeader()->hide(); +} - // reset summary line - summaryProgress->hide(); - summaryFound->hide(); - summaryMinMax->hide(); - - statusProgress->hide(); +QSize DailySearchTab::textsize(QFont font ,QString text) { + return QFontMetrics(font).size(0 , text); } void DailySearchTab::on_clearButton_clicked() { + DEBUGFW; + searchTopic = ST_NONE; // make these button text back to start. startButton->setText(tr("Start Search")); startButtonMode=true; @@ -980,25 +1047,29 @@ void DailySearchTab::on_clearButton_clicked() // hide widgets //Reset Select area - selectCommandCombo->hide(); + commandList->hide(); setCommandPopupEnabled(false); - selectCommandButton->setText(tr("Select Match")); - selectCommandButton->show(); + setText(commandButton,(tr("Select Match"))); + commandButton->show(); - selectOperationCombo->hide(); + operationCombo->hide(); setOperationPopupEnabled(false); - selectOperationButton->hide(); - + operationButton->hide(); selectDouble->hide(); selectInteger->hide(); selectString->hide(); selectUnits->hide(); - hideResults(); + hideResults(true); + + // show these widgets; + //controlWidget->show(); } void DailySearchTab::on_startButton_clicked() { + DEBUGFW; + hideResults(false); if (startButtonMode) { search (latestDate ); startButtonMode=false; @@ -1021,30 +1092,24 @@ void DailySearchTab::on_textEdited(QString ) { criteriaChanged(); } -void DailySearchTab::on_dailyTabWidgetCurrentChanged(int ) { - // Any time a tab (daily, events , notes, bookmarks, seatch) is changed - // so finish updating the ui display. - delayedCreateUi(); -} - void DailySearchTab::displayStatistics() { QString extra; summaryProgress->show(); // display days searched QString skip= daysSkipped==0?"":QString(tr(" Skip:%1")).arg(daysSkipped); - summaryProgress->setText(centerLine(QString(tr("%1/%2%3 days.")).arg(daysProcessed).arg(daysTotal).arg(skip) )); + setText(summaryProgress,centerLine(QString(tr("%1/%2%3 days.")).arg(daysProcessed).arg(daysTotal).arg(skip) )); // display days found - summaryFound->setText(centerLine(QString(tr("Found %1.")).arg(daysFound) )); + setText(summaryFound,centerLine(QString(tr("Found %1.")).arg(daysFound) )); // display associated value extra =""; if (minMaxValid) { - extra = QString("%1/%2").arg(valueToString(minInteger)).arg(valueToString(maxInteger)); + extra = QString("%1 / %2").arg(valueToString(minInteger)).arg(valueToString(maxInteger)); } if (extra.size()>0) { - summaryMinMax->setText(extra); + setText(summaryMinMax,extra); summaryMinMax->show(); } else { summaryMinMax->hide(); @@ -1057,8 +1122,8 @@ void DailySearchTab::criteriaChanged() { // setup before start button if (valueMode != notUsed ) { - selectOperationButton->setText(opCodeStr(selectOperationOpCode)); - selectOperationButton->show(); + setText(operationButton,opCodeStr(operationOpCode)); + operationButton->show(); } switch (valueMode) { case hundredths : @@ -1081,16 +1146,16 @@ void DailySearchTab::criteriaChanged() { break; } - selectCommandCombo->hide(); - selectCommandButton->show(); + commandList->hide(); + commandButton->show(); - startButton->setText(tr("Start Search")); + setText(startButton,tr("Start Search")); startButtonMode=true; startButton->setEnabled( true); - statusProgress->setText(centerLine(" ----- ")); + setText(statusProgress,centerLine(" ----- ")); statusProgress->clear(); - hideResults(); + hideResults(true); minMaxValid = false; minInteger = 0; @@ -1106,11 +1171,12 @@ void DailySearchTab::criteriaChanged() { startButtonMode=true; //initialize progress bar. + guiProgressBar->setMinimum(0); guiProgressBar->setMaximum(daysTotal); guiProgressBar->setTextVisible(true); - //guiProgressBar->setTextVisible(false); - guiProgressBar->setMaximumHeight(15); + guiProgressBar->setMinimumHeight(commandListItemHeight); + guiProgressBar->setMaximumHeight(commandListItemHeight); guiProgressBar->reset(); } @@ -1118,6 +1184,7 @@ void DailySearchTab::criteriaChanged() { // outputs cwa centered html string. // converts \n to
QString DailySearchTab::centerLine(QString line) { + return line; return QString( "
%1
").arg(line).replace("\n","
"); } @@ -1233,3 +1300,33 @@ EventDataType DailySearchTab::calculateAhi(Day* day) { return ahi; } +void DailySearchTab::on_activated(GPushButton* item ) { + int row=item->row(); + int col=item->column(); + // DEBUGFW Q(row) Q(item->column()) Q(item->date()) Q(item->text()); + if (row=DS_ROW_MAX) return; + row-=DS_ROW_DATA; + + item->setIcon (*m_icon_selected); + daily->LoadDate( item->date() ); + if ((col!=0) && nextTab>=0 && nextTab < dailyTabWidget->count()) { + dailyTabWidget->setCurrentIndex(nextTab); // 0 = details ; 1=events =2 notes ; 3=bookarks; + } +} + +GPushButton::GPushButton (int row,int column,QDate date,DailySearchTab* parent) : QPushButton(parent), _parent(parent), _row(row), _column(column), _date(date) +{ + connect(this, SIGNAL(clicked()), this, SLOT(on_clicked())); + connect(this, SIGNAL(activated(GPushButton*)), _parent, SLOT(on_activated(GPushButton*))); +}; + +GPushButton::~GPushButton() +{ + //these disconnects trigger a crash during exit or profile change. - anytime daily is destroyed. + //disconnect(this, SIGNAL(clicked()), this, SLOT(on_clicked())); + //disconnect(this, SIGNAL(activated(GPushButton*)), _parent, SLOT(on_activated(GPushButton*))); +}; +void GPushButton::on_clicked() { + emit activated(this); +}; diff --git a/oscar/dailySearchTab.h b/oscar/dailySearchTab.h index 429d59a7..9e039ff8 100644 --- a/oscar/dailySearchTab.h +++ b/oscar/dailySearchTab.h @@ -1,7 +1,6 @@ /* search GUI Headers * * Copyright (c) 2019-2022 The OSCAR Team - * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code @@ -12,26 +11,30 @@ #include #include +#include #include -#include #include +#include #include #include #include #include "SleepLib/common.h" +class GPushButton; class QWidget ; +class QDialog ; +class QComboBox ; +class QListWidget ; class QProgressBar ; class QHBoxLayout ; class QVBoxLayout ; -class QPushButton ; class QLabel ; -class QComboBox ; class QDoubleSpinBox ; class QSpinBox ; class QLineEdit ; class QTableWidget ; class QTableWidgetItem ; +class QSizeF ; class Day; //forward declaration. class Daily; //forward declaration. @@ -75,75 +78,86 @@ enum OpCode { QWidget* parent; QWidget* searchTabWidget; QTabWidget* dailyTabWidget; - QVBoxLayout* searchTabLayout; - QHBoxLayout* criteriaLayout; - QFrame * innerCriteriaFrame; - QHBoxLayout* innerCriteriaLayout; - QHBoxLayout* searchLayout; - QHBoxLayout* summaryLayout; + QTableWidget* controlTable; + + // Command command Widget + QWidget* commandWidget; + QHBoxLayout* commandLayout; QPushButton* helpButton; - //QLabel* helpInfo; QTextEdit* helpText; - QComboBox* selectOperationCombo; - QPushButton* selectOperationButton; - QComboBox* selectCommandCombo; - QPushButton* selectCommandButton; - QPushButton* selectMatch; - QLabel* selectUnits; + QProgressBar* guiProgressBar; + // control Widget + QPushButton* matchButton; + QPushButton* clearButton; + + QWidget* summaryWidget; + QHBoxLayout* summaryLayout; + + // Command Widget + QListWidget* commandList; + // command Widget + QPushButton* commandButton; + QComboBox* operationCombo; + QPushButton* operationButton; + QLabel* selectUnits; + QDoubleSpinBox* selectDouble; + QSpinBox* selectInteger; + QLineEdit* selectString; + + // Trigger Widget + QPushButton* startButton; QLabel* statusProgress; QLabel* summaryProgress; QLabel* summaryFound; QLabel* summaryMinMax; - QDoubleSpinBox* selectDouble; - QSpinBox* selectInteger; - QLineEdit* selectString; - QPushButton* startButton; - QPushButton* clearButton; - - QProgressBar* guiProgressBar; - QTableWidget* guiDisplayTable; - QTableWidgetItem* horizontalHeader0; - QTableWidgetItem* horizontalHeader1; - - QIcon* m_icon_selected; QIcon* m_icon_notSelected; QIcon* m_icon_configure; QMap opCodeMap; QString opCodeStr(OpCode); - OpCode selectOperationOpCode = OP_INVALID; + OpCode operationOpCode = OP_INVALID; bool helpMode=false; + QString helpString = helpStr(); void createUi(); - void delayedCreateUi(); + void populateControl(); + QSize setText(QPushButton*,QString); + QSize setText(QLabel*,QString); + QSize textsize(QFont font ,QString text); void search(QDate date); void find(QDate&); void criteriaChanged(); void endOfPass(); void displayStatistics(); + void setResult(int row,int column,QDate date,QString value); void addItem(QDate date, QString value, Qt::Alignment alignment); void setCommandPopupEnabled(bool ); void setOperationPopupEnabled(bool ); void setOperation( ); - void hideResults(); + void hideResults(bool); + void connectUi(bool); + QString helpStr(); QString centerLine(QString line); QString formatTime (qint32) ; QString convertRichText2Plain (QString rich); QRegExp searchPatterToRegex (QString wildcard); + QListWidgetItem* calculateMaxSize(QString str,int topic); + float commandListItemMaxWidth = 0; + float commandListItemHeight = 0; EventDataType calculateAhi(Day* day); bool compare(int,int ); @@ -151,6 +165,7 @@ enum OpCode { bool createUiFinished=false; bool startButtonMode=true; + bool commandPopupEnabled=false; SearchTopic searchTopic; int nextTab; int channelId; @@ -166,7 +181,7 @@ enum OpCode { int daysFound; int passFound; - void setSelectOperation(OpCode opCode,ValueMode mode) ; + void setoperation(OpCode opCode,ValueMode mode) ; ValueMode valueMode; qint32 selectValue=0; @@ -188,19 +203,44 @@ enum OpCode { public slots: private slots: - void on_dateItemClicked(QTableWidgetItem *item); void on_startButton_clicked(); void on_clearButton_clicked(); - void on_selectMatch_clicked(); - void on_selectCommandButton_clicked(); - void on_selectCommandCombo_activated(int); - void on_selectOperationButton_clicked(); - void on_selectOperationCombo_activated(int); + void on_matchButton_clicked(); void on_helpButton_clicked(); - void on_dailyTabWidgetCurrentChanged(int); + + void on_commandButton_clicked(); + void on_operationButton_clicked(); + + void on_commandList_activated(QListWidgetItem* item); + void on_operationCombo_activated(int index); + void on_intValueChanged(int); void on_doubleValueChanged(double); void on_textEdited(QString); + + void on_activated(GPushButton*); +}; + + +class GPushButton : public QPushButton +{ + Q_OBJECT +public: + GPushButton (int,int,QDate,DailySearchTab* parent); + virtual ~GPushButton(); + int row() { return _row;}; + int column() { return _column;}; + QDate date() { return _date;}; + void setDate(QDate date) {_date=date;}; +private: + const DailySearchTab* _parent; + const int _row; + const int _column; + QDate _date; +signals: + void activated(GPushButton*); +public slots: + void on_clicked(); }; #endif // SEARCHDAILY_H