Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit faa0e81a authored by saubatn's avatar saubatn
Browse files

UPDATED Compilation & Linking of CamiTK SDK + Modeling ok!

parent f48a8c07
......@@ -27,8 +27,6 @@
#include "GenerateModel.h"
#include "SimulationDialog.h"
// --------------- declare the extension -------------------
Q_EXPORT_PLUGIN2(mmlactionextension, MMLActionExtension)
// -------------------- init --------------------
void MMLActionExtension::init() {
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -28,9 +28,6 @@
using namespace camitk;
// --------------- declare the plugin -------------------
Q_EXPORT_PLUGIN2( mml, MMLComponentExtension );
// --------------- getName -------------------
QString MMLComponentExtension::getName() const {
return "MML Component";
......
......@@ -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)
......
......@@ -39,6 +39,8 @@
#include <InteractiveViewer.h>
#include <QtGui>
#include <QTableWidget>
#include <QRadioButton>
#include "MMLMonitorDisplayFactory.h"
#include <MonitoringDriver.h>
......
......@@ -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) {
......
......@@ -24,6 +24,7 @@
****************************************************************************/
#include <QtGui>
#include <QTableWidget>
#include "MMLMonitorDisplay.h"
#include "MMLComponentAPI.h"
......
......@@ -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) {
......
......@@ -24,6 +24,7 @@
****************************************************************************/
#include <QtGui>
#include <QTableWidget>
#include "MMLMonitorDisplay.h"
#include "MMLComponentAPI.h"
......
......@@ -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->SetInputData ( 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->SetInputData ( 1, selection );
// The selection actor, with its color properties adapted to the input structural component
vtkSmartPointer<vtkActor> selectionActor = vtkSmartPointer<vtkActor>::New();
......
......@@ -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";
......
......@@ -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)
......
......@@ -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).
......
......@@ -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>
......
......@@ -37,6 +37,8 @@
// qt
#include <QtGui>
#include <QFileDialog>
#include <QMessageBox>
// ----------------------- constructor ---------------------------
MonitoringDialog::MonitoringDialog(MonitoringGuiManager* guiManager, QWidget* parent): QDialog(parent) {
......
......@@ -26,6 +26,8 @@
#include "MonitoringGuiManager.h"
#include <QtGui>
#include <QMessageBox>
#include <QApplication>
#include "MonitoringDialog.h"
#include "MonitoringDriver.h"
......
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