Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
faa0e81a
Commit
faa0e81a
authored
Mar 17, 2016
by
saubatn
Browse files
UPDATED Compilation & Linking of CamiTK SDK + Modeling ok!
parent
f48a8c07
Changes
18
Hide whitespace changes
Inline
Side-by-side
modeling/actions/mml/MMLActionExtension.cpp
View file @
faa0e81a
...
...
@@ -27,8 +27,6 @@
#include "GenerateModel.h"
#include "SimulationDialog.h"
// --------------- declare the extension -------------------
Q_EXPORT_PLUGIN2
(
mmlactionextension
,
MMLActionExtension
)
// -------------------- init --------------------
void
MMLActionExtension
::
init
()
{
...
...
modeling/actions/mml/MMLActionExtension.h
View file @
faa0e81a
...
...
@@ -40,6 +40,7 @@
class
MMLActionExtension
:
public
camitk
::
ActionExtension
{
Q_OBJECT
Q_INTERFACES
(
camitk
::
ActionExtension
)
Q_PLUGIN_METADATA
(
IID
"fr.imag.camitk.action.mml"
)
public:
/// the constructor
...
...
modeling/actions/pml/PMLActionExtension.cpp
View file @
faa0e81a
...
...
@@ -29,9 +29,6 @@
#include "PMLExplorerAction.h"
#include "CreateSC.h"
// --------------- declare the extension -------------------
Q_EXPORT_PLUGIN2
(
pmlexploreextension
,
PMLActionExtension
);
// --------------- getActions -------------------
void
PMLActionExtension
::
init
()
{
// Creating and registering the instance of PMLExploreAction
...
...
modeling/actions/pml/PMLActionExtension.h
View file @
faa0e81a
...
...
@@ -30,7 +30,8 @@
class
PMLActionExtension
:
public
camitk
::
ActionExtension
{
Q_OBJECT
Q_INTERFACES
(
camitk
::
ActionExtension
);
Q_INTERFACES
(
camitk
::
ActionExtension
)
Q_PLUGIN_METADATA
(
IID
"fr.imag.camitk.action.pml"
)
public:
/// Constructor
...
...
modeling/components/mmlcomponent/MMLComponentExtension.cpp
View file @
faa0e81a
...
...
@@ -28,9 +28,6 @@
using
namespace
camitk
;
// --------------- declare the plugin -------------------
Q_EXPORT_PLUGIN2
(
mml
,
MMLComponentExtension
);
// --------------- getName -------------------
QString
MMLComponentExtension
::
getName
()
const
{
return
"MML Component"
;
...
...
modeling/components/mmlcomponent/MMLComponentExtension.h
View file @
faa0e81a
...
...
@@ -41,7 +41,8 @@
**/
class
MMLCOMPONENT_API
MMLComponentExtension
:
public
camitk
::
ComponentExtension
{
Q_OBJECT
Q_INTERFACES
(
camitk
::
ComponentExtension
);
Q_INTERFACES
(
camitk
::
ComponentExtension
)
Q_PLUGIN_METADATA
(
IID
"fr.imag.camitk.component.mmlcomponent"
)
public:
/// the constructor (do nothing really)
...
...
modeling/components/mmlcomponent/MMLDisplay.cpp
View file @
faa0e81a
...
...
@@ -39,6 +39,8 @@
#include <InteractiveViewer.h>
#include <QtGui>
#include <QTableWidget>
#include <QRadioButton>
#include "MMLMonitorDisplayFactory.h"
#include <MonitoringDriver.h>
...
...
modeling/components/mmlcomponent/MMLMonitorDisplays/Statistics.cpp
View file @
faa0e81a
...
...
@@ -32,6 +32,8 @@
#include <monitoringgui/MonitoringGuiManager.h>
#include <monitoringgui/MonitoringDialog.h>
#include <QHeaderView>
bool
statisticsRegistered
=
MMLMonitorDisplayFactory
::
getInstance
()
->
registerClass
<
Statistics
>
(
"Statistics"
,
Monitor
::
SCALARSET
);
Statistics
::
Statistics
(
Monitor
*
monitor
,
MMLComponent
*
manager
)
:
MMLMonitorDisplay
(
monitor
,
manager
)
{
...
...
modeling/components/mmlcomponent/MMLMonitorDisplays/Statistics.h
View file @
faa0e81a
...
...
@@ -24,6 +24,7 @@
****************************************************************************/
#include <QtGui>
#include <QTableWidget>
#include "MMLMonitorDisplay.h"
#include "MMLComponentAPI.h"
...
...
modeling/components/mmlcomponent/MMLMonitorDisplays/Tabular.cpp
View file @
faa0e81a
...
...
@@ -32,6 +32,9 @@
#include <monitoringgui/MonitoringGuiManager.h>
#include <monitoringgui/MonitoringDialog.h>
#include <QheaderView>
#include <QApplication>
bool
tabularRegistered
=
MMLMonitorDisplayFactory
::
getInstance
()
->
registerClass
<
Tabular
>
(
"Tabular"
);
Tabular
::
Tabular
(
Monitor
*
monitor
,
MMLComponent
*
manager
)
:
MMLMonitorDisplay
(
monitor
,
manager
)
{
...
...
modeling/components/mmlcomponent/MMLMonitorDisplays/Tabular.h
View file @
faa0e81a
...
...
@@ -24,6 +24,7 @@
****************************************************************************/
#include <QtGui>
#include <QTableWidget>
#include "MMLMonitorDisplay.h"
#include "MMLComponentAPI.h"
...
...
modeling/components/pmlcomponent/PMLComponent.cpp
View file @
faa0e81a
...
...
@@ -221,9 +221,6 @@ void PMLComponent::create3DStructure() {
parseMultiComponent
(
ics
);
}
// Compute the 3D structure
mainGrid
->
Update
();
// set the component geometry to this one (initRepresentation also calls initDynamicProperties()...)
initRepresentation
(
mainGrid
);
...
...
@@ -360,7 +357,7 @@ void PMLComponent::createAtomSelectionVTKPipeline() {
// The selection extractor, attached to the selection and the 3D structure (unstructured grid)
vtkSmartPointer
<
vtkExtractSelection
>
selectedAtomExtractor
=
vtkSmartPointer
<
vtkExtractSelection
>::
New
();
selectedAtomExtractor
->
SetInputConnection
(
0
,
getDataPort
()
);
selectedAtomExtractor
->
SetInput
(
1
,
selectedAtomSelection
);
selectedAtomExtractor
->
SetInput
Data
(
1
,
selectedAtomSelection
);
// create the atom Glyph Actor
vtkSmartPointer
<
vtkSphereSource
>
glyphSphere
=
vtkSmartPointer
<
vtkSphereSource
>::
New
();
...
...
@@ -396,7 +393,7 @@ void PMLComponent::createCellSelectionVTKPipeline ( const StructuralComponent *
// The selection extractor, bound to the selection and the 3D structure (unstructured grid)
vtkSmartPointer
<
vtkExtractSelection
>
selectionExtractor
=
vtkSmartPointer
<
vtkExtractSelection
>::
New
();
selectionExtractor
->
SetInputConnection
(
0
,
getDataPort
()
);
selectionExtractor
->
SetInput
(
1
,
selection
);
selectionExtractor
->
SetInput
Data
(
1
,
selection
);
// The selection actor, with its color properties adapted to the input structural component
vtkSmartPointer
<
vtkActor
>
selectionActor
=
vtkSmartPointer
<
vtkActor
>::
New
();
...
...
modeling/components/pmlcomponent/PMLComponentExtension.cpp
View file @
faa0e81a
...
...
@@ -40,9 +40,6 @@ using namespace camitk;
//-- vtk
#include <vtkCell.h>
// --------------- declare the plugin -------------------
Q_EXPORT_PLUGIN2
(
pml
,
PMLComponentExtension
);
// --------------- getName -------------------
QString
PMLComponentExtension
::
getName
()
const
{
return
"PML Component"
;
...
...
modeling/components/pmlcomponent/PMLComponentExtension.h
View file @
faa0e81a
...
...
@@ -42,6 +42,7 @@
class
PMLComponentExtension
:
public
camitk
::
MeshComponentExtension
{
Q_OBJECT
Q_INTERFACES
(
camitk
::
ComponentExtension
)
Q_PLUGIN_METADATA
(
IID
"fr.imag.camitk.component.pmlcomponent"
)
public:
/// the constructor (does nothing really)
...
...
modeling/libraries/mml/monitoring/CMakeLists.txt
View file @
faa0e81a
...
...
@@ -154,7 +154,7 @@ set(monitoring_INCLUDE_DIRECTORIES ${MMLSCHEMA_INCLUDE_DIR}
camitk_library
(
SHARED
SOURCES
${
monitoring_SRCS
}
DEFINES COMPILE_MML_TOOL
NEEDS_QT
_MODULES
NEEDS_QT
NEEDS_XERCESC
NEEDS_CEP_LIBRARIES mmlschema pml pmlschema lml lmlschema
PUBLIC
#install directly in lib (or bin for Windows).
...
...
modeling/libraries/mml/monitoring/Chrono.cpp
View file @
faa0e81a
...
...
@@ -30,12 +30,12 @@
extern
"C"
{
#include <time.h> //
#include <sys/timeb.h> // ftime (chrono)
#include <time.h> // gettimeofday (chrono)
//
#include <time.h> // gettimeofday (chrono)
#if !defined(_WIN32) || defined(__MINGW32__)
#include <sys/time.h> // gettimeofday (chrono)
#include <unistd.h>
#else // MSVC only
int
/*
int
*/
// why this int here?
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <time.h>
...
...
modeling/libraries/mml/monitoringgui/MonitoringDialog.cpp
View file @
faa0e81a
...
...
@@ -37,6 +37,8 @@
// qt
#include <QtGui>
#include <QFileDialog>
#include <QMessageBox>
// ----------------------- constructor ---------------------------
MonitoringDialog
::
MonitoringDialog
(
MonitoringGuiManager
*
guiManager
,
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
modeling/libraries/mml/monitoringgui/MonitoringGuiManager.cpp
View file @
faa0e81a
...
...
@@ -26,6 +26,8 @@
#include "MonitoringGuiManager.h"
#include <QtGui>
#include <QMessageBox>
#include <QApplication>
#include "MonitoringDialog.h"
#include "MonitoringDriver.h"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment