History

made import work better when tile locations not included in file name

ZappoMan committed 13 years ago

Commit abc8bc31 parent a6c26831 file · +61 −8Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+61−8
@@ -1686,14 +1686,25 @@ void Application::importVoxels() { · 1685 unmodified lines
1686 const int SVO_TYPE_NAME_LENGTH = 4;1686 const int SVO_TYPE_NAME_LENGTH = 4;
1687 const int SCH_TYPE_NAME_LENGTH = 10;1687 const int SCH_TYPE_NAME_LENGTH = 10;
1688 1688
1689 // assume this is where we'll place it if filename doesn't have tiling
1690 int unspecifiedColumnNum = 1;
1691 int unspecifiedRowNum = 1;
1692
1693 // if they select multiple files, but they don't specify the tiling, we
1694 // will tile them to this size
1695 int unspecifiedSquare = (sqrt(fileNameStringList.size()) + 0.5);
1696 qDebug("unspecifiedSquare: %d\n", unspecifiedSquare);
1697
1689 for (int i = 0; i < fileNameStringList.size(); i++) {1698 for (int i = 0; i < fileNameStringList.size(); i++) {
1690 QString fileNameString = fileNameStringList.at(i);1699 QString fileNameString = fileNameStringList.at(i);
1700 QString extension;
1691 QByteArray fileNameAscii = fileNameString.toLocal8Bit();1701 QByteArray fileNameAscii = fileNameString.toLocal8Bit();
1692 const char* fileName = fileNameAscii.data();1702 const char* fileName = fileNameAscii.data();
1693 1703
1694 int fileTypeNameLength = 0;1704 int fileTypeNameLength = 0;
1695 VoxelTree importVoxels;1705 VoxelTree importVoxels;
1696 if (fileNameString.endsWith(".png", Qt::CaseInsensitive)) {1706 if (fileNameString.endsWith(".png", Qt::CaseInsensitive)) {
1707 extension = QString(".png");
1697 QImage pngImage = QImage(fileName);1708 QImage pngImage = QImage(fileName);
1698 fileTypeNameLength = PNG_TYPE_NAME_LENGTH;1709 fileTypeNameLength = PNG_TYPE_NAME_LENGTH;
1699 if (pngImage.height() != pngImage.width()) {1710 if (pngImage.height() != pngImage.width()) {
@@ -1711,25 +1722,67 @@ void Application::importVoxels() { · 11 unmodified lines
1711 1722
1712 importVoxels.readFromSquareARGB32Pixels(pixels, pngImage.height()); 1723 importVoxels.readFromSquareARGB32Pixels(pixels, pngImage.height());
1713 } else if (fileNameString.endsWith(".svo", Qt::CaseInsensitive)) {1724 } else if (fileNameString.endsWith(".svo", Qt::CaseInsensitive)) {
1725 extension = QString(".svo");
1714 importVoxels.readFromSVOFile(fileName);1726 importVoxels.readFromSVOFile(fileName);
1715 fileTypeNameLength = SVO_TYPE_NAME_LENGTH;1727 fileTypeNameLength = SVO_TYPE_NAME_LENGTH;
1716 } else if (fileNameString.endsWith(".schematic", Qt::CaseInsensitive)) {1728 } else if (fileNameString.endsWith(".schematic", Qt::CaseInsensitive)) {
1729 extension = QString(".schematic");
1717 importVoxels.readFromSchematicFile(fileName);1730 importVoxels.readFromSchematicFile(fileName);
1718 fileTypeNameLength = SCH_TYPE_NAME_LENGTH;1731 fileTypeNameLength = SCH_TYPE_NAME_LENGTH;
1719 }1732 }
1733
1734 // Where we plan to place this
1735 int columnNum = 1;
1736 int rowNum = 1;
1737 bool tileLocationUnspecified = false;
1720 1738
1721 int indexOfFirstPeriod = fileNameString.indexOf('.');1739 // If we're in multi-file mode, then look for tiling specification in the file name
1740 if (fileNameStringList.size() > 1) {
1741 int indexOfFirstPeriod = fileNameString.indexOf('.');
1742
1743 //qDebug("indexOfFirstPeriod: %d\n", indexOfFirstPeriod);
1744
1745 // If the first period, is the extension, then this is not a grid name;
1746 if (fileNameString.mid(indexOfFirstPeriod, fileNameString.length() - indexOfFirstPeriod) == extension) {
1747 qDebug("not a valid grid name... treat like tile Location Unspecified\n");
1748 tileLocationUnspecified = true;
1749 } else {
1750 QString fileCoord = fileNameString.mid(indexOfFirstPeriod + 1,
1751 fileNameString.length() - indexOfFirstPeriod - fileTypeNameLength - 1);
1752
1753 //qDebug() << "fileCoord: " << fileCoord << "\n";
1754 indexOfFirstPeriod = fileCoord.indexOf('.');
1722 1755
1723 QString fileCoord = fileNameString.mid(indexOfFirstPeriod + 1, 1756 //qDebug("indexOfFirstPeriod: %d\n", indexOfFirstPeriod);
1724 fileNameString.length() - indexOfFirstPeriod - fileTypeNameLength - 1);
1725 1757
1726 indexOfFirstPeriod = fileCoord.indexOf('.');1758 QString columnNumString = fileCoord.right(fileCoord.length() - indexOfFirstPeriod - 1);
1727 QString columnNumString = fileCoord.right(fileCoord.length() - indexOfFirstPeriod - 1);1759 QString rowNumString = fileCoord.left(indexOfFirstPeriod);
1728 QString rowNumString = fileCoord.left(indexOfFirstPeriod);
1729 1760
1730 int columnNum = columnNumString.toFloat();1761 //qDebug() << "columnNumString: " << columnNumString << "\n";
1731 int rowNum = rowNumString.toFloat();1762 //qDebug() << "rowNumString: " << rowNumString << "\n";
1763
1764 columnNum = columnNumString.toFloat();
1765 rowNum = rowNumString.toFloat();
1766
1767 // If there are no "grid sections" in the filename, then we're going to get
1768 if (columnNum < 1 || rowNum < 1) {
1769 qDebug("not a valid grid name... treat like tile Location Unspecified\n");
1770 tileLocationUnspecified = true;
1771 }
1772 }
1773 }
1774
1775 if (tileLocationUnspecified) {
1776 qDebug("tileLocationUnspecified... \n");
1777 columnNum = unspecifiedColumnNum;
1778 rowNum = unspecifiedRowNum;
1732 1779
1780 unspecifiedColumnNum++;
1781 if (unspecifiedColumnNum > unspecifiedSquare) {
1782 unspecifiedColumnNum = 1;
1783 unspecifiedRowNum++;
1784 }
1785 }
1733 qDebug("columnNum: %d\t rowNum: %d\n", columnNum, rowNum);1786 qDebug("columnNum: %d\t rowNum: %d\n", columnNum, rowNum);
1734 1787
1735 _mouseVoxel.x = originalX + (columnNum - 1) * _mouseVoxel.s;1788 _mouseVoxel.x = originalX + (columnNum - 1) * _mouseVoxel.s;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t