Commit 24c4fcf8 authored by promayon's avatar promayon
Browse files

FIXED camitk source package compatibility for debian packaging

FIXED remove interdependency of VtkMeshUtil

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@171 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 10015f68
......@@ -73,7 +73,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${CAMITK_VER_MAJ})
set(CPACK_PACKAGE_VERSION_MINOR ${CAMITK_VER_MIN})
set(CPACK_PACKAGE_VERSION_PATCH ${CAMITK_VER_PACKAGE_PAT})
string(TOLOWER "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.orig" CPACK_SOURCE_PACKAGE_FILE_NAME)
string(TOLOWER "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-sources" CPACK_SOURCE_PACKAGE_FILE_NAME)
set(CPACK_SOURCE_IGNORE_FILES
......
......@@ -32,7 +32,6 @@ $CAMITK_LICENCE_END$
#include <Log.h>
#include <Geometry.h>
#include <VtkMeshUtil.h>
#include <InteractiveViewer.h>
#include <vtkUnstructuredGrid.h>
......@@ -726,13 +725,5 @@ void StructuralComponentDC::destroyPointData() {
}
}
/* TODO fix import/export
//-------------------- saveToVtk -------------------
void StructuralComponentDC::saveToVtk(const QString &fn) {
if (myGeometry)
VtkMeshUtil::geometryToVtk(dynamic_cast<Geometry*>(myGeometry), fn.toStdString());
}
*/
......@@ -31,18 +31,16 @@ $CAMITK_LICENCE_END$
#include <Component.h>
#include <VtkMeshUtil.h>
#include <QFileDialog>
#include <QMessageBox>
// ---------------------- constructor ----------------------------
StructuralComponentDCPopup::StructuralComponentDCPopup(camitk::Component *dc, QWidget *parent) : camitk::ComponentPopupMenu(dc, parent) {
addAction("Export To VTK...", SLOT(vtkExport()));
addAction("Export To CSV...", SLOT(saveToCsv()));
}
/* TODO : translate this to CamiTK 3.0 action on StructuralComponentDC
// ---------------------- vtkExport ----------------------------
void StructuralComponentDCPopup::vtkExport() {
vtkSmartPointer<vtkPointSet> representation = myComponent->getPointSet();
......@@ -65,20 +63,6 @@ void StructuralComponentDCPopup::vtkExport() {
VtkMeshUtil::savePointSetToFile(representation, vtkFileName.toStdString(), myComponent->getName().toStdString());
}
/* TODO fix import/export
// ---------------------- saveToVtk ----------------------------
void StructuralComponentDCPopup::saveToVtk() {
QDir lastOpenedDirectory;
lastOpenedDirectory = QFileInfo(myComponent->getTopLevelComponent()->getFileName()).absoluteDir();
// get the file name
QString newFileName = QFileDialog::getSaveFileName(NULL, "Save to VTK...", lastOpenedDirectory.absolutePath(), tr("Vtk (*.vtk)"));
if (!newFileName.isNull()) {
dynamic_cast<StructuralComponentDC *>(myComponent)->saveToVtk(newFileName);
}
}
*/
//------------------------saveToCsv()---------------------
......
Supports Markdown
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