##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

comment omp.h to ensure the compilation from the command line
perrinel -
r29:6d9ae743e935
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,39 +1,39
1 1 /*------------------------------------------------------------------------------
2 2 -- This file is a part of the QLop Software
3 3 -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
4 4 --
5 5 -- This program is free software; you can redistribute it and/or modify
6 6 -- it under the terms of the GNU General Public License as published by
7 7 -- the Free Software Foundation; either version 2 of the License, or
8 8 -- (at your option) any later version.
9 9 --
10 10 -- This program is distributed in the hope that it will be useful,
11 11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
12 12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 -- GNU General Public License for more details.
14 14 --
15 15 -- You should have received a copy of the GNU General Public License
16 16 -- along with this program; if not, write to the Free Software
17 17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 18 -------------------------------------------------------------------------------*/
19 19 /*-- Author : Alexis Jeandet
20 20 -- Mail : alexis.jeandet@member.fsf.org
21 21 ----------------------------------------------------------------------------*/
22 22 #include "mainwindow.h"
23 23 #include <QProcessEnvironment>
24 24 #include <QThread>
25 25 #include <SqpApplication.h>
26 #include <omp.h>
27 26 #include <qglobal.h>
28 27
29 28 int main(int argc, char *argv[])
30 29 {
30 int ad;
31 31 SqpApplication a(argc, argv);
32 32 SqpApplication::setOrganizationName("LPP");
33 33 SqpApplication::setOrganizationDomain("lpp.fr");
34 34 SqpApplication::setApplicationName("SciQLop");
35 35 MainWindow w;
36 36 w.show();
37 37
38 38 return a.exec();
39 39 }
Show file before | Show file after | Hide comments
@@ -1,104 +1,103
1 1 /*------------------------------------------------------------------------------
2 2 -- This file is a part of the QLop Software
3 3 -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
4 4 --
5 5 -- This program is free software; you can redistribute it and/or modify
6 6 -- it under the terms of the GNU General Public License as published by
7 7 -- the Free Software Foundation; either version 2 of the License, or
8 8 -- (at your option) any later version.
9 9 --
10 10 -- This program is distributed in the hope that it will be useful,
11 11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
12 12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 -- GNU General Public License for more details.
14 14 --
15 15 -- You should have received a copy of the GNU General Public License
16 16 -- along with this program; if not, write to the Free Software
17 17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 18 -------------------------------------------------------------------------------*/
19 19 /*-- Author : Alexis Jeandet
20 20 -- Mail : alexis.jeandet@member.fsf.org
21 21 ----------------------------------------------------------------------------*/
22 22 #include "mainwindow.h"
23 23 #include "ui_mainwindow.h"
24 24 #include <QAction>
25 25 #include <QDate>
26 26 #include <QDateTime>
27 27 #include <QDir>
28 28 #include <QFileDialog>
29 #include <omp.h>
29 //#include <omp.h>
30 30 //#include <network/filedownloader.h>
31 31 //#include <qlopdatabase.h>
32 32 //#include <qlopsettings.h>
33 33 //#include <qlopgui.h>
34 34 //#include <spacedata.h>
35 35 //#include "qlopcore.h"
36 36 //#include "qlopcodecmanager.h"
37 37 //#include "cdfcodec.h"
38 38 //#include "amdatxtcodec.h"
39 39 //#include <qlopplotmanager.h>
40 40
41
42 41 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
43 42 {
44 43 ui->setupUi(this);
45 44 /* QLopGUI::registerMenuBar(menuBar());
46 45 this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
47 46 this->m_progressWidget = new QWidget();
48 47 this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
49 48 this->m_progressWidget->setLayout(this->m_progressLayout);
50 49 this->m_progressWidget->setWindowModality(Qt::WindowModal);
51 50 m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
52 51 for(int i=0;i<OMP_THREADS;i++)
53 52 {
54 53 this->m_progress.append(new QProgressBar(this->m_progressWidget));
55 54 this->m_progress.last()->setMinimum(0);
56 55 this->m_progress.last()->setMaximum(100);
57 56 this->m_progressLayout->addWidget(this->m_progress.last());
58 57 this->m_progressWidget->hide();
59 58 this->m_progressThreadIds[i] = -1;
60 59 }
61 60 this->m_progressWidget->setWindowTitle("Loading File");
62 61 const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
63 62 << QLopCore::self()
64 63 << QLopPlotManager::self()
65 64 << QLopCodecManager::self()
66 65 << FileDownloader::self()
67 66 << QLopDataBase::self()
68 67 << SpaceData::self();
69 68
70 69 CDFCodec::registerToManager();
71 70 AMDATXTCodec::registerToManager();
72 71
73 72
74 73 for(int i=0;i<ServicesToLoad.count();i++)
75 74 {
76 75 qDebug()<<ServicesToLoad.at(i)->serviceName();
77 76 ServicesToLoad.at(i)->initialize(); //must be called before getGUI
78 77 QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
79 78 if(wdgt)
80 79 {
81 80 wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
82 81 this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
83 82 }
84 83 PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
85 84 }*/
86 85 }
87 86
88 87 MainWindow::~MainWindow()
89 88 {
90 89 delete ui;
91 90 }
92 91
93 92
94 93 void MainWindow::changeEvent(QEvent *e)
95 94 {
96 95 QMainWindow::changeEvent(e);
97 96 switch (e->type()) {
98 97 case QEvent::LanguageChange:
99 98 ui->retranslateUi(this);
100 99 break;
101 100 default:
102 101 break;
103 102 }
104 103 }
General Comments 3
Under Review
perrinel
author
Comment #1381
Edit
Delete
|

Auto status change to "Under Review"

Approved
perrinel
author
Comment #1382
Edit
Delete
|

Status change > Approved

You need to be logged in to leave comments. Login now