Hello community, here is the log from the commit of package QCSXCAD for openSUSE:Factory checked in at 2016-09-11 00:54:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QCSXCAD (Old) and /work/SRC/openSUSE:Factory/.QCSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QCSXCAD" Changes: -------- --- /work/SRC/openSUSE:Factory/QCSXCAD/QCSXCAD.changes 2016-05-05 08:12:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.QCSXCAD.new/QCSXCAD.changes 2016-09-11 00:54:19.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 26 21:54:05 UTC 2016 - [email protected] + +- Update description, and license field to LGPL-3.0+. + +------------------------------------------------------------------- +Fri Aug 26 18:29:43 UTC 2016 - [email protected] + +- Update to version 0.6.1 + * Bugfix release +- Drop obsolete + * QCSXCAD-vtk.patch + * QCSXCAD-vtk7-support.patch + +------------------------------------------------------------------- Old: ---- QCSXCAD-0.6.0.tar.gz QCSXCAD-vtk.patch QCSXCAD-vtk7-support.patch New: ---- QCSXCAD-0.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.iZZh8J/_old 2016-09-11 00:54:20.000000000 +0200 +++ /var/tmp/diff_new_pack.iZZh8J/_new 2016-09-11 00:54:20.000000000 +0200 @@ -17,21 +17,17 @@ Name: QCSXCAD -Version: 0.6.0 +Version: 0.6.1 Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} Summary: Qt-GUI for CSXCAD library -License: LGPL-3.0 +License: LGPL-3.0+ Group: Productivity/Graphics/CAD Url: http://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE QCSXCAD-no-build-date.patch -- Remove build date from binaries Patch1: QCSXCAD-no-build-date.patch -# PATCH-FIX-UPSTREAM QCSXCAD-vtk.patch -- Fix build with VTK 6.3 -Patch2: QCSXCAD-vtk.patch -# PATCH-FIX-UPSTREAM QCSXCAD-vtk7-support.patch -- Fix build with VTK 7 -Patch3: QCSXCAD-vtk7-support.patch BuildRequires: CSXCAD-devel BuildRequires: cmake BuildRequires: tinyxml-devel @@ -45,14 +41,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Qt-GUI for CSXCAD library. +A Qt-GUI for the CSXCAD library. %package -n %{libname} Summary: Qt-GUI for CSXCAD library Group: System/Libraries %description -n %{libname} -Qt-GUI for CSXCAD library. +A Qt-GUI for the CSXCAD library. %package devel Summary: Development files for %{name} @@ -60,7 +56,7 @@ Requires: %{libname} = %{version} %description devel -Qt-GUI for CSXCAD library. +A Qt-GUI for the CSXCAD library. This package contains libraries and header files for developing applications that use %{name}. @@ -68,8 +64,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %cmake ++++++ QCSXCAD-0.6.0.tar.gz -> QCSXCAD-0.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/CMakeLists.txt new/QCSXCAD-0.6.1/CMakeLists.txt --- old/QCSXCAD-0.6.0/CMakeLists.txt 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/CMakeLists.txt 2016-05-12 21:19:34.000000000 +0200 @@ -10,6 +10,11 @@ cmake_minimum_required(VERSION 2.8) +# https://cmake.org/cmake/help/v3.0/policy/CMP0020.html +if(POLICY CMP0020) + cmake_policy(SET CMP0020 OLD) +endif() + IF(EXISTS ${PROJECT_SOURCE_DIR}/localConfig.cmake) include(${PROJECT_SOURCE_DIR}/localConfig.cmake) ENDIF() @@ -17,7 +22,7 @@ # default set(LIB_VERSION_MAJOR 0) set(LIB_VERSION_MINOR 6) -set(LIB_VERSION_PATCH 0) +set(LIB_VERSION_PATCH 1) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) set(VERSION "v${LIB_VERSION_STRING}") @@ -68,15 +73,16 @@ # SET(CSXCAD_ROOT_DIR ~/opt/openEMS) find_library(CSXCAD_LIBRARIES NAMES CSXCAD - PATH_SUFFIXES "libCSXCAD" ${CSXCAD_ROOT_DIR}/lib${LIB_SUFFIX} + HINTS ${CSXCAD_ROOT_DIR}/lib${LIB_SUFFIX} NO_CMAKE_FIND_ROOT_PATH ) message(STATUS "CSXCAD_LIBRARIES: ${CSXCAD_LIBRARIES}" ) #TODO test if CSXCADs was found find_path(CSXCAD_INCLUDE_DIR - NAMES ContinuousStructure.h - PATH_SUFFIXES "CSXCAD" ${CSXCAD_ROOT_DIR}/include - NO_CMAKE_FIND_ROOT_PATH + NAMES ContinuousStructure.h + HINTS ${CSXCAD_ROOT_DIR}/include + PATH_SUFFIXES "CSXCAD" ${CSXCAD_INCLUDE_DIR} + NO_CMAKE_FIND_ROOT_PATH ) message(STATUS "CSXCAD_INCLUDE_DIR: ${CSXCAD_INCLUDE_DIR}" ) INCLUDE_DIRECTORIES( ${CSXCAD_INCLUDE_DIR} ) @@ -93,7 +99,10 @@ find_package(VTK 6.1 REQUIRED) else() # prefer >=6.1, fallback to >=5.4 - find_package(VTK REQUIRED) + find_package(VTK 6.1 COMPONENTS vtkGUISupportQt vtkRenderingLOD vtkRenderingOpenGL vtkIOXML vtkIOPLY vtkIOImage vtkInteractionWidgets NO_MODULE) + IF (NOT ${VTK_FOUND}) + find_package(VTK REQUIRED) + endif() endif() message(STATUS "Found package VTK. Using version " ${VTK_VERSION}) @@ -101,35 +110,38 @@ INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIR}) # Qt -# require Qt4 if vtk 5.x is used -# require Qt5 if vtk 6.x is used -set(CMAKE_AUTOMOC ON) -# -# generate rules for building source files from bitmap resources -# SET(RESOURCES resources.qrc) - -if("${VTK_MAJOR_VERSION}" EQUAL 5) +set(CMAKE_AUTOMOC ON) +if(${VTK_VERSION} VERSION_GREATER "6" AND VTK_QT_VERSION VERSION_GREATER "4") + find_package(Qt5Widgets REQUIRED) + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + find_package(Qt5Xml REQUIRED) + include_directories(${Qt5Xml_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${Qt5_INCLUDE_DIRS}) + set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") + QT5_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES}) +else() FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtXml) INCLUDE( ${QT_USE_FILE} ) QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES}) -elseif("${VTK_MAJOR_VERSION}" EQUAL 6) - # prefer Qt5 for vtk 6.x - find_package(Qt5Widgets) - if(Qt5Widgets_FOUND) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - find_package(Qt5Xml REQUIRED) - include_directories(${Qt5Xml_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES(${Qt5_INCLUDE_DIRS}) - set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - QT5_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES}) - else() - FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtXml) - INCLUDE( ${QT_USE_FILE} ) - QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES}) - endif() endif() +if("${VTK_MAJOR_VERSION}" GREATER 5) + set( vtk_LIBS ${VTK_LIBRARIES} ) +else() + set( vtk_LIBS + vtkCommon + vtkFiltering + vtkGraphics + vtkHybrid + vtkIO + vtkRendering + vtkWidgets + QVTK + ) +endif() +message(STATUS "vtk libraries " ${vtk_LIBS}) + set( SOURCES QCSXCAD.cpp QCSGridEditor.cpp @@ -174,7 +186,7 @@ TARGET_LINK_LIBRARIES( QCSXCAD ${CSXCAD_LIBRARIES} tinyxml - ${VTK_LIBRARIES} # give all found libs fo linker + ${vtk_LIBS} ${QT_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/QCSPropEditor.cpp new/QCSXCAD-0.6.1/QCSPropEditor.cpp --- old/QCSXCAD-0.6.0/QCSPropEditor.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/QCSPropEditor.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -232,7 +232,7 @@ QGroupBox* box= new QGroupBox("General"); QGridLayout* grid = new QGridLayout(); - Name = new QLineEdit(QString(clProp->GetName().c_str())); + Name = new QLineEdit(QString::fromUtf8(clProp->GetName().c_str())); Name->setEnabled(QCSX_Settings.GetEdit()); grid->addWidget(new QLabel(tr("Name: ")),0,0); grid->addWidget(Name,0,1); @@ -311,7 +311,7 @@ propGB = BuildPropGroupBox(clProp); - Name->setText(QString(clProp->GetName().c_str())); + Name->setText(QString::fromUtf8(clProp->GetName().c_str())); TypeCB->setCurrentIndex(GetIndexOfType()); FCButton->SetColor(clProp->GetFillColor()); ECButton->SetColor(clProp->GetEdgeColor()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/QCSTreeWidget.cpp new/QCSXCAD-0.6.1/QCSTreeWidget.cpp --- old/QCSXCAD-0.6.0/QCSTreeWidget.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/QCSTreeWidget.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -80,7 +80,7 @@ QString str; if (prop==NULL) return; str=QString(prop->GetTypeXMLString().c_str())+"::"; - str+=QString(prop->GetName().c_str()); + str+=QString::fromUtf8(prop->GetName().c_str()); QTreeWidgetItem* newItem = new QTreeWidgetItem(this,QStringList(str),0); newItem->setFont(0,QFont("Arial",10)); @@ -133,7 +133,7 @@ QTreeWidgetItem* item = topLevelItem(index); if (item==NULL) return; QString str=QString(prop->GetTypeXMLString().c_str())+"::"; - str+=QString(prop->GetName().c_str()); + str+=QString::fromUtf8(prop->GetName().c_str()); item->setText(0,str); if (prop->GetVisibility()) item->setIcon(1,QIcon(":/images/bulb.png")); else item->setIcon(1,QIcon(":/images/bulb_off.png")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/QCSXCAD.cpp new/QCSXCAD-0.6.1/QCSXCAD.cpp --- old/QCSXCAD-0.6.0/QCSXCAD.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/QCSXCAD.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -15,9 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) - #include <QDockWidget> #include <QMessageBox> #include <QFileDialog> @@ -266,7 +263,7 @@ bool QCSXCAD::CheckGeometry() { - QString msg = QString(Update()); + QString msg = QString::fromStdString(Update()); if (msg.isEmpty()) { return true; @@ -792,7 +789,7 @@ { QString filename(dirname); filename.append("/"); - filename.append(prop->GetName().c_str()); + filename.append(QString::fromUtf8(prop->GetName().c_str())); switch (type) { case 0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/QCSXCAD.pro new/QCSXCAD-0.6.1/QCSXCAD.pro --- old/QCSXCAD-0.6.0/QCSXCAD.pro 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/QCSXCAD.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,226 +0,0 @@ -TEMPLATE = lib -TARGET = QCSXCAD - -VERSION = 0.6.0 - -# add git revision -GITREV = $$system(git describe --tags) -isEmpty(GITREV):GITREV=$$VERSION -DEFINES += GIT_VERSION=\\\"$$GITREV\\\" - -# vtk includes deprecated header files; silence the corresponding warning -QMAKE_CXXFLAGS += -Wno-deprecated - -#cgal needs -QMAKE_CXXFLAGS += -frounding-math - -# remove unnecessary webkit define -DEFINES -= QT_WEBKIT - -exists(localPaths.pri) { - include(localPaths.pri) -} - -MOC_DIR = moc -OBJECTS_DIR = obj -QT += core \ - gui \ - xml -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets -} - -HEADERS += QCSXCAD.h \ - QCSGridEditor.h \ - QCSPrimEditor.h \ - QCSPropEditor.h \ - QCSTreeWidget.h \ - QParameterGui.h \ - QVTKStructure.h \ - VTKPrimitives.h \ - QCSXCAD_Global.h \ - export_x3d.h \ - export_pov.h \ - vtkInteractorStyleRubberBand2DPlane.h -SOURCES += QCSXCAD.cpp \ - QCSGridEditor.cpp \ - QCSPrimEditor.cpp \ - QCSPropEditor.cpp \ - QCSTreeWidget.cpp \ - QParameterGui.cpp \ - QVTKStructure.cpp \ - VTKPrimitives.cpp \ - export_x3d.cpp \ - export_pov.cpp \ - QCSXCAD_Global.cpp \ - vtkInteractorStyleRubberBand2DPlane.cpp - -win32 { - DEFINES += BUILD_QCSXCAD_LIB - - isEmpty(WIN32_LIB_ROOT) { - WIN32_LIB_ROOT = .. - } - - # CSXCAD - isEmpty(CSXCAD_ROOT) { - CSXCAD_ROOT = $$WIN32_LIB_ROOT/CSXCAD - } - INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD - LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD0 - - # #3rd party libraries# - # tinyxml - INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include - LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2 - - # vtk - INCLUDEPATH += $$WIN32_LIB_ROOT/vtk/include/vtk-5.10 - LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lQVTK -lvtkRendering -lvtkGraphics -lvtkFiltering -lvtkIO -lvtkHybrid -lvtkWidgets - - #boost, needed by cgal - INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include - LIBS += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread -lboost_system -lboost_date_time -lboost_serialization - #cgal - INCLUDEPATH += $$WIN32_LIB_ROOT/cgal/include - LIBS += -L$$WIN32_LIB_ROOT/cgal/bin -lCGAL -} - -unix:!macx { - # CSXCAD - isEmpty(CSXCAD_ROOT) { - CSXCAD_ROOT = /usr - } - INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD - LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD - - # #3rd party libraries# - # tinyxml - DEFINES += TIXML_USE_STL - - # vtk - isEmpty(VTK_INCLUDEPATH) { - INCLUDEPATH += /usr/include/vtk-5.2 \ - /usr/include/vtk-5.4 \ - /usr/include/vtk-5.6 \ - /usr/include/vtk-5.8 \ - /usr/include/vtk-5.10 \ - /usr/include/vtk-6.0 \ - /usr/include/vtk-6.1 \ - /usr/include/vtk-6.2 \ - /usr/include/vtk-6.3 \ - /usr/include/vtk - } else { - INCLUDEPATH += $$VTK_INCLUDEPATH - } - isEmpty(VTK_LIBRARYPATH){ - } else { - LIBS +=-L$$VTK_LIBRARYPATH - } - !contains(VTK_6, 1) { - LIBS += -lvtkCommon \ - -lvtkFiltering \ - -lvtkGraphics \ - -lvtkHybrid \ - -lvtkIO \ - -lvtkRendering \ - -lvtkWidgets \ - -lQVTK - } else { - LIBS += -lvtkCommonCore$$VTK_6_LIBSUFFIX \ - -lvtkCommonDataModel$$VTK_6_LIBSUFFIX \ - -lvtkIOLegacy$$VTK_6_LIBSUFFIX \ - -lvtkIOXML$$VTK_6_LIBSUFFIX \ - -lvtkIOGeometry$$VTK_6_LIBSUFFIX \ - -lvtkIOPLY$$VTK_6_LIBSUFFIX \ - -lvtkIOImage$$VTK_6_LIBSUFFIX \ - -lvtksys$$VTK_6_LIBSUFFIX \ - -lvtkIOCore$$VTK_6_LIBSUFFIX \ - -lvtkInteractionStyle$$VTK_6_LIBSUFFIX \ - -lvtkInteractionWidgets$$VTK_6_LIBSUFFIX \ - -lvtkFiltersModeling$$VTK_6_LIBSUFFIX \ - -lvtkGUISupportQt$$VTK_6_LIBSUFFIX \ - -lvtkRenderingCore$$VTK_6_LIBSUFFIX \ - -lvtkRenderingVolumeOpenGL$$VTK_6_LIBSUFFIX \ - -lvtkRenderingOpenGL$$VTK_6_LIBSUFFIX \ - -lvtkRenderingFreeTypeOpenGL$$VTK_6_LIBSUFFIX \ - -lvtkRenderingFreeType$$VTK_6_LIBSUFFIX \ - -lvtkRenderingAnnotation$$VTK_6_LIBSUFFIX \ - -lvtkRenderingLOD$$VTK_6_LIBSUFFIX - } -} - -macx { - # CSXCAD - isEmpty(CSXCAD_ROOT) { - CSXCAD_ROOT = /usr - } - INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD - LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD - - # #3rd party libraries# - # tinyxml - DEFINES += TIXML_USE_STL - - # vtk - isEmpty(VTK_INCLUDEPATH) { - INCLUDEPATH += \ - /usr/local/opt/vtk5/include \ - /usr/local/opt/vtk5/include/vtk-5.10 - - } else { - INCLUDEPATH += $$VTK_INCLUDEPATH - } - - LIBS += -L/usr/local/opt/vtk5/lib/vtk-5.10 -lvtkCommon \ - -lvtkFiltering \ - -lvtkGraphics \ - -lvtkHybrid \ - -lvtkIO \ - -lvtkRendering \ - -lvtkWidgets \ - -lQVTK - - LIBS += -ltinyxml - -} - - -FORMS += -RESOURCES += resources.qrc -DEFINES += BUILD_QCSXCAD_LIB -QMAKE_CXXFLAGS_DEBUG = -O0 -g - - -# -# create tar file -# -tarball.target = tarball -tarball.commands = git archive --format=tar --prefix=QCSXCAD-$$VERSION/ HEAD | bzip2 > QCSXCAD-$${VERSION}.tar.bz2 - -QMAKE_EXTRA_TARGETS += tarball - - -# -# INSTALL -# -isEmpty(PREFIX) { - PREFIX = /usr/local -} -install.target = install -install.commands = mkdir -p \"$$PREFIX/lib$$LIB_SUFFIX\" -install.commands += && mkdir -p \"$$PREFIX/include/QCSXCAD\" -install.commands += && cp $$HEADERS \"$$PREFIX/include/QCSXCAD/\" -unix:!macx:install.commands += && cp -at \"$$PREFIX/lib$$LIB_SUFFIX/\" libQCSXCAD.so* -win32:install.commands += && cp -at \"$$PREFIX/lib$$LIB_SUFFIX/\" release/QCSXCAD0.dll -macx:install.commands += && cp libQCSXCAD*.dylib \"$$PREFIX/lib$$LIB_SUFFIX/\" - -QMAKE_EXTRA_TARGETS += install - - -# -# create .PHONY target -# -phony.target = .PHONY -phony.depends = $$QMAKE_EXTRA_TARGETS -QMAKE_EXTRA_TARGETS += phony diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/QParameterGui.cpp new/QCSXCAD-0.6.1/QParameterGui.cpp --- old/QCSXCAD-0.6.0/QParameterGui.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/QParameterGui.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -85,7 +85,7 @@ QGridLayout* lay = new QGridLayout(); lay->addWidget(new QLabel(tr("Name: ")),0,0); - QLineEdit* eName= new QLineEdit(clPara->GetName().c_str()); + QLineEdit* eName= new QLineEdit(QString::fromUtf8(clPara->GetName().c_str())); lay->addWidget(eName,0,1); lay->addWidget(new QLabel(tr("Value: ")),1,0); @@ -126,7 +126,7 @@ void QParameter::Update() { //Name->setText(clPara->GetName()); - setTitle(clPara->GetName().c_str()); + setTitle(QString::fromUtf8(clPara->GetName().c_str())); Value->setText(QString("%1").arg(clPara->GetValue())); if (clPara->GetSweep()) SweepCB->setCheckState(Qt::Checked); else SweepCB->setCheckState(Qt::Unchecked); @@ -162,7 +162,7 @@ QGridLayout* lay = new QGridLayout(); lay->addWidget(new QLabel(tr("Name: ")),0,0); - QLineEdit* eName= new QLineEdit(LP->GetName().c_str()); + QLineEdit* eName= new QLineEdit(QString::fromUtf8(LP->GetName().c_str())); lay->addWidget(eName,0,1); lay->addWidget(new QLabel(tr("Value: ")),1,0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/QVTKStructure.cpp new/QCSXCAD-0.6.1/QVTKStructure.cpp --- old/QCSXCAD-0.6.0/QVTKStructure.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/QVTKStructure.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -15,9 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) - #include <QFileDialog> #include "QVTKStructure.h" @@ -314,7 +311,7 @@ } vtkRectilinearGridGeometryFilter *grid_plane = vtkRectilinearGridGeometryFilter::New(); plane = grid_plane; -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 grid_plane->SetInputData(m_Rect_Grid); #else grid_plane->SetInput(m_Rect_Grid); @@ -351,7 +348,7 @@ vtkStructuredGridGeometryFilter *grid_plane = vtkStructuredGridGeometryFilter::New(); plane = grid_plane; -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 grid_plane->SetInputData(m_Struct_Grid); #else grid_plane->SetInput(m_Struct_Grid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/VTKPrimitives.cpp new/QCSXCAD-0.6.1/VTKPrimitives.cpp --- old/QCSXCAD-0.6.0/VTKPrimitives.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/VTKPrimitives.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -15,9 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) - #include "VTKPrimitives.h" #include "vtkRenderer.h" #include "vtkActorCollection.h" @@ -55,7 +52,7 @@ #include "vtkDiskSource.h" #include "vtkPLYWriter.h" -#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION==6) +#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION>=6) #include "vtkBooleanOperationPolyDataFilter.h" #endif @@ -195,7 +192,7 @@ return; vtkRotationalExtrusionFilter *extrude = vtkRotationalExtrusionFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 extrude->SetInputConnection(PDSource->GetOutputPort()); #else extrude->SetInput(PDSource->GetOutput()); @@ -247,7 +244,7 @@ Source->SetPoint1(TransformCylindricalCoords(dP1,out)); Source->SetPoint2(TransformCylindricalCoords(dP2,out)); - AddPolyData(Source->GetOutput(), dRGB, dOpacity, tf_matrix); + AddPolyData(Source->GetOutputPort(), dRGB, dOpacity, tf_matrix); Source->Delete(); } @@ -300,7 +297,7 @@ profile->SetPoints(points); profile->SetPolys(poly); vtkTriangleFilter *tf = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 tf->SetInputData(profile); #else tf->SetInput(profile); @@ -363,7 +360,7 @@ vtkTubeFilter* m_profileTubes = vtkTubeFilter::New(); m_profileTubes->SetNumberOfSides(iResolution); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_profileTubes->SetInputData(profile); #else m_profileTubes->SetInput(profile); @@ -407,7 +404,7 @@ transform->PostMultiply(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputConnection(Source->GetOutputPort()); #else transformFilter->SetInput(Source->GetOutput()); @@ -434,7 +431,7 @@ // extrude in +z vtkLinearExtrusionFilter *linearExtrusionFilter = vtkLinearExtrusionFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 linearExtrusionFilter->SetInputConnection( diskSource->GetOutputPort() ); #else linearExtrusionFilter->SetInput( diskSource->GetOutput() ); @@ -480,14 +477,14 @@ Source->SetPhiResolution(iResolution); Source->SetThetaResolution(iResolution); - AddPolyData(Source->GetOutput(), dRGB, dOpacity, tf_matrix); + AddPolyData(Source->GetOutputPort(), dRGB, dOpacity, tf_matrix); Source->Delete(); } void VTKPrimitives::AddSphericalShell(const double *dCenter, double r_i, double r_o, double *dRGB, double dOpacity, int iResolution, const double* tf_matrix) {//complete -#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION==6) +#if (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION>=10) || (VTK_MAJOR_VERSION>=6) vtkSphereSource *Source_o = vtkSphereSource::New(); double center[3]={dCenter[0],dCenter[1],dCenter[2]}; Source_o->SetCenter(center); @@ -507,7 +504,7 @@ boolFilter->SetInputConnection(1, Source_i->GetOutputPort()); //todo, we should remove the unnecessary scalar data produced by the filter... - AddPolyData(boolFilter->GetOutput(), dRGB, dOpacity, tf_matrix); + AddPolyData(boolFilter->GetOutputPort(), dRGB, dOpacity, tf_matrix); boolFilter->Delete(); Source_o->Delete(); @@ -543,7 +540,7 @@ transform->PostMultiply(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputConnection(Source->GetOutputPort()); #else transformFilter->SetInput(Source->GetOutput()); @@ -566,7 +563,7 @@ vtkTransformPolyDataFilter* filter = vtkTransformPolyDataFilter::New(); vtkTransform* vtrans = vtkTransform::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputConnection(text->GetOutputPort()); #else filter->SetInput(text->GetOutput()); @@ -629,7 +626,7 @@ profile->SetPoints(points); profile->SetPolys(poly); vtkTriangleFilter *tf = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 tf->SetInputData(profile); #else tf->SetInput(profile); @@ -658,7 +655,7 @@ transformFilter->SetInputConnection(extrude->GetOutputPort()); transformFilter->SetTransform(transform); - AddPolyData(transformFilter->GetOutput(), dRGB, dOpacity, tf_matrix); + AddPolyData(transformFilter->GetOutputPort(), dRGB, dOpacity, tf_matrix); points->Delete(); poly->Delete(); @@ -698,7 +695,7 @@ profile->SetPoints(points); profile->SetLines(poly); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 extrude->SetInputData(profile); #else extrude->SetInput(profile); @@ -771,7 +768,7 @@ { vtkTransformPolyDataFilter* filter = vtkTransformPolyDataFilter::New(); vtkTransform* vtrans = vtkTransform::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(polydata); #else filter->SetInput(polydata); @@ -780,7 +777,7 @@ vtrans->SetMatrix(tf_matrix); filter->SetTransform(vtrans); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_PolyDataCollection->AddInputData(filter->GetOutput()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); @@ -814,7 +811,7 @@ vtrans->SetMatrix(tf_matrix); filter->SetTransform(vtrans); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 m_PolyDataCollection->AddInputData(filter->GetOutput()); #else m_PolyDataCollection->AddInput(filter->GetOutput()); @@ -857,7 +854,7 @@ if (scale==1.0) { -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(m_PolyDataCollection->GetOutput()); #else writer->SetInput(m_PolyDataCollection->GetOutput()); @@ -869,7 +866,7 @@ vtkTransform *transform = vtkTransform::New(); vtkTransformPolyDataFilter *transformFilter = vtkTransformPolyDataFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 transformFilter->SetInputData(m_PolyDataCollection->GetOutput()); #else transformFilter->SetInput(m_PolyDataCollection->GetOutput()); @@ -877,7 +874,7 @@ transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); @@ -897,7 +894,7 @@ vtkTriangleFilter* filter = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(m_PolyDataCollection->GetOutput()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); @@ -919,7 +916,7 @@ transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); @@ -939,7 +936,7 @@ vtkTriangleFilter* filter = vtkTriangleFilter::New(); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 filter->SetInputData(m_PolyDataCollection->GetOutput()); #else filter->SetInput(m_PolyDataCollection->GetOutput()); @@ -962,7 +959,7 @@ transform->Scale(scale,scale,scale); transformFilter->SetTransform(transform); -#if VTK_MAJOR_VERSION==6 +#if VTK_MAJOR_VERSION>=6 writer->SetInputData(transformFilter->GetOutput()); #else writer->SetInput(transformFilter->GetOutput()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/export_pov.cpp new/QCSXCAD-0.6.1/export_pov.cpp --- old/QCSXCAD-0.6.0/export_pov.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/export_pov.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -15,9 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) - #include <QMessageBox> #include <QtXml> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QCSXCAD-0.6.0/export_x3d.cpp new/QCSXCAD-0.6.1/export_x3d.cpp --- old/QCSXCAD-0.6.0/export_x3d.cpp 2015-10-10 14:15:48.000000000 +0200 +++ new/QCSXCAD-0.6.1/export_x3d.cpp 2016-05-12 21:19:34.000000000 +0200 @@ -15,9 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) - #include <QMessageBox> #include <QVTKWidget.h>
