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

Added Graphic Hint feature. revamped savedlayout code.

Browse Source
This commit is contained in:
LoudSnorer 2023-10-14 20:13:50 -04:00
parent 538bea8072
commit 6fb34ebf57
9 changed files with 355 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oscar/daily.cpp
View File

@ -2799,12 +2799,21 @@ void Daily::on_splitter_2_splitterMoved(int, int)
AppSetting->setDailyPanelWidth(size); AppSetting->setDailyPanelWidth(size);
} }
void Daily::on_graphHelp_clicked() {
if (!saveGraphLayoutSettings) {
saveGraphLayoutSettings= new SaveGraphLayoutSettings("daily",this);
}
if (saveGraphLayoutSettings) {
saveGraphLayoutSettings->hintHelp();
}
}
void Daily::on_layout_clicked() { void Daily::on_layout_clicked() {
if (!saveGraphLayoutSettings) { if (!saveGraphLayoutSettings) {
saveGraphLayoutSettings= new SaveGraphLayoutSettings("daily",this); saveGraphLayoutSettings= new SaveGraphLayoutSettings("daily",this);
} }
if (saveGraphLayoutSettings) { if (saveGraphLayoutSettings) {
saveGraphLayoutSettings->menu(GraphView); saveGraphLayoutSettings->triggerLayout(GraphView);
} }
} }

1
oscar/daily.h
View File

@ -277,6 +277,7 @@ private slots:
void on_splitter_2_splitterMoved(int pos, int index); void on_splitter_2_splitterMoved(int pos, int index);
void on_layout_clicked(); void on_layout_clicked();
void on_graphHelp_clicked();
protected: protected:
virtual void showEvent(QShowEvent *); virtual void showEvent(QShowEvent *);

14
oscar/daily.ui
View File

@ -1509,6 +1509,20 @@ QSlider::handle:horizontal {
</property> </property>
</layout> </layout>
</item> </item>
<item>
<widget class="QPushButton" name="graphHelp">
<property name="text">
<string>Hint</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/question_mark.png</normaloff>:/icons/question_mark.png</iconset>
</property>
<property name="toolTip">
<string>Graphing Help</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="layout"> <widget class="QPushButton" name="layout">
<property name="text"> <property name="text">

11
oscar/overview.cpp
View File

@ -937,12 +937,21 @@ void Overview::updateCube()
} }
} }
void Overview::on_graphHelp_clicked() {
if (!saveGraphLayoutSettings) {
saveGraphLayoutSettings= new SaveGraphLayoutSettings("overview",this);
}
if (saveGraphLayoutSettings) {
saveGraphLayoutSettings->hintHelp();
}
}
void Overview::on_layout_clicked() { void Overview::on_layout_clicked() {
if (!saveGraphLayoutSettings) { if (!saveGraphLayoutSettings) {
saveGraphLayoutSettings= new SaveGraphLayoutSettings("overview",this); saveGraphLayoutSettings= new SaveGraphLayoutSettings("overview",this);
} }
if (saveGraphLayoutSettings) { if (saveGraphLayoutSettings) {
saveGraphLayoutSettings->menu(GraphView); saveGraphLayoutSettings->triggerLayout(GraphView);
} }
} }

1
oscar/overview.h
View File

@ -144,6 +144,7 @@ class Overview : public QWidget
void setGraphText (); void setGraphText ();
void on_layout_clicked(); void on_layout_clicked();
void on_graphHelp_clicked();
private: private:
void CreateAllGraphs(); void CreateAllGraphs();

14
oscar/overview.ui
View File

@ -224,6 +224,20 @@ QToolButton:pressed {
<item> <item>
<layout class="QHBoxLayout" name="dateLayout"/> <layout class="QHBoxLayout" name="dateLayout"/>
</item> </item>
<item>
<widget class="QPushButton" name="graphHelp">
<property name="text">
<string>Hint</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/question_mark.png</normaloff>:/icons/question_mark.png</iconset>
</property>
<property name="toolTip">
<string>Graphing Help</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="layout"> <widget class="QPushButton" name="layout">
<property name="text"> <property name="text">

365
oscar/saveGraphLayoutSettings.cpp
View File

@ -11,19 +11,24 @@
#include <QMessageBox> #include <QMessageBox>
#include <QAbstractButton> #include <QAbstractButton>
#include <QWindow>
#include <QApplication>
#include <QScrollArea>
#include <QVBoxLayout>
#include <QTextEdit>
#include <QPixmap> #include <QPixmap>
#include <QSize> #include <QSize>
#include <QChar> #include <QChar>
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
#include "saveGraphLayoutSettings.h" #include "saveGraphLayoutSettings.h"
#define USE_FRAMELESS_WINDOW
#define USE_FRAMELESS_WINDOW_off
#define USE_PROFILE_SPECIFIC_FOLDERoff // off implies saved layouts worked for all profiles. #define USE_PROFILE_SPECIFIC_FOLDERoff // off implies saved layouts worked for all profiles.
SaveGraphLayoutSettings::SaveGraphLayoutSettings(QString title,QWidget* parent) : parent(parent),title(title) SaveGraphLayoutSettings::SaveGraphLayoutSettings(QString title,QWidget* parent) : parent(parent),title(title)
{ {
fontSizeIncrease = 1;
helpFontSizeIncrease = 1;
createSaveFolder(); createSaveFolder();
if (dir==nullptr) return; if (dir==nullptr) return;
dir->setFilter(QDir::Files | QDir::Readable | QDir::Writable | QDir::NoSymLinks); dir->setFilter(QDir::Files | QDir::Readable | QDir::Writable | QDir::NoSymLinks);
@ -33,16 +38,15 @@ SaveGraphLayoutSettings::SaveGraphLayoutSettings(QString title,QWidget* parent)
createMenu() ; createMenu() ;
menuDialog->connect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() )); menu.dialog->connect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() ));
menuDialog->connect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() )); menu.dialog->connect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() ));
menuDialog->connect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() )); menu.dialog->connect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() ));
menuDialog->connect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() )); menu.dialog->connect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() ));
menuDialog->connect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() )); menu.dialog->connect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() ));
menuDialog->connect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() )); menu.dialog->connect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() ));
menuDialog->connect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() )); menu.dialog->connect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() ));
menuDialog->connect(menuExitBtn, SIGNAL(clicked()), this, SLOT (exit() )); menu.dialog->connect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) ));
menuDialog->connect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) )); menu.dialog->connect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() ));
menuDialog->connect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() ));
@ -55,16 +59,15 @@ SaveGraphLayoutSettings::~SaveGraphLayoutSettings()
{ {
if (dir==nullptr) {return;} if (dir==nullptr) {return;}
menuDialog->disconnect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() )); menu.dialog->disconnect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() ));
menuDialog->disconnect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() )); menu.dialog->disconnect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() ));
menuDialog->disconnect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() )); menu.dialog->disconnect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() ));
menuDialog->disconnect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() )); menu.dialog->disconnect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() ));
menuDialog->disconnect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() )); menu.dialog->disconnect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() ));
menuDialog->disconnect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() )); menu.dialog->disconnect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() ));
menuDialog->disconnect(menuExitBtn, SIGNAL(clicked()), this, SLOT (exit() )); menu.dialog->disconnect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() ));
menuDialog->disconnect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() )); menu.dialog->disconnect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) ));
menuDialog->disconnect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) )); menu.dialog->disconnect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() ));
menuDialog->disconnect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() ));
helpDestructor(); helpDestructor();
@ -118,11 +121,13 @@ void SaveGraphLayoutSettings::createSaveFolder() {
QPushButton* SaveGraphLayoutSettings::menuBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) { QPushButton* SaveGraphLayoutSettings::menuBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) {
return newBtnRtn(menuLayoutButtons, name, icon, style, hPolicy,tooltip) ; return newBtnRtn(menuLayoutButtons, name, icon, style, hPolicy,tooltip) ;
} }
QPushButton* SaveGraphLayoutSettings::helpBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) {
return newBtnRtn(helpLayoutButtons, name, icon, style, hPolicy,tooltip) ; //QPushButton* SaveGraphLayoutSettings::helpBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) {
} //return newBtnRtn(menuLayoutButtons, name, icon, style, hPolicy,tooltip) ;
//}
QPushButton* SaveGraphLayoutSettings::newBtnRtn(QHBoxLayout* layout,QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) { QPushButton* SaveGraphLayoutSettings::newBtnRtn(QHBoxLayout* layout,QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) {
QPushButton* button = new QPushButton(name, menuDialog); QPushButton* button = new QPushButton(name, menu.dialog);
button->setIcon(*icon); button->setIcon(*icon);
button->setStyleSheet(style); button->setStyleSheet(style);
button->setSizePolicy(hPolicy,QSizePolicy::Fixed); button->setSizePolicy(hPolicy,QSizePolicy::Fixed);
@ -155,31 +160,19 @@ void SaveGraphLayoutSettings::createStyleSheets() {
"vertical-align:top;" "vertical-align:top;"
"}" "}"
; ;
styleDialog= styleDialog= QString ( R"( QDialog { border: 3px solid black; } )") ;
"QDialog { "
"border: 3px solid black;"
"}";
} }
void SaveGraphLayoutSettings::createMenu() { void SaveGraphLayoutSettings::createMenu() {
if(menu.dialog) return;
menuListFont =*defaultfont; initDialog(menu,tr("Manage Save Layout Settings") );
menuListFont.setPointSize(fontSizeIncrease+menuListFont.pointSize());
createStyleSheets(); createStyleSheets();
#ifdef USE_FRAMELESS_WINDOW QString styleDialog( R"( QDialog { border: 3px solid black; } )") ;
menuDialog= new QDialog(parent, Qt::FramelessWindowHint); menu.dialog->setStyleSheet(styleDialog);
menuDialog->setSizeGripEnabled(true); // allows lower right hand corner to resize dialog
#else
menuDialog= new QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint|Qt::WindowSystemMenuHint);
menuDialog->setWindowTitle(tr("Manage Save Layout Settings")) ;
#endif
menuDialog->setStyleSheet(styleDialog);
menuLayout = new QVBoxLayout(menuDialog);
menuLayoutButtons = new QHBoxLayout(); menuLayoutButtons = new QHBoxLayout();
menuAddFullBtn = menuBtn(tr("Add" ),m_icon_add , styleOff ,QSizePolicy::Minimum, tr("Add Feature inhibited. The maximum number of Items has been exceeded.") ); menuAddFullBtn = menuBtn(tr("Add" ),m_icon_add , styleOff ,QSizePolicy::Minimum, tr("Add Feature inhibited. The maximum number of Items has been exceeded.") );
@ -189,66 +182,147 @@ void SaveGraphLayoutSettings::createMenu() {
menuUpdateBtn = menuBtn(tr("Update" ),m_icon_update , styleOn ,QSizePolicy::Minimum, tr("Updates the selection with current settings.")); menuUpdateBtn = menuBtn(tr("Update" ),m_icon_update , styleOn ,QSizePolicy::Minimum, tr("Updates the selection with current settings."));
menuDeleteBtn = menuBtn(tr("Delete" ),m_icon_delete , styleOn ,QSizePolicy::Minimum, tr("Deletes the selection.")); menuDeleteBtn = menuBtn(tr("Delete" ),m_icon_delete , styleOn ,QSizePolicy::Minimum, tr("Deletes the selection."));
menuHelpBtn = menuBtn("" ,m_icon_help , styleOn ,QSizePolicy::Fixed , tr("Expanded Help menu.")); menuHelpBtn = menuBtn("" ,m_icon_help , styleOn ,QSizePolicy::Fixed , tr("Expanded Help menu."));
menuExitBtn = menuBtn("" ,m_icon_exit , styleExit,QSizePolicy::Fixed , tr("Exits the Layout menu."));
#ifndef USE_FRAMELESS_WINDOW menuList = new QListWidget(menu.dialog);
menuExitBtn->hide();
#endif
menuList = new QListWidget(menuDialog);
menuList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); menuList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
menuList->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn); menuList->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
menuList->setFont(menuListFont); menuList->setFont(menu.font);
menuLayout->addLayout(menuLayoutButtons); menu.layout->addLayout(menuLayoutButtons);
menuLayout->addWidget(menuList, 1); menu.layout->addWidget(menuList, 1);
//menuList->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred); //menuList->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
menuList->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); menuList->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
}; };
void HelpData::setDialog(QWidget* parent,QString windowsTitle) {
if (dialog) return;
open=false;
#ifdef USE_FRAMELESS_WINDOW
dialog= new QDialog(parent, Qt::FramelessWindowHint);
title.setText(QString("<h4>%1</h4>").arg(windowsTitle) );
headerLayout = new QHBoxLayout();
#else
dialog = new QDialog(nullptr, Qt::WindowTitleHint | Qt::WindowCloseButtonHint|Qt::WindowSystemMenuHint);
dialog->setWindowTitle(windowsTitle) ;
dialog->setWindowModality(Qt::WindowModal);
dialog->setStyleSheet(QString ( "QDialog { border: 3px solid black; }"));
#endif
Q_UNUSED(parent);
font = QApplication::font();
fontBold = font;
fontBold.setWeight(QFont::Bold);
layout = new QVBoxLayout(dialog);
}
void SaveGraphLayoutSettings::initDialog(
HelpData & aHelp
, QString title
) {
if(aHelp.dialog) return;
aHelp.setDialog(parent,title);
#ifdef USE_FRAMELESS_WINDOW
aHelp.headerLayout->addWidget(&aHelp.title);
aHelp.exitBtn = newBtnRtn(aHelp.headerLayout, "", m_icon_exit, styleExit , QSizePolicy::Fixed, tr("Exits the dialog menu.")) ;
aHelp.layout->addLayout(aHelp.headerLayout);
#endif
// YXXXXXXXXXXXXXXXXXXX
// dialog->setFont(font) ;
aHelp.dialog->setSizeGripEnabled(true); // allows lower right hand corner to resize dialog
aHelp.dialog->setStyleSheet(QString ( "QDialog { border: 3px solid black; }"));
}
void SaveGraphLayoutSettings::createHelp() { void SaveGraphLayoutSettings::createHelp() {
if(helpDialog) return; createHelp(help, tr("Help Menu - Manage Layout Settings"), helpInfo());
if (help.exitBtn) help.dialog->connect(help.exitBtn, SIGNAL(clicked()), this, SLOT (help_exit_feature() ));
};
helpDialog= new QDialog(parent, Qt::FramelessWindowHint); void SaveGraphLayoutSettings::createHelp(HelpData & ahelp , QString title , QString text) {
helpDialog->setStyleSheet(styleDialog); if(ahelp.dialog) return;
menuDialog->setSizeGripEnabled(true); // allows lower right hand corner to resize dialog initDialog(ahelp,title );
QFont helpInfoFont = menuListFont; ahelp.label = new QLabel(parent);
helpInfoFont.setPointSize(helpFontSizeIncrease+helpInfoFont.pointSize()); ahelp.label->setFont(ahelp.font);
ahelp.label->setText(text) ;
QFont helpInfoLabelFont = helpInfoFont; ahelp.layout->addWidget(ahelp.label, 1);
helpInfoLabelFont.setPointSize(fontSizeIncrease+ helpInfoFont.pointSize());
QLabel* helpInfoHeaderLabel = new QLabel("helpInfoHeaderLabel",parent);
helpInfoHeaderLabel->setText(QString( tr("<h4>Help Menu - Manage Layout Settings</h4>")));
helpInfoHeaderLabel->setFont(helpInfoLabelFont);
QLabel* helpInfoLabel = new QLabel("helpInfo",parent);
helpInfoLabel->setFont(helpInfoFont);
helpInfoLabel->setText(helpInfo()) ;
helpLayoutButtons = new QHBoxLayout();
helpLayoutButtons->addWidget(helpInfoHeaderLabel);
helpInfoExitBtn= helpBtn("" ,m_icon_return , styleOn ,QSizePolicy::Fixed , tr("Exits the help menu."));
helpExitBtn = helpBtn("" ,m_icon_exit , styleExit,QSizePolicy::Fixed , tr("Exits the dialog menu."));
QVBoxLayout* helpLayout = new QVBoxLayout(helpDialog);
helpLayout->addLayout(helpLayoutButtons);
helpLayout->addWidget(helpInfoLabel, 1);
helpDialog->connect(helpInfoExitBtn,SIGNAL(clicked()), this, SLOT (help_off_feature() ));
helpDialog->connect(helpExitBtn, SIGNAL(clicked()), this, SLOT (help_exit_feature() ));
} }
void SaveGraphLayoutSettings::helpDestructor() { void SaveGraphLayoutSettings::helpDestructor() {
if(!helpDialog) return; closeHelp();
helpDialog->disconnect(helpInfoExitBtn,SIGNAL(clicked()), this, SLOT (help_off_feature() )); closeHint();
helpDialog->disconnect(helpExitBtn, SIGNAL(clicked()), this, SLOT (help_exit_feature() )); closeMenu();
if (hint.exitBtn) hint.dialog->disconnect(hint.exitBtn, SIGNAL(clicked()), this, SLOT ( closeHint() ));
if (help.exitBtn) help.dialog->disconnect(help.exitBtn, SIGNAL(clicked()), this, SLOT ( closeHelp() ));
if (menu.exitBtn) menu.dialog->disconnect(menu.exitBtn, SIGNAL(clicked()), this, SLOT ( help_exit_feature() ));
}
#define TABLES QString(R"( <table width="100%"> )")
#define TABLEE QString(R"( </table> )")
#define CENTERS QString(R"( <div style="text-align: center;"><p> )")
#define CENTERE QString(R"( </p></div> )")
#define BREAK QString(R"( <br> )")
#define PARAS QString(R"( <p> )")
#define PARAE QString(R"( </p> )")
#define ROWS QString(R"( <tr> )")
#define ROWE QString(R"( </tr> )")
#define COLS QString(R"( <td> )")
#define COLE QString(R"( </td> )")
#define CSEP QString(R"( </th><td> )")
QString SaveGraphLayoutSettings::hintInfo() {
QStringList strList;
strList
<< CENTERS << "<b>"
<< tr("Basic Hints")
<< "</b>" << CENTERE
<< TABLES
<< ROWS << COLS << "<b>" << QString(tr("Key Sequence")) << "</b>" << CSEP << "<b>" << QString(tr("Description")) << "</b>" << COLE << ROWE
<< ROWS << COLS << QString(tr("MouseWheel")) << CSEP << QString(tr("Scrolls unpinned Graphs")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Ctrl + MouseWheel")) << CSEP << QString(tr("Zooms Time Selection")) << COLE << ROWE
<< ROWS << COLS << QString(tr("LeftMouse dragDrop")) << CSEP << QString(tr("Defines Time Selection")) << COLE << ROWE
<< ROWS << COLS << QString(tr("RightMouse dragDrop")) << CSEP << QString(tr("Moves Time Selection")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Ctrl + (right/left)MouseClick")) << CSEP << QString(tr("Zooms Time Selection")) << COLE << ROWE
<< ROWS << COLS << QString(tr(" (right/left)MouseClick")) << CSEP << QString(tr("Moves Time Selection")) << COLE << ROWE
<< BREAK
<< ROWS << COLS << QString(tr("(right/left) Arrow (Ctrl => faster)")) << CSEP << QString(tr("Moves Time Selection")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Up/Down Arrow")) << CSEP << QString(tr("Scrolls graphs")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Up/Down Arrow+Focus")) << CSEP << QString(tr("Zooms graphs")) << COLE << ROWE
<< TABLEE
<< CENTERS << "<b>"
<< tr("Graph Layout Hints")
<< "</b>" << CENTERE
<< TABLES
<< ROWS << COLS << QString(tr("Double Click Graph Title")) << CSEP << QString(tr("Toggles Pinning")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Daily:Double Click Y-axis label")) << CSEP << QString(tr("Toggle Time Selection Auto Zoom")) << COLE << ROWE
<< ROWS << COLS << QString(tr("DragDrop Graph Title")) << CSEP << QString(tr("Reorders Graph layout")) << COLE << ROWE
<< ROWS << COLS << QString(tr("DragDrop graph’s bottom line")) << CSEP << QString(tr("Changes Size of Graphs")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Layout Button (next to Graph Button)")) << CSEP << QString(tr("Save / Restore Graph Layouts")) << COLE << ROWE
<< TABLEE
<< CENTERS << "<b>"
<< tr("Daily Graph Hints")
<< "</b>" << CENTERE
<< TABLES
<< ROWS << COLS << QString(tr("Click on date")) << CSEP << QString(tr("Toggle Calendar on/off")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Detailed: Click on colored event")) << CSEP << QString(tr("Jump to event tab with event opened")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Detailed: Click on a session (at bottom)")) << CSEP << QString(tr("Toggle session disable / enable session")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Event: Click on an event")) << CSEP << QString(tr("Time Selection 3 min before event 20 sec after")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Bookmark")) << CSEP << QString(tr("Save current Time Selection")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Search Tab")) << CSEP << QString(tr("Search data base")) << COLE << ROWE
<< TABLEE
<< CENTERS << "<b>"
<< tr("Miscellaneous Hints")
<< "</b>" << CENTERE
<< TABLES
<< ROWS << COLS << QString(tr("OverView: Shift Click on a date")) << CSEP << QString(tr("Jumps to date in the Daily Tab")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Daily: Event (bottom left corner) ")) << CSEP << QString(tr("Select Events to view")) << COLE << ROWE
<< ROWS << COLS << QString(tr("Graph / Chart (bottom right corner)")) << CSEP << QString(tr("Selects graphs to view")) << COLE << ROWE
<< TABLEE
;
return strList.join("\n");
} }
QString SaveGraphLayoutSettings::helpInfo() { QString SaveGraphLayoutSettings::helpInfo() {
@ -273,14 +347,15 @@ QStringList strList;
<<QString(tr("The description may be changed.")) <<QString(tr("The description may be changed."))
<<QString("<br>") <<QString("<br>")
<<QString(tr("The Add button will be greyed out when maximum number is reached.")) <<QString(tr("The Add button will be greyed out when maximum number is reached."))
<<QString("</td></tr> <br> <tr><td><i><u>") <<QString("<br>")
<<QString("</td></tr> <tr><td><i><u>")
<<QString(tr("Other Buttons")) <<QString(tr("Other Buttons"))
<<QString("</u> </i></td> <td>") <<QString("</u> </i></td> <td>")
<<QString(tr("Greyed out when there are no selections")) <<QString(tr("Greyed out when there are no selections"))
<<QString("</td></tr> <tr><td>") <<QString("</td></tr> <tr><td>")
<<QString(tr("Restore")) <<QString(tr("Restore"))
<<QString("</td> <td>") <<QString("</td> <td>")
<<QString(tr("Loads the Layout Settings from the selection. Automatically exits.")) <<QString(tr("Loads the Layout Settings from the selection. Stays Open"))
<<QString("</td></tr> <tr><td>") <<QString("</td></tr> <tr><td>")
<<QString(tr("Rename")) <<QString(tr("Rename"))
<<QString("</td><td>") <<QString("</td><td>")
@ -378,7 +453,7 @@ bool SaveGraphLayoutSettings::confirmAction(QString top ,QString bottom,QIcon* i
QString topText=QString("<p style=""text-align:center"">%1</p>").arg(top); QString topText=QString("<p style=""text-align:center"">%1</p>").arg(top);
QString bottomText=QString("<p style=""text-align:center"">%1</p>").arg(bottom); QString bottomText=QString("<p style=""text-align:center"">%1</p>").arg(bottom);
QMessageBox msgBox(menuDialog); QMessageBox msgBox(menu.dialog);
msgBox.setText(topText); msgBox.setText(topText);
msgBox.setInformativeText(bottomText); msgBox.setInformativeText(bottomText);
if (icon!=nullptr) { if (icon!=nullptr) {
@ -389,7 +464,7 @@ bool SaveGraphLayoutSettings::confirmAction(QString top ,QString bottom,QIcon* i
msgBox.setDefaultButton(adefault); msgBox.setDefaultButton(adefault);
msgBox.setWindowFlag(Qt::FramelessWindowHint,true); msgBox.setWindowFlag(Qt::FramelessWindowHint,true);
msgBox.setStyleSheet(calculateStyleMessageBox(&menuListFont,top,bottom)); msgBox.setStyleSheet(calculateStyleMessageBox(&menu.font,top,bottom));
// displaywidgets((QWidget*)&msgBox); // displaywidgets((QWidget*)&msgBox);
bool ret= msgBox.exec()==success; bool ret= msgBox.exec()==success;
@ -401,7 +476,7 @@ bool SaveGraphLayoutSettings::confirmAction(QString name ,QString question,QIcon
Q_UNUSED(flags); Q_UNUSED(flags);
Q_UNUSED(adefault); Q_UNUSED(adefault);
Q_UNUSED(success); Q_UNUSED(success);
QMessageBox msgBox(menuDialog); QMessageBox msgBox(menu.dialog);
msgBox.setText(question); msgBox.setText(question);
if (icon!=nullptr) { if (icon!=nullptr) {
msgBox.setIconPixmap(icon->pixmap(QSize(50,50))); msgBox.setIconPixmap(icon->pixmap(QSize(50,50)));
@ -503,7 +578,7 @@ void SaveGraphLayoutSettings::restore_feature() {
if (!verifyItem(item, tr("No Item Selected") , m_icon_restore)) return ; if (!verifyItem(item, tr("No Item Selected") , m_icon_restore)) return ;
QString fileName = item->data(fileNameRole).toString(); QString fileName = item->data(fileNameRole).toString();
loadSettings(fileName); loadSettings(fileName);
exit(); closeMenu();
}; };
void SaveGraphLayoutSettings::rename_feature() { void SaveGraphLayoutSettings::rename_feature() {
@ -516,20 +591,22 @@ void SaveGraphLayoutSettings::rename_feature() {
} }
void SaveGraphLayoutSettings::help_exit_feature() { void SaveGraphLayoutSettings::help_exit_feature() {
helpDialog->close(); closeMenu();
exit(); closeHelp();
}
void SaveGraphLayoutSettings::help_off_feature() {
helpDialog->close();
} }
void SaveGraphLayoutSettings::help_feature() { void SaveGraphLayoutSettings::help_feature() {
initminMenuListSize(); initminMenuListSize();
createHelp(); createHelp();
if(!helpDialog) return; if(!help.dialog) return;
helpDialog->raise(); if (help.open) {
helpDialog->exec(); closeHelp();
return;
}
help.dialog->raise();
help.open=true;
help.dialog->exec();
help.open=false;
manageButtonApperance(); manageButtonApperance();
} }
@ -591,7 +668,7 @@ void SaveGraphLayoutSettings::itemSelectionChanged()
void SaveGraphLayoutSettings::initminMenuListSize() { void SaveGraphLayoutSettings::initminMenuListSize() {
if (minMenuDialogSize.width()==0) { if (minMenuDialogSize.width()==0) {
menuDialogSize = menuDialog->size(); menuDialogSize = menu.dialog->size();
minMenuDialogSize = menuDialogSize; minMenuDialogSize = menuDialogSize;
menuListSize = menuList->size(); menuListSize = menuList->size();
@ -644,7 +721,7 @@ void SaveGraphLayoutSettings::resizeMenu() {
QSize newSize = calculateMenuDialogSize(); QSize newSize = calculateMenuDialogSize();
newSize.setWidth ( newSize.width()); newSize.setWidth ( newSize.width());
menuDialogSize = menuDialog->size(); menuDialogSize = menu.dialog->size();
if ( sizeEqual(newSize , menuDialogSize)) { if ( sizeEqual(newSize , menuDialogSize)) {
// no work to do // no work to do
@ -652,18 +729,18 @@ void SaveGraphLayoutSettings::resizeMenu() {
}; };
if ( menuDialogSize.width() < newSize.width() ) { if ( menuDialogSize.width() < newSize.width() ) {
menuDialog->setMinimumWidth(newSize.width()); menu.dialog->setMinimumWidth(newSize.width());
menuDialog->setMaximumWidth(QWIDGETSIZE_MAX); menu.dialog->setMaximumWidth(QWIDGETSIZE_MAX);
} else if ( menuDialogSize.width() > newSize.width() ) { } else if ( menuDialogSize.width() > newSize.width() ) {
menuDialog->setMaximumWidth(newSize.width()); menu.dialog->setMaximumWidth(newSize.width());
menuDialog->setMinimumWidth(newSize.width()); menu.dialog->setMinimumWidth(newSize.width());
} }
if ( menuDialogSize.height() < newSize.height() ) { if ( menuDialogSize.height() < newSize.height() ) {
menuDialog->setMinimumHeight(newSize.height()); menu.dialog->setMinimumHeight(newSize.height());
menuDialog->setMaximumHeight(QWIDGETSIZE_MAX); menu.dialog->setMaximumHeight(QWIDGETSIZE_MAX);
} else if ( menuDialogSize.height() > newSize.height() ) { } else if ( menuDialogSize.height() > newSize.height() ) {
menuDialog->setMaximumHeight(newSize.height()); menu.dialog->setMaximumHeight(newSize.height());
menuDialog->setMinimumHeight(newSize.height()); menu.dialog->setMinimumHeight(newSize.height());
} }
menuDialogSize = newSize; menuDialogSize = newSize;
} }
@ -672,7 +749,7 @@ QSize SaveGraphLayoutSettings::calculateMenuDialogSize() {
if (menuDialogSize.width()==0) return QSize(0,0); if (menuDialogSize.width()==0) return QSize(0,0);
QListWidgetItem* item; QListWidgetItem* item;
widestItem=nullptr; widestItem=nullptr;
QFontMetrics fm = QFontMetrics(menuListFont); QFontMetrics fm = QFontMetrics(menu.font);
// account for scrollbars. // account for scrollbars.
QSize returnValue = QSize( 0 , fm.height() ); // add an extra space at the bottom. width didn't work QSize returnValue = QSize( 0 , fm.height() ); // add an extra space at the bottom. width didn't work
@ -751,24 +828,73 @@ QListWidgetItem* SaveGraphLayoutSettings::updateFileList(QString find) {
} }
void SaveGraphLayoutSettings::exit() { void SaveGraphLayoutSettings::closeHelp() {
menuDialog->close(); if (help.open) {
help.dialog->close();
}
} }
void SaveGraphLayoutSettings::menu(gGraphView* graphView) { void SaveGraphLayoutSettings::closeHint() {
if (hint.open) {
hint.dialog->close();
}
}
void SaveGraphLayoutSettings::closeMenu() {
closeHelp();
closeHint();
if (menu.open) {
menu.dialog->close();
}
}
void SaveGraphLayoutSettings::triggerLayout(gGraphView* graphView) {
if (dir==nullptr) { if (dir==nullptr) {
//const char* err=qPrintable(QString("Cannot find directory %1").arg(dirName)); //const char* err=qPrintable(QString("Cannot find directory %1").arg(dirName));
//qWarning(err); //qWarning(err);
return; return;
} }
if (menu.open) {
closeMenu();
return;
}
this->graphView=graphView; this->graphView=graphView;
updateFileList(); updateFileList();
manageButtonApperance(); manageButtonApperance();
menuDialog->raise(); menu.dialog->raise();
menuDialog->exec(); menu.open=true;
exit(); menu.dialog->exec();
menu.open=false;
closeMenu();
} }
QSize textsize(QFont font ,QString text) {
return QFontMetrics(font).size(0 , text);
}
void SaveGraphLayoutSettings::createHint() {
createHelp(hint, tr("Graph Short-Cuts Help"), hintInfo());
if (hint.exitBtn) {
hint.dialog->connect(hint.exitBtn, SIGNAL(clicked()), this, SLOT (closeHint()));
}
};
void SaveGraphLayoutSettings::hintHelp() {
if (hint.open) {
hint.dialog->close();
return;
}
createHint();
if (!hint.dialog) return;
hint.dialog->raise();
hint.dialog->show();
hint.open=true;
hint.dialog->exec();
hint.open=false;
}
//==================================================================================================== //====================================================================================================
//==================================================================================================== //====================================================================================================
// Descriptions map class with file storage // Descriptions map class with file storage
@ -847,4 +973,3 @@ void DescriptionMap::load() {
عذرا ، لا يمكن تحديد موقع ملف. عذرا ، لا يمكن تحديد موقع ملف.
#endif #endif

54
oscar/saveGraphLayoutSettings.h
View File

@ -39,14 +39,41 @@ private:
const QChar delimiter = QChar(':'); const QChar delimiter = QChar(':');
}; };
class HelpData {
public:
void setDialog(QString windowsTitle);
void setDialog(QWidget*,QString windowsTitle );
void finishInit();
QLabel title ;
QLabel message ;
QDialog*dialog = nullptr;
bool open = false;
QVBoxLayout* layout =nullptr;
QFont font ;
QFont fontBold ;
QLabel* label ;
// For frameless
QPushButton* exitBtn=nullptr;
QHBoxLayout* headerLayout=nullptr;
};
class SaveGraphLayoutSettings : public QWidget class SaveGraphLayoutSettings : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
SaveGraphLayoutSettings(QString title, QWidget* parent) ; SaveGraphLayoutSettings(QString title, QWidget* parent) ;
~SaveGraphLayoutSettings(); ~SaveGraphLayoutSettings();
void menu(gGraphView* graphView); void triggerLayout(gGraphView* graphView);
void hintHelp();
protected: protected:
HelpData hint;
HelpData help;
HelpData menu;
QIcon* m_icon_return = new QIcon(":/icons/return.png"); QIcon* m_icon_return = new QIcon(":/icons/return.png");
QIcon* m_icon_help = new QIcon(":/icons/question_mark.png"); QIcon* m_icon_help = new QIcon(":/icons/question_mark.png");
QIcon* m_icon_exit = new QIcon(":/icons/exit.png"); QIcon* m_icon_exit = new QIcon(":/icons/exit.png");
@ -63,7 +90,6 @@ private:
const static int maxDescriptionLen = 80; const static int maxDescriptionLen = 80;
const QString fileBaseName = QString("layout"); const QString fileBaseName = QString("layout");
const int fileNameRole = Qt::UserRole; const int fileNameRole = Qt::UserRole;
int fontSizeIncrease = 0;
int horizontalWidthAdjustment=60; // this seem to make menu size changes work. Testing says it is 60 but what causes it is unknown. int horizontalWidthAdjustment=60; // this seem to make menu size changes work. Testing says it is 60 but what causes it is unknown.
QSize minMenuListSize = QSize(0,0); QSize minMenuListSize = QSize(0,0);
@ -85,9 +111,9 @@ private:
QWidget* parent; QWidget* parent;
const QString title; const QString title;
gGraphView* graphView = nullptr; gGraphView* graphView = nullptr;
QFont menuListFont;
QDialog* menuDialog; void createHint();
QString hintInfo();
QListWidget* menuList; QListWidget* menuList;
QPushButton* menuAddFullBtn; // Must be first item for workaround. QPushButton* menuAddFullBtn; // Must be first item for workaround.
@ -96,23 +122,15 @@ private:
QPushButton* menuRestoreBtn; QPushButton* menuRestoreBtn;
QPushButton* menuUpdateBtn; QPushButton* menuUpdateBtn;
QPushButton* menuRenameBtn; QPushButton* menuRenameBtn;
QPushButton* menuExitBtn;
QPushButton* menuHelpBtn; QPushButton* menuHelpBtn;
QVBoxLayout* menuLayout;
QHBoxLayout* menuLayoutButtons; QHBoxLayout* menuLayoutButtons;
void createHelp(); void createHelp();
void createHelp(HelpData & help , QString title , QString text);
void initDialog(HelpData & help , QString title );
void helpDestructor(); void helpDestructor();
QString helpInfo(); QString helpInfo();
QDialog* helpDialog=nullptr;
QPushButton* helpInfoExitBtn=nullptr;
QPushButton* helpExitBtn=nullptr;
int helpFontSizeIncrease = 0;
QHBoxLayout* helpLayoutButtons = nullptr;
QDir* dir = nullptr; QDir* dir = nullptr;
QString dirName; QString dirName;
@ -145,7 +163,6 @@ private:
void createSaveFolder(); void createSaveFolder();
QPushButton* newBtnRtn(QHBoxLayout*, QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip); QPushButton* newBtnRtn(QHBoxLayout*, QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip);
QPushButton* menuBtn( QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip); QPushButton* menuBtn( QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip);
QPushButton* helpBtn( QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip);
void manageButtonApperance(); void manageButtonApperance();
void resizeMenu(); void resizeMenu();
@ -154,6 +171,8 @@ private:
void writeSettings(QString filename); void writeSettings(QString filename);
void loadSettings(QString filename); void loadSettings(QString filename);
void deleteSettings(QString filename); void deleteSettings(QString filename);
void closeMenu();
void closeHelp();
public slots: public slots:
private slots: private slots:
@ -163,13 +182,12 @@ private slots:
void rename_feature(); void rename_feature();
void update_feature(); void update_feature();
void help_feature(); void help_feature();
void help_off_feature();
void help_exit_feature(); void help_exit_feature();
void delete_feature(); void delete_feature();
void exit();
void itemChanged(QListWidgetItem *item); void itemChanged(QListWidgetItem *item);
void itemSelectionChanged(); void itemSelectionChanged();
void closeHint();
}; };

26
oscar/test_macros.h
View File

@ -38,13 +38,18 @@ To turn off the the test macros.
#include <QRegularExpression> #include <QRegularExpression>
#include <QFileInfo> #include <QFileInfo>
#define DEBUGI qInfo().noquote() << "INFO;"
#define DEBUGD qInfo().noquote() << "DEBUG;"
#define DEBUGQ qDebug().noquote() #define DEBUGQ qDebug().noquote()
#define DEBUGW qWarning().noquote() #define DEBUGW qWarning().noquote()
#define DEBUGL DEBUGQ <<QString("%1[%2]").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__) #define DEBUGC qCritical().noquote()
#define DEBUGF DEBUGQ <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__) #define DEBUGF DEBUGI <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
#define DEBUGFW DEBUGW <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__) #define DEBUGFW DEBUGW <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
//#define DEBUGFW qCritical().noquote()<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__) #define DEBUGFC DEBUGC <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
#define DEBUGFC qCritical().noquote()<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__) #define DEBUGFD DEBUGD <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
#define DEBUGFI DEBUGI <<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
#define DEBUGT DEBUGQ <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__) #define DEBUGT DEBUGQ <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
#define DEBUGTF DEBUGQ <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__) #define DEBUGTF DEBUGQ <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
#define DEBUGTFW DEBUGW <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__) #define DEBUGTFW DEBUGW <<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
@ -69,6 +74,7 @@ To turn off the the test macros.
//display the date and Time of an epoch time stamp "qint64" //display the date and Time of an epoch time stamp "qint64"
#define DATETIME( EPOCH ) << QDateTime::fromMSecsSinceEpoch( EPOCH ).toString("dd MMM yyyy hh:mm:ss.zzz") #define DATETIME( EPOCH ) << QDateTime::fromMSecsSinceEpoch( EPOCH ).toString("dd MMM yyyy hh:mm:ss.zzz")
#define IF( EXPRESSION ) if (EXPRESSION ) #define IF( EXPRESSION ) if (EXPRESSION )
#define IFD( EXPA , EXPB ) bool EXPA = EXPB
#ifdef __clang__ #ifdef __clang__
@ -82,9 +88,6 @@ To turn off the the test macros.
#if 0 #if 0
//example: DEBUGL;
//12361: Debug: "gGraphView[572]"
//example: DEBUGF; //example: DEBUGF;
//12361: Debug: "gGraphView[572]popoutGraph" //12361: Debug: "gGraphView[572]popoutGraph"
@ -107,15 +110,19 @@ To turn off the the test macros.
#else #else
// Turn debugging off. macros expands to white space // Turn debugging off. macros expands to white space
#define DEBUGI
#define DEBUGD
#define DEBUGQ #define DEBUGQ
#define DEBUGW #define DEBUGW
#define DEBUGL #define DEBUGC
#define DEBUGF #define DEBUGF
#define DEBUGFW #define DEBUGFW
#define DEBUGFC
#define DEBUGFD
#define DEBUGFI
#define DEBUGT #define DEBUGT
#define DEBUGTF #define DEBUGTF
#define DEBUGTFW #define DEBUGTFW
#define DEBUGFC
#define Z( XX ) #define Z( XX )
#define ZZ( XX , YY) #define ZZ( XX , YY)
@ -128,6 +135,7 @@ To turn off the the test macros.
#define DATETIME( XX ) #define DATETIME( XX )
#define COMPILER #define COMPILER
#define IF( XX ) #define IF( XX )
#define IFD( XX , YY )
#endif // TEST_MACROS_ENABLED #endif // TEST_MACROS_ENABLED
#ifdef TEST_ROUTIMES_ENABLED #ifdef TEST_ROUTIMES_ENABLED