#include <QApplication>
#include <QRegExp>
+#include <stdio.h>
+
#ifdef WIN32
#include <windows.h>
#else
nodist_salomeres_DATA = \
CAM_msg_en.qm \
- CAM_msg_en.qm
+ CAM_msg_fr.qm
libCAM_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx
libCAM_la_LDFLAGS = $(QT_MT_LIBS)
// New window
int windowMenu = createMenu( tr( "MEN_DESK_WINDOW" ), -1, MenuWindowId, 100 );
int newWinMenu = createMenu( tr( "MEN_DESK_NEWWINDOW" ), windowMenu, -1, 0 );
- int restoreWinMenu = createMenu( tr( "MEN_DESK_RESTORE" ), windowMenu, -1, 0 );
createAction( CloseId, tr( "TOT_CLOSE" ), QIcon(), tr( "MEN_DESK_CLOSE" ), tr( "PRP_CLOSE" ),
Qt::SHIFT+Qt::Key_C, desk, false, this, SLOT( onCloseWindow() ) );
createActionForViewer( NewGraphicsViewId, newWinMenu, QString::number( 5 ), Qt::ALT+Qt::Key_R );
#endif
- createAction( RestoreDefaultId, tr( "TOT_RESTORE_DEFAULT" ), QIcon(),
- tr( "MEN_DESK_RESTORE_DEFAULT" ), tr( "PRP_RESTORE_DEFAULT" ),
- 0, desk, false, this, SLOT( onRestoreDefault() ) );
-
- createAction( RestoreFromPrefsId, tr( "TOT_RESTORE_FROM_PREFERENCES" ), QIcon(),
- tr( "MEN_DESK_RESTORE_FROM_PREFERENCES" ), tr( "PRP_RESTORE_FROM_PREFERENCES" ),
- 0, desk, false, this, SLOT( onRestoreFromPreferences() ) );
-
- createMenu( RestoreDefaultId, restoreWinMenu, -1 );
- createMenu( RestoreFromPrefsId, restoreWinMenu, -1 );
-
createAction( RenameId, tr( "TOT_RENAME" ), QIcon(), tr( "MEN_DESK_RENAME" ), tr( "PRP_RENAME" ),
Qt::SHIFT+Qt::Key_R, desk, false, this, SLOT( onRenameWindow() ) );
createMenu( RenameId, windowMenu, -1 );
if( a )
a->setEnabled( activeStudy() );
#endif
-
- a = action( RestoreDefaultId );
- if( a )
- a->setEnabled( activeStudy() );
-
- a = action( RestoreFromPrefsId );
- if( a )
- a->setEnabled( activeStudy() );
}
/*!
}
// Default Module Preferences
- int moduleGroup = pref->addPreference( tr( "PREF_DEFAULT_MODULE" ), genTab );
- int moduleNameCombo = pref->addPreference( tr( "PREF_DEF_MODULE_NAME" ), moduleGroup, LightApp_Preferences::Selector, "Activate", "def_module" );
- aValuesList.clear();
- anIndicesList.clear();
- aValuesList << tr("PREF_DEF_MODULE_NONE") << tr("PREF_DEF_MODULE_CATHARE") << tr("PREF_DEF_MODULE_DIAGRAM");
- anIndicesList << 0 << 1 << 2 ;
- pref->setItemProperty( "strings", aValuesList, moduleNameCombo );
- pref->setItemProperty( "indexes", anIndicesList, moduleNameCombo );
+ QStringList aModuleNames;
+ modules( aModuleNames, false );
+ if ( aModuleNames.count() > 1 )
+ {
+ int moduleGroup = pref->addPreference( tr( "PREF_DEFAULT_MODULE" ), genTab );
+ int moduleNameCombo = pref->addPreference( tr( "PREF_DEF_MODULE_NAME" ), moduleGroup, LightApp_Preferences::Selector, "Activate", "def_module" );
+ aValuesList.clear();
+ anIndicesList.clear();
+ aValuesList.append( tr("PREF_DEF_MODULE_NONE") );
+ anIndicesList.append( 0 );
+ QStringList::iterator it = aModuleNames.begin();
+ for ( int ind = 1; it != aModuleNames.end(); ++it, ++ind )
+ {
+ const QString& modName = *it;
+ aValuesList.append( modName );
+ anIndicesList.append( ind );
+ }
+
+ pref->setItemProperty( "strings", aValuesList, moduleNameCombo );
+ pref->setItemProperty( "indexes", anIndicesList, moduleNameCombo );
+ }
// theme values
Style_Model* aSModel = 0;
/*!
Loads windows geometry
*/
-void LightApp_Application::loadDockWindowsState( const bool theIsForced )
+void LightApp_Application::loadDockWindowsState()
{
if ( !desktop() )
return;
bool store = resourceMgr()->booleanValue( "Study", "store_positions", true );
- if ( !theIsForced && !store )
+ if( !store )
return;
QString modName;
wgStack->stack();
}
-/*!
- Restore default state of application windows
-*/
-void LightApp_Application::onRestoreDefault()
-{
- if ( !activeStudy() || !desktop() )
- return;
-
- QMap<int, int> winMap;
- bool restored = false;
-
- if ( activeModule() && activeModule()->inherits( "LightApp_Module" ) )
- {
- ((LightApp_Module*)activeModule())->windows( winMap );
- restored = ((LightApp_Module*)activeModule())->defaultWindowsState();
- }
-
- if ( !restored )
- {
- if( winMap.isEmpty() )
- defaultWindows( winMap );
-
- QMap<int, int>::const_iterator winMapIt = winMap.constBegin();
- for ( ; winMapIt != winMap.constEnd(); ++winMapIt )
- {
- QWidget* win = dockWindow( winMapIt.key() );
- QDockWidget* dock = ::qobject_cast<QDockWidget*>( win );
- if ( !dock )
- dock = windowDock( win );
-
- if ( dock )
- {
- if ( !dock->isVisible() )
- dock->setVisible( true );
-
- if ( dock->isFloating() )
- dock->setFloating( false );
-
- desktop()->addDockWidget( (Qt::DockWidgetArea)winMapIt.value(), dock );
- }
- }
-
- QList<QToolBar*> tbList = qFindChildren<QToolBar*>( desktop() );
- for ( QList<QToolBar*>::iterator tit = tbList.begin(); tit != tbList.end(); ++tit )
- {
- QToolBar* tb = *tit;
-
- QObject* po = Qtx::findParent( tb, "QMainWindow" );
- if ( po != desktop() )
- continue;
-
- if ( !tb->isVisible() )
- tb->setVisible( true );
-
- desktop()->addToolBar( Qt::TopToolBarArea, tb );
- }
- }
-}
-
-/*!
- Restore application windows state from preferences file
-*/
-void LightApp_Application::onRestoreFromPreferences()
-{
- if ( !activeStudy() || !desktop() )
- return;
-
- loadDockWindowsState( true );
-}
-
/*!
\return if the library of module exists
\param moduleTitle - title of module
enum { RenameId = CAM_Application::UserID,
CloseId, CloseAllId, GroupAllId,
- RestoreDefaultId, RestoreFromPrefsId,
PreferencesId, MRUId, ModulesListId,
NewGLViewId, NewPlot2dId, NewOCCViewId, NewVTKViewId, NewQxGraphViewId,
NewGraphicsViewId, UserID };
void onCloseWindow();
void onCloseAllWindow();
void onGroupAllWindow();
- void onRestoreDefault();
- void onRestoreFromPreferences();
protected:
void updateWindows();
void updateViewManagers();
void updateModuleActions();
- void loadDockWindowsState( const bool theIsForced = false );
+ void loadDockWindowsState();
void saveDockWindowsState();
virtual void studyOpened( SUIT_Study* );
{
}
-/*!NOT IMPLEMENTED*/
-bool LightApp_Module::defaultWindowsState()
-{
- return false;
-}
-
/*!NOT IMPLEMENTED*/
void LightApp_Module::viewManagers( QStringList& ) const
{
virtual QString updateDesktopTitle( const QString& );
// Custom update desktop title
- virtual bool defaultWindowsState();
- // Custom restore the default windows state
-
public slots:
virtual bool activateModule( SUIT_Study* );
virtual bool deactivateModule( SUIT_Study* );
<source>PRP_GROUP_ALL</source>
<translation>Group all windows</translation>
</message>
- <message>
- <source>MEN_DESK_RESTORE</source>
- <translation>Restore windows &state</translation>
- </message>
- <message>
- <source>TOT_RESTORE_DEFAULT</source>
- <translation>By Default</translation>
- </message>
- <message>
- <source>MEN_DESK_RESTORE_DEFAULT</source>
- <translation>&By Default</translation>
- </message>
- <message>
- <source>PRP_RESTORE_DEFAULT</source>
- <translation>Restore windows state by default</translation>
- </message>
- <message>
- <source>TOT_RESTORE_FROM_PREFERENCES</source>
- <translation>From Preferences</translation>
- </message>
- <message>
- <source>MEN_DESK_RESTORE_FROM_PREFERENCES</source>
- <translation>&From Preferences</translation>
- </message>
- <message>
- <source>PRP_RESTORE_FROM_PREFERENCES</source>
- <translation>Restore windows state from preferences file</translation>
- </message>
<message>
<source>ERR_DOC_NOT_EXISTS</source>
<translation>Can not open %1.
<source>PRP_GROUP_ALL</source>
<translation type="unfinished">Grouper toutes les fenêtres</translation>
</message>
- <message>
- <source>MEN_DESK_RESTORE</source>
- <translation>Redimensionner les fenêtres</translation>
- </message>
- <message>
- <source>TOT_RESTORE_DEFAULT</source>
- <translation>Par défaut</translation>
- </message>
- <message>
- <source>MEN_DESK_RESTORE_DEFAULT</source>
- <translation>&Défaut</translation>
- </message>
- <message>
- <source>PRP_RESTORE_DEFAULT</source>
- <translation>Redimensionner les fenêtres par défaut.</translation>
- </message>
- <message>
- <source>TOT_RESTORE_FROM_PREFERENCES</source>
- <translation>Selon les préférences</translation>
- </message>
- <message>
- <source>MEN_DESK_RESTORE_FROM_PREFERENCES</source>
- <translation>&Préférences</translation>
- </message>
- <message>
- <source>PRP_RESTORE_FROM_PREFERENCES</source>
- <translation> Redimensionner les fenêtres selon le fichier de préférences.</translation>
- </message>
<message>
<source>ERR_DOC_NOT_EXISTS</source>
<translation type="unfinished">Impossible d'ouvrir %1.
{
QHelpEvent* help = static_cast<QHelpEvent*>( e );
QWidget* w = QApplication::widgetAt( help->globalPos() );
- if ( w && Qtx::isParent( w, this ) )
+ if ( w && w != this && Qtx::isParent( w, this ) )
{
QHelpEvent he( help->type(), w->mapFromGlobal( help->globalPos() ), help->globalPos() );
QApplication::sendEvent( w, &he );
#include <QMessageBox>
#include <QDesktopWidget>
+#include <stdio.h>
+
/*!
\class ProgressEvent
\internal
#include <QStackedWidget>
#include <QAbstractButton>
+#include <stdio.h>
+
/*!
\class QtxWorkstackArea::WidgetEvent
\internal
#include "SUIT_DataObject.h"
#include "SUIT_DataObjectKey.h"
+#include <stdio.h>
+
SUIT_DataObject::Signal* SUIT_DataObject::mySignal = 0;
/*!
::SALOME_Actor():
myRenderer(NULL),
myInteractor(NULL),
+ myPrehighlightedCellId(-1),
mySelectionMode(ActorSelection),
myPreHighlightActor(SVTK_Actor::New()),
myHighlightActor(SVTK_Actor::New()),
SVTK_SelectionEvent* theSelectionEvent,
bool theIsHighlight)
{
+ myPrehighlightedCellId = -1;
if ( !GetPickable() )
return false;
if ( anObjId >= 0 ) {
myIsPreselected = CheckDimensionId(aSelectionMode,this,anObjId);
if(myIsPreselected){
+ myPrehighlightedCellId = anObjId;
const TColStd_IndexedMapOfInteger& aMapIndex = myPreHighlightActor->GetMapIndex();
int anExtent = aMapIndex.Extent();
anIsChanged |= (anExtent == 0 || anExtent > 0 && anObjId != aMapIndex(1));
return anIsChanged;
}
+/*!
+ Returns id of the prehighlighted cell (-1 if no cell is highlighted)
+*/
+int
+SALOME_Actor
+::GetPrehighlightedCellId() const
+{
+ return myPrehighlightedCellId;
+}
+
/*!
To process highlight (called from SVTK_InteractorStyle)
*/
SVTK_SelectionEvent* theSelectionEvent,
bool theIsHighlight);
+ //! Returns id of the prehighlighted cell (-1 if no cell is highlighted)
+ virtual
+ int
+ GetPrehighlightedCellId() const;
+
//! To process highlight (called from #SVTK_InteractorStyle)
virtual
bool
Handle(SALOME_InteractiveObject) myIO;
+ int myPrehighlightedCellId;
+
SALOME_Actor();
~SALOME_Actor();
int aPartId = theMapIndex( i+1 );
if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){
aPoints->SetPoint(i,aCoord);
- myUnstructuredGrid->InsertNextCell(VTK_VERTEX,1,&i);
+ myUnstructuredGrid->InsertNextCell(VTK_VERTEX,1,(vtkIdType*)&i);
}
}
myUnstructuredGrid->SetPoints(aPoints);
#include "VTKViewer_Transform.h"
#include "VTKViewer_Utilities.h"
-#include <vtkCamera.h>
-#include <vtkRenderer.h>
-#include <vtkTextProperty.h>
-#include <vtkObjectFactory.h>
+#include <vtkAbstractVolumeMapper.h>
#include <vtkCallbackCommand.h>
-
+#include <vtkCamera.h>
+#include <vtkDataSet.h>
+#include <vtkGenericCell.h>
+#include <vtkMapper.h>
#include <vtkPicker.h>
#include <vtkPointPicker.h>
-#include <vtkCellPicker.h>
-
#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkTextProperty.h>
+#include <vtkObjectFactory.h>
// undefining min and max because CASCADE's defines them and
// it clashes with std::min(), std::max() included in utilities.h
#undef min
#undef max
-
vtkStandardNewMacro(SVTK_Renderer);
+vtkStandardNewMacro(SVTK_CellPicker);
/*!
Constructor
myPriority(0.0),
myEventCallbackCommand(vtkCallbackCommand::New()),
myPointPicker(vtkPointPicker::New()),
- myCellPicker(vtkCellPicker::New()),
+ myCellPicker(SVTK_CellPicker::New()),
myPointRectPicker(SVTK_RectPicker::New()),
myCellRectPicker(SVTK_RectPicker::New()),
myPreHighlightProperty(vtkProperty::New()),
aCamera->SetFocalPoint(0,0,0);
this->OnFitAll();
}
+
+/*!
+ SVTK_CellPicker constructor
+*/
+SVTK_CellPicker::SVTK_CellPicker()
+{
+ this->Cell = vtkGenericCell::New();
+}
+
+/*!
+ SVTK_CellPicker destructor
+*/
+SVTK_CellPicker::~SVTK_CellPicker()
+{
+ this->Cell->Delete();
+}
+
+/*!
+ Redefined virtual method of the vtkCellPicker class
+*/
+double SVTK_CellPicker::IntersectWithLine(double p1[3], double p2[3], double tol,
+ vtkAssemblyPath *path,
+ vtkProp3D *prop3D,
+ vtkAbstractMapper3D *m)
+{
+ vtkIdType numCells, cellId, minCellId;
+ int i, minSubId, subId;
+ double x[3], tMin, t, pcoords[3], minXYZ[3], minPcoords[3];
+ vtkDataSet *input;
+ vtkMapper *mapper;
+ vtkAbstractVolumeMapper *volumeMapper;
+
+ // Get the underlying dataset
+ if ( (mapper=vtkMapper::SafeDownCast(m)) != NULL )
+ {
+ input = mapper->GetInput();
+ }
+ else if ( (volumeMapper=vtkAbstractVolumeMapper::SafeDownCast(m)) != NULL )
+ {
+ input = volumeMapper->GetDataSetInput();
+ }
+ else
+ {
+ return VTK_DOUBLE_MAX;
+ }
+
+ if ( (numCells = input->GetNumberOfCells()) < 1 )
+ {
+ return 2.0;
+ }
+
+ // Intersect each cell with ray. Keep track of one closest to
+ // the eye (within the tolerance tol) and within the clipping range).
+ // Note that we fudge the "closest to" (tMin+this->Tolerance) a little and
+ // keep track of the cell with the best pick based on parametric
+ // coordinate (pick the minimum, maximum parametric distance). This
+ // breaks ties in a reasonable way when cells are the same distance
+ // from the eye (like cells lying on a 2D plane).
+ //
+ minCellId = -1;
+ minSubId = -1;
+ pcoords[0] = pcoords[1] = pcoords[2] = 0;
+ double pDistMin=VTK_DOUBLE_MAX, pDist;
+ for (tMin=VTK_DOUBLE_MAX,cellId=0; cellId<numCells; cellId++)
+ {
+ input->GetCell(cellId, this->Cell);
+
+ if ( this->Cell->IntersectWithLine(p1, p2, tol, t, x, pcoords, subId)
+ && t <= (tMin+this->Tolerance) )
+ {
+ pDist = this->Cell->GetParametricDistance(pcoords);
+ // This is the only difference of this method from the vtkCellPicker's one
+ static double aTolerance = 1E-7;
+ //if ( pDist < pDistMin || (pDist == pDistMin && t < tMin ) )
+ if ( pDist < pDistMin || (pDist == pDistMin && t < tMin + aTolerance ) )
+ {
+ minCellId = cellId;
+ minSubId = subId;
+ for (i=0; i<3; i++)
+ {
+ minXYZ[i] = x[i];
+ minPcoords[i] = pcoords[i];
+ }
+ tMin = t;
+ pDistMin = pDist;
+// cout << "cell id: " << minCellId << "\n";
+ }//if minimum, maximum
+ }//if a close cell
+ }//for all cells
+
+ // Now compare this against other actors.
+ //
+ if ( minCellId>(-1) && tMin < this->GlobalTMin )
+ {
+ this->MarkPicked(path, prop3D, m, tMin, minXYZ);
+ this->CellId = minCellId;
+ this->SubId = minSubId;
+ for (i=0; i<3; i++)
+ {
+ this->PCoords[i] = minPcoords[i];
+ }
+ vtkDebugMacro("Picked cell id= " << minCellId);
+ }
+ return tMin;
+}
#include <vtkObject.h>
#include <vtkSmartPointer.h>
+#include <vtkCellPicker.h>
class vtkRenderer;
class vtkCallbackCommand;
class vtkPicker;
class vtkPointPicker;
-class vtkCellPicker;
class vtkProperty;
class SVTK_RectPicker;
class SVTK_CubeAxesActor2D;
class VTKViewer_Actor;
class SVTK_Selector;
+class SVTK_CellPicker;
#ifdef WIN32
#pragma warning ( disable:4251 )
//----------------------------------------------------------------------------
// Highlight/ Prehighlight devices
vtkSmartPointer<vtkPointPicker> myPointPicker;
- vtkSmartPointer<vtkCellPicker> myCellPicker;
+ vtkSmartPointer<SVTK_CellPicker> myCellPicker;
vtkSmartPointer<SVTK_RectPicker> myPointRectPicker;
vtkSmartPointer<SVTK_RectPicker> myCellRectPicker;
vtkFloatingPointType myBndBox[6];
};
+/*!
+ \class SVTK_CellPicker
+ The class is intended to redefine the IntersectWithLine()
+ to correct the mechanism of picking coincident cells
+*/
+class SVTK_CellPicker : public vtkCellPicker
+{
+public:
+ static SVTK_CellPicker* New();
+ vtkTypeMacro(SVTK_CellPicker,vtkCellPicker);
+
+protected:
+ SVTK_CellPicker();
+ ~SVTK_CellPicker();
+
+ virtual double IntersectWithLine(double p1[3], double p2[3], double tol,
+ vtkAssemblyPath *path, vtkProp3D *p,
+ vtkAbstractMapper3D *m);
+
+private:
+ vtkGenericCell *Cell; //used to accelerate picking
+
+private:
+ SVTK_CellPicker(const SVTK_CellPicker&); // Not implemented.
+ void operator=(const SVTK_CellPicker&); // Not implemented.
+};
+
#ifdef WIN32
//#pragma warning ( default:4251 )
#endif
{
for ( i=0; i < numFacePts; i++)
aNewPts[i] = pts[faceVerts[i]];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
{
for ( i=0; i < numFacePts; i++)
aNewPts[i] = pts[faceVerts[PixelConvert[i]]];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
{
for ( i=0; i < numFacePts; i++)
aNewPts[i] = pts[faceVerts[i]];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
{
for ( i=0; i < numFacePts; i++)
aNewPts[i] = pts[faceVerts[i]];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
{
for ( i=0; i < numFacePts; i++)
aNewPts[i] = pts[faceVerts[i]];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
for (i=0; i < pts->GetNumberOfIds(); i+=2) {
aNewPts[0] = pts->GetId(i);
aNewPts[1] = pts->GetId(i+1);
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[0] = pts->GetId(i);
aNewPts[1] = pts->GetId(i+1);
aNewPts[2] = pts->GetId(i+2);
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[0] = pts->GetId(i);
aNewPts[1] = pts->GetId(i+1);
aNewPts[2] = pts->GetId(i+2);
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[2] = pts[1];
aNewPts[1] = pts[2];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[4] = pts[2];
aNewPts[5] = pts[5];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[6] = pts[3];
aNewPts[7] = pts[7];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[4] = pts[2];
aNewPts[5] = pts[6];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[4] = pts[1];
aNewPts[5] = pts[4];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[4] = pts[2];
aNewPts[5] = pts[5];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[4] = pts[0];
aNewPts[5] = pts[6];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[3] = pts[7];
aNewPts[4] = pts[2];
aNewPts[5] = pts[8];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[3] = pts[10];
aNewPts[4] = pts[5];
aNewPts[5] = pts[11];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[5] = pts[11];
aNewPts[6] = pts[3];
aNewPts[7] = pts[12];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[5] = pts[14];
aNewPts[6] = pts[2];
aNewPts[7] = pts[7];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[5] = pts[13];
aNewPts[6] = pts[1];
aNewPts[7] = pts[6];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
outputCD->CopyData(cd,cellId,newCellId);
aNewPts[6] = pts[4];
aNewPts[7] = pts[16];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[6] = pts[5];
aNewPts[7] = pts[17];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[6] = pts[6];
aNewPts[7] = pts[18];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[6] = pts[7];
aNewPts[7] = pts[19];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[6] = pts[3];
aNewPts[7] = pts[11];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
aNewPts[6] = pts[7];
aNewPts[7] = pts[15];
- newCellId = output->InsertNextCell(aCellType,numFacePts,aNewPts);
+ newCellId = output->InsertNextCell(aCellType,numFacePts,(vtkIdType*)aNewPts);
if(myStoreMapping)
myVTK2ObjIds.push_back(cellId);
