cvs problem during frist committ. repeated

This commit is contained in:
ganovelli 2006-12-10 22:17:18 +00:00
parent ebfacd2db3
commit cbe27a6f0e
3 changed files with 4 additions and 5 deletions

View File

@ -70,9 +70,9 @@ QSize GLWidget::sizeHint() const
return QSize(400, 400); return QSize(400, 400);
} }
void GLWidget::LoadTriMesh( char* namefile) void GLWidget::LoadTriMesh(QString &namefile)
{ {
vcg::tri::io::ImporterPLY<MyStraightMesh>::Open(mesh,namefile); vcg::tri::io::ImporterPLY<MyStraightMesh>::Open(mesh,namefile.toAscii());
vcg::tri::UpdateBounding<MyStraightMesh>::Box(mesh); vcg::tri::UpdateBounding<MyStraightMesh>::Box(mesh);
vcg::tri::UpdateNormals<MyStraightMesh>::PerFace(mesh); vcg::tri::UpdateNormals<MyStraightMesh>::PerFace(mesh);
vcg::tri::UpdateNormals<MyStraightMesh>::PerVertex(mesh); vcg::tri::UpdateNormals<MyStraightMesh>::PerVertex(mesh);
@ -88,7 +88,7 @@ void GLWidget::OpenFile(){
if (fileName.isEmpty()) return; if (fileName.isEmpty()) return;
else else
LoadTriMesh((char*)fileName.data()); LoadTriMesh( fileName );
} }

View File

@ -57,7 +57,7 @@ public slots:
void flipE( ); void flipE( );
void flipF( ); void flipF( );
void nextE( ); void nextE( );
void LoadTriMesh( char* namefile); void LoadTriMesh(QString& namefile);
void OpenFile(); void OpenFile();
protected: protected:

View File

@ -52,7 +52,6 @@ Window::Window()
mainLayout->addWidget(ldButton); mainLayout->addWidget(ldButton);
setLayout(mainLayout); setLayout(mainLayout);
glWidget->LoadTriMesh("torus.ply");
glWidget->glWrap.m = &glWidget->mesh; glWidget->glWrap.m = &glWidget->mesh;
setWindowTitle(tr("TriMesh Pos Demo")); setWindowTitle(tr("TriMesh Pos Demo"));