diff --git a/tsg_doc/Manuel_Utilisateur_TSGQC.docx b/tsg_doc/Manuel_Utilisateur_TSGQC.docx index da083b62d312bad67e256ad52d57db37d616eca9..097283f0b17d981f0b82f52059328df0d44c9d03 100644 Binary files a/tsg_doc/Manuel_Utilisateur_TSGQC.docx and b/tsg_doc/Manuel_Utilisateur_TSGQC.docx differ diff --git a/tsg_doc/Manuel_Utilisateur_TSGQC.pdf b/tsg_doc/Manuel_Utilisateur_TSGQC.pdf index 7cb4cd54932c83323e89fb25f39f6f6161b8e339..76ba5e265b348d46b9ac5df4105d47b215b73656 100644 Binary files a/tsg_doc/Manuel_Utilisateur_TSGQC.pdf and b/tsg_doc/Manuel_Utilisateur_TSGQC.pdf differ diff --git a/tsg_doc/User_Manual_TSGQC.doc b/tsg_doc/User_Manual_TSGQC.doc deleted file mode 100644 index fafcd2c925336e0d12ea1b1e9679f9fbffd9358d..0000000000000000000000000000000000000000 Binary files a/tsg_doc/User_Manual_TSGQC.doc and /dev/null differ diff --git a/tsg_doc/User_Manual_TSGQC.docx b/tsg_doc/User_Manual_TSGQC.docx index 9f56134ac08eb8667ccbc26faf0fc402e0a8d6e3..dbcca8b11d493141c007b525605669527dadbf3b 100644 Binary files a/tsg_doc/User_Manual_TSGQC.docx and b/tsg_doc/User_Manual_TSGQC.docx differ diff --git a/tsg_doc/User_Manual_TSGQC.pdf b/tsg_doc/User_Manual_TSGQC.pdf index c8c1c0e1b64e51a05b7dc2b82ef91f02e705a2ac..fed25e74f7746847bc799add6746aa4f2bff4b58 100644 Binary files a/tsg_doc/User_Manual_TSGQC.pdf and b/tsg_doc/User_Manual_TSGQC.pdf differ diff --git a/tsg_io/readTsgDataXML.m b/tsg_io/readTsgDataXML.m index 517339478b676048f553d8449f1b6c16b5e1bba9..5d5557cde113cea4ab7f6f48c82a3ee62e1b537b 100644 --- a/tsg_io/readTsgDataXML.m +++ b/tsg_io/readTsgDataXML.m @@ -28,7 +28,7 @@ fprintf('\nREAD_XML_FILE\n'); tic; % Open the file % ------------- -fd = fopen( file(self), 'rt' ); +fd = fopen( filename, 'rt' ); if( fd == -1 ) warndlg( msg_error, 'XML error dialog'); sprintf('...cannot locate %s\n', filename); @@ -41,7 +41,7 @@ fprintf('...reading %s : ', filename); h = hashtable; %% parse le fichier XML -tree = xml_read( fileread( file( self ) ) ); +tree = xml_read( fileread( filename ) ); % decode l'entete, a completer %tsg.CYCLE_MESURE = tree.ENTETE.CYCLE_MESURE.LIBELLE; @@ -52,7 +52,7 @@ fclose(fd); %% deuxieme lecture des donnees dans le fichier apres la balise <DATA> % on lit la deuxieme ligne contenant les entetes des colonnes -fd = fopen( file(self), 'rt' ); +fd = fopen( filename, 'rt' ); while ~feof(fd) line = fgetl(fd); [tok match] = regexp(line,'<(\w+)>','tokens');