Skip to content

GitLab

Commit 1d6565d7 authored by Jasem Mutlaq's avatar Jasem Mutlaq
Browse files
Options

Add manufacturer selection support to camera and focuser dropdowns to make it more accessible

parent f65347af
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 84 deletions
kstars/ekos/profileeditor.cpp
View file @ 1d6565d7
......@@ -39,6 +39,9 @@ ProfileEditor::ProfileEditor(QWidget *w) : QDialog(w)
pi = nullptr;
m_MountModel = new QStandardItemModel(this);
m_CameraModel = new QStandardItemModel(this);
m_GuiderModel = new QStandardItemModel(this);
m_FocuserModel = new QStandardItemModel(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(ui);
......@@ -564,6 +567,9 @@ void ProfileEditor::loadDrivers()
{
// We need to save this now since we have two models for the mounts
QString selectedMount = ui->mountCombo->currentText();
QString selectedCamera = ui->ccdCombo->currentText();
QString selectedGuider = ui->guiderCombo->currentText();
QString selectedFocuser = ui->focuserCombo->currentText();
QVector<QComboBox *> boxes;
boxes.append(ui->mountCombo);
......@@ -591,83 +597,29 @@ void ProfileEditor::loadDrivers()
QIcon remoteIcon = QIcon::fromTheme("network-modem");
// Create the mount model
// Create the model
delete (m_MountModel);
m_MountModel = new QStandardItemModel(this);
delete (m_CameraModel);
m_CameraModel = new QStandardItemModel(this);
delete (m_GuiderModel);
m_GuiderModel = new QStandardItemModel(this);
delete (m_FocuserModel);
m_FocuserModel = new QStandardItemModel(this);
if (ui->localMode->isChecked())
{
QStandardItem *selectedMountItem = nullptr;
m_MountModel->appendRow(new QStandardItem("--"));
for (DriverInfo *dv : DriverManager::Instance()->getDrivers())
{
if (dv->getType() != KSTARS_TELESCOPE)
continue;
QString manufacturer = dv->manufacturer();
QList<QStandardItem*> manufacturers = m_MountModel->findItems(manufacturer);
QStandardItem *parentItem = nullptr;
if (m_MountModel->findItems(manufacturer).empty())
{
parentItem = new QStandardItem(manufacturer);
parentItem->setSelectable(false);
m_MountModel->appendRow(parentItem);
}
else
{
parentItem = manufacturers.first();
}
QStandardItem *mount = new QStandardItem(dv->getLabel());
mount->setData(getTooltip(dv), Qt::ToolTipRole);
parentItem->appendRow(mount);
if (selectedMount == dv->getLabel())
selectedMountItem = mount;
}
QTreeView *view = new QTreeView(this);
view->setModel(m_MountModel);
view->sortByColumn(0, Qt::AscendingOrder);
ui->mountCombo->setView(view);
ui->mountCombo->setModel(m_MountModel);
if (selectedMountItem)
{
// JM: Only way to make it the QTreeView sets the current index
// in the combo way
QModelIndex index = m_MountModel->indexFromItem(selectedMountItem);
// First set current index to the child
ui->mountCombo->setRootModelIndex(index.parent());
ui->mountCombo->setModelColumn(index.column());
ui->mountCombo->setCurrentIndex(index.row());
// Now reset
ui->mountCombo->setRootModelIndex(QModelIndex());
view->setCurrentIndex(index);
}
populateManufacturerCombo(m_MountModel, ui->mountCombo, selectedMount, true, KSTARS_TELESCOPE);
populateManufacturerCombo(m_CameraModel, ui->ccdCombo, selectedCamera, true, KSTARS_CCD);
populateManufacturerCombo(m_GuiderModel, ui->guiderCombo, selectedGuider, true, KSTARS_CCD);
populateManufacturerCombo(m_FocuserModel, ui->focuserCombo, selectedFocuser, true, KSTARS_FOCUSER);
}
else
{
ui->mountCombo->setView(new QListView(this));
m_MountModel->appendRow(new QStandardItem("--"));
QIcon icon;
for (DriverInfo *dv : DriverManager::Instance()->getDrivers())
{
if (dv->getType() != KSTARS_TELESCOPE)
continue;
bool locallyAvailable = false;
if (dv->getAuxInfo().contains("LOCALLY_AVAILABLE"))
locallyAvailable = dv->getAuxInfo().value("LOCALLY_AVAILABLE", false).toBool();
icon = locallyAvailable ? QIcon() : remoteIcon;
QStandardItem *mount = new QStandardItem(icon, dv->getLabel());
mount->setData(getTooltip(dv), Qt::ToolTipRole);
m_MountModel->appendRow(mount);
}
ui->mountCombo->setModel(m_MountModel);
ui->mountCombo->setCurrentText(selectedMount);
populateManufacturerCombo(m_MountModel, ui->mountCombo, selectedMount, false, KSTARS_TELESCOPE);
populateManufacturerCombo(m_CameraModel, ui->ccdCombo, selectedCamera, false, KSTARS_CCD);
populateManufacturerCombo(m_GuiderModel, ui->guiderCombo, selectedGuider, false, KSTARS_CCD);
populateManufacturerCombo(m_FocuserModel, ui->focuserCombo, selectedFocuser, false, KSTARS_FOCUSER);
}
for (DriverInfo *dv : DriverManager::Instance()->getDrivers())
......@@ -688,20 +640,13 @@ void ProfileEditor::loadDrivers()
switch (dv->getType())
{
// case KSTARS_TELESCOPE:
// {
// ui->mountCombo->addItem(icon, dv->getLabel());
// ui->mountCombo->setItemData(ui->mountCombo->count() - 1, toolTipText, Qt::ToolTipRole);
// }
// break;
case KSTARS_CCD:
{
ui->ccdCombo->addItem(icon, dv->getLabel());
ui->ccdCombo->setItemData(ui->ccdCombo->count() - 1, toolTipText, Qt::ToolTipRole);
// ui->ccdCombo->addItem(icon, dv->getLabel());
// ui->ccdCombo->setItemData(ui->ccdCombo->count() - 1, toolTipText, Qt::ToolTipRole);
ui->guiderCombo->addItem(icon, dv->getLabel());
ui->guiderCombo->setItemData(ui->guiderCombo->count() - 1, toolTipText, Qt::ToolTipRole);
// ui->guiderCombo->addItem(icon, dv->getLabel());
// ui->guiderCombo->setItemData(ui->guiderCombo->count() - 1, toolTipText, Qt::ToolTipRole);
ui->aux1Combo->addItem(icon, dv->getLabel());
ui->aux1Combo->setItemData(ui->aux1Combo->count() - 1, toolTipText, Qt::ToolTipRole);
......@@ -726,8 +671,8 @@ void ProfileEditor::loadDrivers()
case KSTARS_FOCUSER:
{
ui->focuserCombo->addItem(icon, dv->getLabel());
ui->focuserCombo->setItemData(ui->focuserCombo->count() - 1, toolTipText, Qt::ToolTipRole);
// ui->focuserCombo->addItem(icon, dv->getLabel());
// ui->focuserCombo->setItemData(ui->focuserCombo->count() - 1, toolTipText, Qt::ToolTipRole);
ui->aux1Combo->addItem(icon, dv->getLabel());
ui->aux1Combo->setItemData(ui->aux1Combo->count() - 1, toolTipText, Qt::ToolTipRole);
......@@ -811,8 +756,8 @@ void ProfileEditor::loadDrivers()
}
}
// Skip mount since we handled it above
for (int i = 1; i < boxes.count(); i++)
// Skip mount/ccd/guider/focuser since we handled it above
for (int i = 4; i < boxes.count(); i++)
{
QComboBox *box = boxes.at(i);
QString selectedItemText = selectedItems.at(i);
......@@ -1131,3 +1076,83 @@ void ProfileEditor::showINDIHub()
m_INDIHub = indihub.modeButtonGroup->checkedId();
}
void ProfileEditor::populateManufacturerCombo(QStandardItemModel *model, QComboBox *combo, const QString &selectedDriver,
bool isLocal, int family)
{
if (isLocal)
{
QStandardItem *selectedItem = nullptr;
model->appendRow(new QStandardItem("--"));
for (DriverInfo *dv : DriverManager::Instance()->getDrivers())
{
if (dv->getType() != family)
continue;
QString manufacturer = dv->manufacturer();
QList<QStandardItem*> manufacturers = model->findItems(manufacturer);
QStandardItem *parentItem = nullptr;
if (model->findItems(manufacturer).empty())
{
parentItem = new QStandardItem(manufacturer);
parentItem->setSelectable(false);
model->appendRow(parentItem);
}
else
{
parentItem = manufacturers.first();
}
QStandardItem *item = new QStandardItem(dv->getLabel());
item->setData(getTooltip(dv), Qt::ToolTipRole);
parentItem->appendRow(item);
if (selectedDriver == dv->getLabel())
selectedItem = item;
}
QTreeView *view = new QTreeView(this);
view->setModel(model);
view->sortByColumn(0, Qt::AscendingOrder);
combo->setView(view);
combo->setModel(model);
if (selectedItem)
{
// JM: Only way to make it the QTreeView sets the current index
// in the combo way
QModelIndex index = model->indexFromItem(selectedItem);
// First set current index to the child
combo->setRootModelIndex(index.parent());
combo->setModelColumn(index.column());
combo->setCurrentIndex(index.row());
// Now reset
combo->setRootModelIndex(QModelIndex());
view->setCurrentIndex(index);
}
}
else
{
QIcon remoteIcon = QIcon::fromTheme("network-modem");
combo->setView(new QListView(this));
model->appendRow(new QStandardItem("--"));
QIcon icon;
for (DriverInfo *dv : DriverManager::Instance()->getDrivers())
{
if (dv->getType() != family)
continue;
bool locallyAvailable = false;
if (dv->getAuxInfo().contains("LOCALLY_AVAILABLE"))
locallyAvailable = dv->getAuxInfo().value("LOCALLY_AVAILABLE", false).toBool();
icon = locallyAvailable ? QIcon() : remoteIcon;
QStandardItem *mount = new QStandardItem(icon, dv->getLabel());
mount->setData(getTooltip(dv), Qt::ToolTipRole);
model->appendRow(mount);
}
combo->setModel(model);
combo->setCurrentText(selectedDriver);
}
}
kstars/ekos/profileeditor.h
View file @ 1d6565d7
......@@ -67,6 +67,8 @@ class ProfileEditor : public QDialog
void showINDIHub();
private:
void populateManufacturerCombo(QStandardItemModel *model, QComboBox *combo, const QString &selectedDriver, bool isLocal,
int family);
QString getTooltip(DriverInfo *dv);
void scanIP(const QString &ip);
void clearAllRequests();
......@@ -75,6 +77,9 @@ class ProfileEditor : public QDialog
ProfileInfo *pi { nullptr };
QList<OAL::Scope *> m_scopeList;
QStandardItemModel *m_MountModel { nullptr };
QStandardItemModel *m_CameraModel { nullptr };
QStandardItemModel *m_GuiderModel { nullptr };
QStandardItemModel *m_FocuserModel { nullptr };
uint8_t m_INDIHub { 0 };
QPointer<QProgressDialog> m_ProgressDialog;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment