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

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Remove coverage from windows build...
perrinel -
r75:6f69134168e5
parent child
Show More
Show file before | Show file after | Hide comments
@@ -19,7 +19,7
19 /*-- Author : Alexis Jeandet
19 /*-- Author : Alexis Jeandet
20 -- Mail : alexis.jeandet@member.fsf.org
20 -- Mail : alexis.jeandet@member.fsf.org
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "mainwindow.h"
22 #include "MainWindow.h"
23 #include <QProcessEnvironment>
23 #include <QProcessEnvironment>
24 #include <QThread>
24 #include <QThread>
25 #include <SqpApplication.h>
25 #include <SqpApplication.h>
Show file before | Show file after | Hide comments
@@ -97,8 +97,10 IF(BUILD_TESTS)
97
97
98 SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
98 SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
99 set(Coverage_NAME ${testName})
99 set(Coverage_NAME ${testName})
100 SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName})
100 if(UNIX)
101 LIST( APPEND TARGETS_COV ${testName}_coverage)
101 SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName})
102 LIST( APPEND TARGETS_COV ${testName}_coverage)
103 endif(UNIX)
102
104
103 ENDFOREACH( testFile )
105 ENDFOREACH( testFile )
104
106
Show file before | Show file after | Hide comments
@@ -89,9 +89,8 using default_copier_t = typename default_copier<T>::type;
89
89
90 template <class T, class D, class C>
90 template <class T, class D, class C>
91 struct is_default_manageable
91 struct is_default_manageable
92 : public std::integral_constant<bool,
92 : public std::integral_constant<bool, std::is_same<D, default_deleter_t<T> >::value
93 std::is_same<D, default_deleter_t<T> >::value
93 && std::is_same<C, default_copier_t<T> >::value> {
94 && std::is_same<C, default_copier_t<T> >::value> {
95 };
94 };
96 }
95 }
97
96
@@ -132,11 +131,10 public:
132 }
131 }
133
132
134 template <class U>
133 template <class U>
135 impl_ptr(U *u,
134 impl_ptr(U *u, typename std::enable_if<std::is_convertible<U *, pointer>::value
136 typename std::enable_if<std::is_convertible<U *, pointer>::value
135 && is_default_manageable::value,
137 && is_default_manageable::value,
136 dummy_t_>::type
138 dummy_t_>::type
137 = dummy_t_()) SPIMPL_NOEXCEPT
139 = dummy_t_()) SPIMPL_NOEXCEPT
140 : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>)
138 : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>)
141 {
139 {
142 }
140 }
@@ -153,12 +151,12 public:
153
151
154 #ifdef SPIMPL_HAS_AUTO_PTR
152 #ifdef SPIMPL_HAS_AUTO_PTR
155 template <class U>
153 template <class U>
156 impl_ptr(std::auto_ptr<U> &&u,
154 impl_ptr(std::auto_ptr<U> &&u, typename std::enable_if<std::is_convertible<U *, pointer>::value
157 typename std::enable_if<std::is_convertible<U *, pointer>::value
155 && is_default_manageable::value,
158 && is_default_manageable::value,
156 dummy_t_>::type
159 dummy_t_>::type
157 = dummy_t_()) SPIMPL_NOEXCEPT
160 = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete<T>),
158 : ptr_(u.release(), &details::default_delete<T>),
161 copier_(&details::default_copy<T>)
159 copier_(&details::default_copy<T>)
162 {
160 {
163 }
161 }
164 #endif
162 #endif
Show file before | Show file after | Hide comments
@@ -21,14 +21,14 public:
21 DataSourceController::DataSourceController(QObject *parent)
21 DataSourceController::DataSourceController(QObject *parent)
22 : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
22 : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
23 {
23 {
24 qCDebug(LOG_DataSourceController())
24 qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction")
25 << tr("DataSourceController construction") << QThread::currentThread();
25 << QThread::currentThread();
26 }
26 }
27
27
28 DataSourceController::~DataSourceController()
28 DataSourceController::~DataSourceController()
29 {
29 {
30 qCDebug(LOG_DataSourceController())
30 qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction")
31 << tr("DataSourceController destruction") << QThread::currentThread();
31 << QThread::currentThread();
32 this->waitForFinish();
32 this->waitForFinish();
33 }
33 }
34
34
@@ -61,8 +61,8 void DataSourceController::setDataSourceItem(
61
61
62 void DataSourceController::initialize()
62 void DataSourceController::initialize()
63 {
63 {
64 qCDebug(LOG_DataSourceController())
64 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init")
65 << tr("DataSourceController init") << QThread::currentThread();
65 << QThread::currentThread();
66 impl->m_WorkingMutex.lock();
66 impl->m_WorkingMutex.lock();
67 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
67 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
68 }
68 }
Show file before | Show file after | Hide comments
@@ -16,21 +16,21 public:
16 VisualizationController::VisualizationController(QObject *parent)
16 VisualizationController::VisualizationController(QObject *parent)
17 : impl{spimpl::make_unique_impl<VisualizationControllerPrivate>()}
17 : impl{spimpl::make_unique_impl<VisualizationControllerPrivate>()}
18 {
18 {
19 qCDebug(LOG_VisualizationController())
19 qCDebug(LOG_VisualizationController()) << tr("VisualizationController construction")
20 << tr("VisualizationController construction") << QThread::currentThread();
20 << QThread::currentThread();
21 }
21 }
22
22
23 VisualizationController::~VisualizationController()
23 VisualizationController::~VisualizationController()
24 {
24 {
25 qCDebug(LOG_VisualizationController())
25 qCDebug(LOG_VisualizationController()) << tr("VisualizationController destruction")
26 << tr("VisualizationController destruction") << QThread::currentThread();
26 << QThread::currentThread();
27 this->waitForFinish();
27 this->waitForFinish();
28 }
28 }
29
29
30 void VisualizationController::initialize()
30 void VisualizationController::initialize()
31 {
31 {
32 qCDebug(LOG_VisualizationController())
32 qCDebug(LOG_VisualizationController()) << tr("VisualizationController init")
33 << tr("VisualizationController init") << QThread::currentThread();
33 << QThread::currentThread();
34 impl->m_WorkingMutex.lock();
34 impl->m_WorkingMutex.lock();
35 qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END");
35 qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END");
36 }
36 }
General Comments 5
Under Review
perrinel
author
Comment #1405
Edit
Delete
|

Auto status change to "Under Review"

Under Review
perrinel
author
Comment #1412
Edit
Delete
|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 6 added
  * 3 removed

Changed files:
  * A gui/src/Visualization/VisualizationWidget.cpp
  * A gui/include/SidePane/SqpSidePane.h
  * A gui/include/Visualization/VisualizationGraphWidget.h
  * A gui/include/Visualization/VisualizationTabWidget.h
  * A gui/include/Visualization/VisualizationWidget.h
  * A gui/include/Visualization/VisualizationZoneWidget.h
  * A gui/include/Visualization/qcustomplot.h
  * A gui/src/SidePane/SqpSidePane.cpp
  * A gui/src/Visualization/VisualizationGraphWidget.cpp
  * A gui/src/Visualization/VisualizationTabWidget.cpp
  * A gui/src/Visualization/VisualizationZoneWidget.cpp
  * A gui/src/Visualization/qcustomplot.cpp
  * M gui/include/DataSource/DataSourceWidget.h
  * M gui/src/DataSource/DataSourceTreeWidgetItem.cpp
  * M gui/src/DataSource/DataSourceWidget.cpp
  * M app/src/Main.cpp
  * M app/src/MainWindow.cpp
  * M app/ui/MainWindow.ui
  * M core/include/DataSource/DataSourceController.h
  * M core/src/DataSource/DataSourceController.cpp
  * M core/tests/DataSource/TestDataSourceController.cpp
  * M gui/ui/visualization/VisualizationWidget.ui
  * M gui/vera-exclusions/exclusions.txt
  * M gui/src/visualization/VisualizationWidget.cpp
  * R cmake/sciqlop_package_qt.cmake
  * R core/include/Plugin/PluginManager.h
  * R core/include/Visualization/VisualizationController.h
  * R core/src/Plugin/PluginManager.cpp
  * R core/src/Visualization/VisualizationController.cpp
  * R gui/include/sidepane/SqpSidePane.h
  * R gui/include/visualization/VisualizationGraphWidget.h
  * R gui/include/visualization/VisualizationTabWidget.h
  * R gui/include/visualization/VisualizationWidget.h
  * R gui/include/visualization/VisualizationZoneWidget.h
  * R gui/include/visualization/qcustomplot.h
  * R gui/src/sidepane/SqpSidePane.cpp
  * R gui/src/visualization/VisualizationGraphWidget.cpp
  * R gui/src/visualization/VisualizationTabWidget.cpp
  * R gui/src/visualization/VisualizationZoneWidget.cpp
  * R gui/src/visualization/qcustomplot.cpp
  * R gui/ui/sidepane/SqpSidePane.ui
  * R gui/ui/visualization/VisualizationGraphWidget.ui
  * R gui/ui/visualization/VisualizationTabWidget.ui
  * R gui/ui/visualization/VisualizationZoneWidget.ui
  * R plugin/CMakeLists.txt
  * R plugin/cmake/Findsciqlop-plugin.cmake
  * R plugin/include/Plugin/IPlugin.h
  * R app/CMakeLists.txt
  * R app/include/MainWindow.h
  * R app/vera-exclusions/exclusions.txt
  * R cmake/sciqlop_applications.cmake
  * R core/CMakeLists.txt
  * R core/include/Common/spimpl.h
  * R gui/CMakeLists.txt
  * R gui/include/SqpApplication.h
  * R gui/src/SqpApplication.cpp
  * R app/src/mainwindow.ui
Approved
perrinel
author
Comment #1413
Edit
Delete
|

Status change > Approved

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