@@ -51,7 +51,7 @@ using namespace Mgx3D::QtComponents;
5151
5252#undef LOCK_INSTANCE
5353#define LOCK_INSTANCE AutoReferencedMutex autoReferencedMutex (TkUtil::ObjectBase::getMutex ( ));
54- const string ERD_INTERNAL_EXTENSION_EXT ( " erd " );
54+
5555
5656namespace Mgx3D
5757{
@@ -581,7 +581,7 @@ void QtVtkMgx3DMainWindow::saveAsRaysCallback ( )
581581 }
582582 else
583583#endif // USE_EXPERIMENTAL_ROOM_TRAYS
584- if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION_EXT ) || ((true == dialog.selectedNameFilter ( ).startsWith (" Experimental Room Description" )) && ((false == file.exists ( )) || (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( ))))))
584+ if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION ) || ((true == dialog.selectedNameFilter ( ).startsWith (" Experimental Room Description" )) && ((false == file.exists ( )) || (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( ))))))
585585 {
586586 ioManager = dynamic_cast <ExperimentalRoomERDIOManager*>(_experimentalRoomPanel->getRaysIOManager ( ));
587587 if (0 == ioManager)
@@ -680,12 +680,9 @@ défini (Menu Chambre expérimentale).", Charset::UTF_8));
680680 const bool eraseAppData= !file.isWritable ( );
681681 ExperimentalRoomIOManager* ioManager = 0 ;
682682 ExperimentalRoom* room = 0 ;
683- cout << __FILE__ << ' ' << __LINE__ << " QtVtkMgx3DMainWindow::loadRays File=" << file.getFullFileName ( ) << " Ext=" << file.getExtension ( ) << " ERD_EXT=" << ERD_INTERNAL_EXTENSION_EXT << endl;
684- if (file.getExtension ( ) == ERD_INTERNAL_EXTENSION_EXT) cout << " IT IS ERD" << endl;
685- else cout << " IT IS NOT ERD" << endl;
686- if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION_EXT) || ((file.getExtension ( ) == " xml" ) && (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( )))))
683+
684+ if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION) || ((file.getExtension ( ) == " xml" ) && (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( )))))
687685 {
688- cout << __FILE__ << ' ' << __LINE__ << " QtVtkMgx3DMainWindow::loadRays File=" << file.getFullFileName ( ) << " Ext=" << file.getExtension ( ) << endl;
689686 ioManager = new ExperimentalRoomERDIOManager ( );
690687 room = new ExperimentalRoom (file.getFileName ( ), ExperimentalRoom::TARGET);
691688 ioManager->getReader ( ).loadRoom (file.getFullFileName ( ), *room, ExperimentRay::LASER, ExperimentRay::CARTESIAN_EXP_ROOM);
@@ -814,7 +811,7 @@ void QtVtkMgx3DMainWindow::saveAsDiagsCallback ( )
814811 }
815812 else
816813#endif // USE_EXPERIMENTAL_ROOM_TRAYS
817- if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION_EXT ) || ((true == dialog.selectedNameFilter ( ).startsWith (" Experimental Room Description" )) && ((false == file.exists ( )) || (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( ))))))
814+ if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION ) || ((true == dialog.selectedNameFilter ( ).startsWith (" Experimental Room Description" )) && ((false == file.exists ( )) || (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( ))))))
818815 {
819816 ioManager = dynamic_cast <ExperimentalRoomERDIOManager*>(_experimentalRoomPanel->getDiagsIOManager ( ));
820817 if (0 == ioManager)
@@ -884,7 +881,7 @@ défini (Menu Chambre expérimentale).", Charset::UTF_8));
884881 // Faudra t'il détruire les données applicatives de la chambre ?
885882 const bool eraseAppData = !file.isWritable ( );
886883
887- if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION_EXT ) || ((file.getExtension ( ) == " xml" ) && (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( )))))
884+ if ((file.getExtension ( ) == ERD_INTERNAL_EXTENSION ) || ((file.getExtension ( ) == " xml" ) && (ExperimentalRoomERDIOManager::isERDFile (file.getFullFileName ( )))))
888885 {
889886 ExperimentalRoomERDIOManager* ioManager = new ExperimentalRoomERDIOManager ( );
890887 ExperimentalRoom* room = new ExperimentalRoom (file.getFileName ( ), ExperimentalRoom::TARGET);
0 commit comments