X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Flgconfig%2Flgconfig.cpp;h=7b7fca89d910cf4b12b32a7576cb798e1326bc0b;hb=refs%2Ftags%2F3.4-b1;hp=58872ca4c0d5e8f2fdec39e213acc758abb1263d;hpb=b48a74556fd21dfc175d754058d22b9216e6b12e;p=vlp.git diff --git a/src/lgconfig/lgconfig.cpp b/src/lgconfig/lgconfig.cpp index 58872ca..7b7fca8 100644 --- a/src/lgconfig/lgconfig.cpp +++ b/src/lgconfig/lgconfig.cpp @@ -1,340 +1,90 @@ #include -#include -#include -#include -// #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include #include #include #include #include -class VLPEntry { -public: - int ID; - char addr[255]; - /** 0 - explicit */ - int type; - char progdir[255]; - char homedir[255]; - char item[255]; -}; +#include "lgconfig.h" +#include "NodeListDialog.h" +#include "vlp/config.h" -class QInstall: public QMainWindow { - Q_OBJECT -public: - QMenuBar *bar; - Q3ListBox *nodelist; - QPushButton *infob; - QList Nodes; - - QInstall(); - bool check_id(int); - bool check_addr(char*); - -public slots: - void SetOptions(); - void AddNode(); - void DelNode(); - void Info(); -}; - - -QApplication *app; +namespace loglan { +namespace vlp { QInstall::QInstall() { - QFont f("Helvetica", 12, QFont::Bold); - QPixmap mp; - -// infob = new QPushButton(this); - - setWindowTitle("VLP Configuration Tool"); - - QMenu * programMenu = NULL; - programMenu = menuBar()->addMenu("&Program"); - programMenu->addAction("Configure", this, SLOT(SetOptions())); - programMenu->addAction("Quit", app, SLOT(quit())); - -// bar = new QMenuBar(this); -// bar->insertItem("Configure", this, SLOT(SetOptions())); -// bar->insertItem("Quit", app, SLOT(quit())); -// bar->setFont(f); -// infob->setGeometry(0, bar->height(), 200, 30); - if (mp.load("logo.bmp")) { -// infob->setPixmap(mp); -// infob->resize(mp.width(), mp.height()); - } -// resize(infob->width(), infob->height() + bar->height()); - Nodes.clear(); + setupUi(this); } -bool QInstall::check_id(int id) +void QInstall::on_actionConfigure_triggered() { - VLPEntry *pom; - QListIterator nodesIterator(Nodes); + dialog::NodeListDialog dialog(nodes, this); - while (nodesIterator.hasNext()) { - pom = nodesIterator.next(); - if (pom->ID == id) - return FALSE; - } - return TRUE; -} + if (dialog.exec()) { + nodes = dialog.getNodes(); -bool QInstall::check_addr(char *addr) -{ - VLPEntry *pom; - QListIterator nodesIterator(Nodes); + if (!nodes.isEmpty()) { - while (nodesIterator.hasNext()) { - pom = nodesIterator.next(); - if (strcmp(pom->addr, addr) == 0) - return FALSE; - } - return TRUE; -} + VLPEntry *pom; + int i; + char pomstr[255]; -/** - * @attention Currently not in use - */ -void QInstall::Info() -{ -} + QListIterator nodesIterator(nodes); -void QInstall::AddNode() -{ - QDialog dlg(this); - QLabel *tmpQLabel; - QLineEdit *id, *addr, *progs, *home; - QPushButton *okbtn, *cancelbtn; - VLPEntry *pom; - char pomstr[255]; - - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(110, 10, 180, 30); - tmpQLabel->setFrameStyle(49); - tmpQLabel->setText("Virtual Processor Properties"); - - id = new QLineEdit(&dlg); - id->setGeometry(130, 50, 50, 30); - id->setText(""); - - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(20, 50, 90, 30); - tmpQLabel->setText("Node number"); - - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(20, 90, 80, 30); - tmpQLabel->setText("IP Address"); - - addr = new QLineEdit(&dlg); - addr->setGeometry(130, 90, 120, 30); - addr->setText(""); + while (nodesIterator.hasNext()) { + pom = nodesIterator.next(); + i = nodes.indexOf(pom); + sprintf(pomstr, "%s.cfg", pom->addr); - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(20, 130, 100, 30); - tmpQLabel->setText("Connection type"); + + loglan::vlp::Config config; - QComboBox* tmpQComboBox; - tmpQComboBox = new QComboBox(&dlg); - tmpQComboBox->setGeometry(130, 130, 100, 30); - tmpQComboBox->insertItem(0, "Explicit"); + config.setProgramDir(pom->progdir); + config.setNodeNumber(pom->ID); + config.setConnectionType( + (pom->type == 0) ? EXPLICIT : REGISTER + ); - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(20, 170, 110, 30); - tmpQLabel->setText("Programs directory"); + std::vector hosts; + for (auto node : nodes) { + if (pom != node) { + hosts.push_back(node->addr); + } + } + config.setHosts(hosts); - progs = new QLineEdit(&dlg); - progs->setGeometry(130, 170, 230, 30); - progs->setText(""); + config.save(pomstr); - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(20, 210, 100, 30); - tmpQLabel->setText("VLP directory"); +// TODO: add handling of homedir or remove it at all +// setting = config_setting_get_member(root, "homedir"); +// if(!setting) { +// setting = config_setting_add(root, "homedir", CONFIG_TYPE_STRING); +// } +// config_setting_set_string(setting, pom->homedir); - home = new QLineEdit(&dlg); - home->setGeometry(130, 210, 230, 30); - home->setText(""); - okbtn = new QPushButton(&dlg); - okbtn->setGeometry(80, 250, 100, 30); - okbtn->setText("Ok"); - connect(okbtn,SIGNAL(clicked()), &dlg, SLOT(accept())); - cancelbtn = new QPushButton(&dlg); - cancelbtn->setGeometry(210, 250, 100, 30); - cancelbtn->setText("Cancel"); - connect(cancelbtn,SIGNAL(clicked()), &dlg, SLOT(reject())); - dlg.resize(380, 300); - if (dlg.exec()) { - pom = new VLPEntry; - pom->ID = id->text().toInt(); - if (check_id(pom->ID)) { - strcpy(pom->addr, addr->text().toStdString().c_str()); - if (check_addr(pom->addr)) { - if (tmpQComboBox->currentText() == "Explicit") { - pom->type=0; - } - strcpy(pom->progdir, progs->text().toStdString().c_str()); - strcpy(pom->homedir, home->text().toStdString().c_str()); - Nodes.append(pom); - sprintf(pomstr, "Node: %d\t" - "Addr: %s\t" - "Home dir: %s", pom->ID, pom->addr, pom->homedir); - nodelist->insertItem(pomstr); - strcpy(pom->item, pomstr); - } else { - QMessageBox::warning(this, "Error!", "Only one VLP on a single computer!", "Ok"); + pom = nodes.at(i); } - } else { - QMessageBox::warning(this, "Error!", "ID must be unique!", "Ok"); } } } -void QInstall::DelNode() -{ - char pom[255]; - VLPEntry *vpom; - - if (nodelist->currentItem() >= 0) { - strcpy(pom, nodelist->text(nodelist->currentItem()).toStdString().c_str()); - - QListIterator nodesIterator(Nodes); - - while (nodesIterator.hasNext()) { - vpom = nodesIterator.next(); - if (strcmp(pom, vpom->item) == 0) - break; - } - if (vpom != NULL) - if (QMessageBox::question(this, "Delete VLP", "Are you sure?", "Yes", "No")) { - nodelist->removeItem(nodelist->currentItem()); - Nodes.removeOne(vpom); - } - } -} -void QInstall::SetOptions() +void QInstall::on_actionQuit_triggered() { - QDialog dlg(this); - QLabel *tmpQLabel; - QPushButton *addbtn, *delbtn, *okbtn, *cancelbtn; - VLPEntry *pom; - int i, j; - char pomstr[255]; - - //dlg.setStyle(WindowsStyle); - nodelist = new Q3ListBox(&dlg); - nodelist->setGeometry(20, 40, 480, 160); - - tmpQLabel = new QLabel(&dlg); - tmpQLabel->setGeometry(20, 10, 100, 30); - tmpQLabel->setText("Nodes:"); - - addbtn = new QPushButton(&dlg); - addbtn->setGeometry(30, 210, 100, 30); - addbtn->setText("Add VLP"); - connect(addbtn, SIGNAL(clicked()), this, SLOT(AddNode())); - - delbtn = new QPushButton(&dlg); - delbtn->setGeometry(150, 210, 100, 30); - delbtn->setText("Del VLP"); - connect(delbtn, SIGNAL(clicked()), this, SLOT(DelNode())); - - okbtn = new QPushButton(&dlg); - okbtn->setGeometry(270, 210, 100, 30); - okbtn->setText("Save files"); - connect(okbtn, SIGNAL(clicked()), &dlg, SLOT(accept())); - - cancelbtn = new QPushButton(&dlg); - cancelbtn->setGeometry(390, 210, 100, 30); - cancelbtn->setText("Cancel"); - connect(cancelbtn, SIGNAL(clicked()), &dlg, SLOT(reject())); - - dlg.resize(520, 260); - - if (dlg.exec()) { - if (!Nodes.isEmpty()) { - QListIterator nodesIterator(Nodes); - - while (nodesIterator.hasNext()) { - pom = nodesIterator.next(); - j = Nodes.indexOf(pom); - sprintf(pomstr, "%s.cfg", pom->addr); - - config_t cfg; - config_setting_t *root, *setting; - config_init(&cfg); - - root = config_root_setting(&cfg); - - setting = config_setting_get_member(root, "progdir"); - if(!setting) { - setting = config_setting_add(root, "progdir", CONFIG_TYPE_STRING); - } - config_setting_set_string(setting, pom->progdir); - - setting = config_setting_get_member(root, "homedir"); - if(!setting) { - setting = config_setting_add(root, "homedir", CONFIG_TYPE_STRING); - } - config_setting_set_string(setting, pom->homedir); - - setting = config_setting_get_member(root, "node_number"); - if(!setting) { - setting = config_setting_add(root, "node_number", CONFIG_TYPE_INT); - } - config_setting_set_int(setting, pom->ID); - - if (pom->type == 0) { - setting = config_setting_get_member(root, "type"); - if(!setting) { - setting = config_setting_add(root, "type", CONFIG_TYPE_STRING); - } - config_setting_set_string(setting, "explicit"); - } - for (i = 0; i < Nodes.count(); i++) { - if (pom != Nodes.at(i)) { - setting = config_setting_get_member(root, "host"); - if (!setting) { - setting = config_setting_add(root, "host", CONFIG_TYPE_STRING); - } - config_setting_set_string(setting, Nodes.at(i)->addr); - } - } - - if(!config_write_file(&cfg, pomstr)) { - fprintf(stderr, "Error while writing to file: %s.\n", pomstr); - } - config_destroy(&cfg); + QApplication::instance()->quit(); +} - pom = Nodes.at(j); - } - } - } +} } -#include "lgconfig.moc" int main(int argc, char **argv) { - app = new QApplication(argc,argv); - QInstall cfg; + QApplication *app = new QApplication(argc,argv); + loglan::vlp::QInstall cfg; cfg.show(); return app->exec(); }