Compare commits
3 Commits
305c1d1f55
...
b7f1a0abc9
| Author | SHA1 | Date | |
|---|---|---|---|
| b7f1a0abc9 | |||
| 33c976d3c9 | |||
| a17001cdf9 |
+8
-1
@@ -61,8 +61,15 @@ bool Database::init(const QLatin1String &connectionName)
|
|||||||
query.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)");
|
query.exec("CREATE INDEX IF NOT EXISTS maxRa_idx ON fits_files(maxRa)");
|
||||||
query.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)");
|
query.exec("CREATE INDEX IF NOT EXISTS minDec_idx ON fits_files(minDec)");
|
||||||
query.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)");
|
query.exec("CREATE INDEX IF NOT EXISTS maxDec_idx ON fits_files(maxDec)");
|
||||||
|
version = 1;
|
||||||
}
|
}
|
||||||
else if(version > 1)
|
if(version == 1)
|
||||||
|
{
|
||||||
|
query.exec("CREATE INDEX IF NOT EXISTS id_file_key ON fits_headers(id_file, key)");
|
||||||
|
query.exec("PRAGMA user_version = 2");
|
||||||
|
version = 2;
|
||||||
|
}
|
||||||
|
if(version > 2)
|
||||||
{
|
{
|
||||||
qDebug() << "Database version is too new";
|
qDebug() << "Database version is too new";
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -346,12 +346,13 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
|
|||||||
};
|
};
|
||||||
|
|
||||||
QStringList fitsKeywords = m_database->getFitsKeywords();
|
QStringList fitsKeywords = m_database->getFitsKeywords();
|
||||||
|
QStringList filterKey = settings.value("databaseview/filterKey", QStringList{"file", "file", "file"}).toStringList();
|
||||||
for(int i=0; i<3; i++)
|
for(int i=0; i<3; i++)
|
||||||
{
|
{
|
||||||
m_filterKeyword[i] = new QComboBox(this);
|
m_filterKeyword[i] = new QComboBox(this);
|
||||||
m_filterKeyword[i]->setMaximumWidth(300);
|
m_filterKeyword[i]->setMaximumWidth(300);
|
||||||
addFilterItems(m_filterKeyword[i], fitsKeywords);
|
addFilterItems(m_filterKeyword[i], fitsKeywords);
|
||||||
|
m_filterKeyword[i]->setCurrentText(filterKey[i]);
|
||||||
|
|
||||||
m_search[i] = new QLineEdit(this);
|
m_search[i] = new QLineEdit(this);
|
||||||
m_search[i]->setPlaceholderText(tr("Text to search, you can % as wildcard"));
|
m_search[i]->setPlaceholderText(tr("Text to search, you can % as wildcard"));
|
||||||
@@ -385,8 +386,13 @@ DataBaseView::DataBaseView(Database *database, QWidget *parent) : QWidget(parent
|
|||||||
|
|
||||||
DataBaseView::~DataBaseView()
|
DataBaseView::~DataBaseView()
|
||||||
{
|
{
|
||||||
|
QStringList filterKey;
|
||||||
|
for(int i = 0; i < 3; i++)
|
||||||
|
filterKey.append(m_filterKeyword[i]->currentText());
|
||||||
|
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
settings.setValue("databaseview/header", m_tableView->horizontalHeader()->saveState());
|
settings.setValue("databaseview/header", m_tableView->horizontalHeader()->saveState());
|
||||||
|
settings.setValue("databaseview/filterKey", filterKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DataBaseView::selectColumns()
|
void DataBaseView::selectColumns()
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ FITSRecord::FITSRecord(const LibXISF::FITSKeyword &record)
|
|||||||
string.chop(1);
|
string.chop(1);
|
||||||
string.remove(0, 1);
|
string.remove(0, 1);
|
||||||
}
|
}
|
||||||
|
string = string.trimmed();
|
||||||
bool isint;
|
bool isint;
|
||||||
bool isdouble;
|
bool isdouble;
|
||||||
double vald = string.toDouble(&isdouble);
|
double vald = string.toDouble(&isdouble);
|
||||||
|
|||||||
Reference in New Issue
Block a user