From: fkl Date: Mon, 1 Jul 2013 12:53:08 +0000 (+0000) Subject: Update for migration from 6.6 version to v7_main version X-Git-Tag: V7_3_0a1~30 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1028974c31bb7e1797c4da775cf0b057bb3235bf;p=modules%2Fhexablock.git Update for migration from 6.6 version to v7_main version Francis Kloss --- diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx index d7eb83a..32eea50 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx @@ -142,7 +142,6 @@ SalomeApp_Application* HEXABLOCKGUI::myApplication = NULL; HEXABLOCKGUI::HEXABLOCKGUI() : SalomeApp_Module( "HEXABLOCK" ), - LightApp_Module( "HEXABLOCK" ), _menuId(190), _dwPattern(0), _dwAssociation(0), diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx index d795a38..07eb8f3 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx @@ -111,7 +111,7 @@ Document_Actor::Document_Actor( Document* doc, const QString& entry ): setIO(anIO); vtkUnstructuredGrid* aGrid = getUnstructuredGrid(); vtkDataSetMapper* aMapper = vtkDataSetMapper::New(); - aMapper->SetInput(aGrid); + aMapper->SetInputData(aGrid); aGrid->Delete(); SetVisibility( true );//VisibilityOff(); @@ -306,7 +306,7 @@ Associate_Actor::Associate_Actor( Document* doc, const QString& entry) vtkUnstructuredGrid* aGrid = getUnstructuredGrid(); vtkDataSetMapper* aMapper = vtkDataSetMapper::New(); - aMapper->SetInput(aGrid); + aMapper->SetInputData(aGrid); aGrid->Delete(); SetVisibility( true );//VisibilityOff(); @@ -981,7 +981,7 @@ void VtkDocumentGraphicView::setModel ( QAbstractItemModel * model ) // // Create and display actor // // vtkDataSetMapper* myMapper = vtkDataSetMapper::New(); -// myMapper->SetInput(myGrid); +// myMapper->SetInputData(myGrid); // // // if ( myPreviewActor ){ // // myVTKViewWindow->RemoveActor(myPreviewActor);