Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1734,7 +1734,7 @@ void Application::importVoxels() { · 1733 unmodified lines | |||
| 1734 | // Where we plan to place this | 1734 | // Where we plan to place this |
| 1735 | int columnNum = 1; | 1735 | int columnNum = 1; |
| 1736 | int rowNum = 1; | 1736 | int rowNum = 1; |
| 1737 | bool tileLocationUnspecified = false; | 1737 | bool isTileLocationUnspecified = false; |
| 1738 | 1738 | ||
| 1739 | // If we're in multi-file mode, then look for tiling specification in the file name | 1739 | // If we're in multi-file mode, then look for tiling specification in the file name |
| 1740 | if (fileNameStringList.size() > 1) { | 1740 | if (fileNameStringList.size() > 1) { |
| @@ -1745,7 +1745,7 @@ void Application::importVoxels() { · 4 unmodified lines | |||
| 1745 | // If the first period, is the extension, then this is not a grid name; | 1745 | // If the first period, is the extension, then this is not a grid name; |
| 1746 | if (fileNameString.mid(indexOfFirstPeriod, fileNameString.length() - indexOfFirstPeriod) == extension) { | 1746 | if (fileNameString.mid(indexOfFirstPeriod, fileNameString.length() - indexOfFirstPeriod) == extension) { |
| 1747 | qDebug("not a valid grid name... treat like tile Location Unspecified\n"); | 1747 | qDebug("not a valid grid name... treat like tile Location Unspecified\n"); |
| 1748 | tileLocationUnspecified = true; | 1748 | isTileLocationUnspecified = true; |
| 1749 | } else { | 1749 | } else { |
| 1750 | QString fileCoord = fileNameString.mid(indexOfFirstPeriod + 1, | 1750 | QString fileCoord = fileNameString.mid(indexOfFirstPeriod + 1, |
| 1751 | fileNameString.length() - indexOfFirstPeriod - fileTypeNameLength - 1); | 1751 | fileNameString.length() - indexOfFirstPeriod - fileTypeNameLength - 1); |
| @@ -1767,13 +1767,13 @@ void Application::importVoxels() { · 15 unmodified lines | |||
| 1767 | // If there are no "grid sections" in the filename, then we're going to get | 1767 | // If there are no "grid sections" in the filename, then we're going to get |
| 1768 | if (columnNum < 1 || rowNum < 1) { | 1768 | if (columnNum < 1 || rowNum < 1) { |
| 1769 | qDebug("not a valid grid name... treat like tile Location Unspecified\n"); | 1769 | qDebug("not a valid grid name... treat like tile Location Unspecified\n"); |
| 1770 | tileLocationUnspecified = true; | 1770 | isTileLocationUnspecified = true; |
| 1771 | } | 1771 | } |
| 1772 | } | 1772 | } |
| 1773 | } | 1773 | } |
| 1774 | 1774 | ||
| 1775 | if (tileLocationUnspecified) { | 1775 | if (isTileLocationUnspecified) { |
| 1776 | qDebug("tileLocationUnspecified... \n"); | 1776 | qDebug("tile Location is Unspecified... \n"); |
| 1777 | columnNum = unspecifiedColumnNum; | 1777 | columnNum = unspecifiedColumnNum; |
| 1778 | rowNum = unspecifiedRowNum; | 1778 | rowNum = unspecifiedRowNum; |
| 1779 | 1779 | ||