LoadLog move raw file processing to LoadRaw

[Nick Draper]

LoadLog should just load the log files

[Nick Draper]

"New" tickets moved at the code freeze of iteration 29

[Nick Draper]

Bulk move of tickets to iteration 31 at the iteration 30 code freeze

[Nick Draper]

Moved to iteration 33 at iteration 32 code freeze

[Nick Draper]

Moved at end of release 2.1

[Nick Draper]

Moved at the end of release 2.2

[Nick Draper]

Moved to milestone 2.4

[Nick Draper]

Moved at the code freeze for release 2.4

[Nick Draper]

Moved to r2.6 at the end of r2.5

[Jay Rainey]

Refs #3189. Transferred relevant methods needed to searchForLogFiles.

Changeset: 2ef693c3ca30632629100750fdd4b29ff73ada14

[Jay Rainey]

Checkpointing work. Refs #3189.

Changeset: aee208ba35ff709f379fe7c240355c63b4d75e3d

[Jay Rainey]

Checkpointing work. Refs #3189.

Changeset: f81f59e33c8e08570f630e3cb38b71a3cbc071c3

[Jay Rainey]

Checkpointing work. Refs #3189.

Changeset: c66a5152d7f197f86b6a761e3c68035c84345365

[Jay Rainey]

Moved searching from loadLog to loadRawHelper. Refs #3189.

Changeset: 5af65b7951349d3729fdda67c7b525e28e78d68c

[Jay Rainey]

Refactored loadLog. Refs #3189.

Changeset: 50de102814608013c0a4b281f8110bdac084e950

[Jay Rainey]

Modified formatting of LoadLog. Refs #3189.

Changeset: dec330f5d30efa52f3b8d059fc5f41dde02056ba

[Jay Rainey]

Modified loadLog tests, and commented loadLog.h. Refs #3189.

Changeset: 6e3c629efd9055546b11f6feddaeec0b95b6d511

[Jay Rainey]

Updated LoadRaw3Test with related loadLog tests. Refs #3189.

Changeset: cc394e8380361c431f1b402feee0f89aeff57bba

[Jay Rainey]

Added additional tests to loadRaw3Test. Refs #3189.

Changeset: 7199b24884700ea80d93be9296f25150f32a6ef4

[Jay Rainey]

Load raw now passes tests. Refs #3189.

Changeset: e809ed9d9b2f78c36ee8d79b785d5a31dfad4ac4

[Jay Rainey]

Refactored loadLog. Should only load files - no searching. Refs #3189.

Changeset: 0214ce0bfe41d0e99d7f543d9bb19e050b84791b

[Jay Rainey]

Added additional tests to loadRaw3Test. Refs #3189.

Changeset: 7199b24884700ea80d93be9296f25150f32a6ef4

[Jay Rainey]

Load raw now passes tests. Refs #3189.

Changeset: e809ed9d9b2f78c36ee8d79b785d5a31dfad4ac4

[Jay Rainey]

Refactored loadLog. Should only load files - no searching. Refs #3189.

Changeset: 0214ce0bfe41d0e99d7f543d9bb19e050b84791b

[Jay Rainey]

Further refactored LoadLog. Refs #3189

Changeset: 7f1330067d1e22eded39c6f16b540ab7ad52080e

[Jay Rainey]

Fixed exception handling errors. Refs #3189

Changeset: 206b997b75b7761f563a2139b0e32c4f168697c3

[Jay Rainey]

Now correctly removes extension after right most period. Refs #3189

Changeset: e73e8fa85883ed706d7ee3b18f6a204ab2ebd645

[Jay Rainey]

The problem was that lots of searching functionality occurred inside the loadLog class. This has been refactored, and moved to loadRawHelper class. Functionality remains the same, and should be tested as such:

• Load a .raw file into the workspace that has a relevant log file (such as OFFSPEC00004622.raw).
• Verify that the log data has successfully loaded into the workspace by right clicking a workspace, and Sample logs... You can verify that the data is loaded correctly by looking at the files on your machine, and seeing that each has loaded as expected.
• Under Algorithms execute the LoadLog method, and add a log file to the current work space. Verify that it has loaded as expected. Also, run the LoadRaw method, adding the data to the workspace. Verify the log data was also added correctly, then try adding new log data as mentioned above.

[Martyn Gigg]

Everything seems to function as expected.

There are, however, some code improvements that I think can be made. All minor but worth doing now:

• In LoadLog.cpp, remove the extensions *.raw,*.s, *.add from LoadLog::init
• In LoadRawHelper.h, remove "bool LoadSNSText();" from the header as it is not used.
• In LoadRawHelper.h, change getLogfilenamesfromADS to getLogFilenamesfromADS, so that it follows the camelCase naming convention
• In LoadRawHelper.h, extractLogName should take the argument by const reference, i.e extractLogName(const std::string & path) (you'll need to change the .cpp too)
• In LoadLog.h, extractLogName should take the vector by const reference, i.e extractLogName(const std::vector<std::string> & logName)
• In LoadRawHelper.cpp, remove any mention of SNS. They don't do raw files
• In LoadRawHelper.{h,cpp}, remove the m_filename member variable then make getLogFilenamesfromADS & adsExists() take a filename argument rather than using m_filename. This is more consistent with the rest of the class. Also remove all references to m_filename in searchForLogFiles

[Jay Rainey]

Fixed minor inconsistencies. Refs #3189.

Changeset: 22f7e04d3715b1d43a2aaa0aa29a6223844195bf

[Jay Rainey]

Prevent unreferenced local variable warning in windows. Refs #3189.

Changeset: 3f3b05c0ae504ff36cf64c44cd750d7693989a0a

[Jay Rainey]

In order to test this, follow the instructions ​above & perform a code review.

[Russell Taylor]

Please fix this GCC compiler warning and then re-close:

LoadRawHelper.cpp:1181: warning: unused parameter ‘pathToFile’

[Jay Rainey]

Suppressed unused parameter GCC warning. Refs #3189.

Changeset: 44a3380b2466b0ec8c75aa9b3bfce76c13c43bff

[Jay Rainey]

Remove accidently added comment. Refs #3189

Changeset: 00101ffbb986e61fda60194d1bf2029f80c98d02

[Jay Rainey]

In order to test this, see ​above, ensure Martyn's ​suggestions have been introduced, and Russell's ​​reply to ensure GCC compiler warning has been dealt with.

[Martyn Gigg]

One more minor thing:

• The LoadLog extensions are still not quite right. It should be .log & .txt

[Jay Rainey]

Replaced add extension with log. Refs #3189.

Changeset: 441846c976e649f84a1b802e2972430e79559bec

[Martyn Gigg]

Merge remote-tracking branch 'origin/feature/3189_refactor_loadLog_processing_to_loadRawHelper'

[Stuart Campbell]

This ticket has been transferred to github issue ​4036