From c123e045ad22a5823d808ceb3dd252e47a492c16 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 29 Oct 2013 16:42:41 -0700 Subject: [PATCH] added --getOctalCode to voxel edit --- voxel-edit/src/main.cpp | 45 ++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/voxel-edit/src/main.cpp b/voxel-edit/src/main.cpp index 244db390df..5787caabac 100644 --- a/voxel-edit/src/main.cpp +++ b/voxel-edit/src/main.cpp @@ -10,6 +10,8 @@ #include #include #include +#include +#include VoxelTree myTree; @@ -233,9 +235,44 @@ void processFillSVOFile(const char* fillSVOFile) { } -int old_main(int argc, const char * argv[]) +int main(int argc, const char * argv[]) { qInstallMessageHandler(sharedMessageHandler); + + + const char* GET_OCTCODE = "--getOctCode"; + const char* octcodeParams = getCmdOption(argc, argv, GET_OCTCODE); + if (octcodeParams) { + + QString octcodeParamsString(octcodeParams); + QStringList octcodeParamsList = octcodeParamsString.split(QString(",")); + + enum { X_AT, Y_AT, Z_AT, S_AT, EXPECTED_PARAMS }; + if (octcodeParamsList.size() == EXPECTED_PARAMS) { + QString xStr = octcodeParamsList.at(X_AT); + QString yStr = octcodeParamsList.at(Y_AT); + QString zStr = octcodeParamsList.at(Z_AT); + QString sStr = octcodeParamsList.at(S_AT); + + float x = xStr.toFloat()/TREE_SCALE; // 0.14745788574219; + float y = yStr.toFloat()/TREE_SCALE; // 0.01502178955078; + float z = zStr.toFloat()/TREE_SCALE; // 0.56540045166016; + float s = sStr.toFloat()/TREE_SCALE; // 0.015625; + + qDebug() << "Get Octal Code for:\n"; + qDebug() << " x:" << xStr << " [" << x << "] \n"; + qDebug() << " y:" << yStr << " [" << y << "] \n"; + qDebug() << " z:" << zStr << " [" << z << "] \n"; + qDebug() << " s:" << sStr << " [" << s << "] \n"; + + unsigned char* octalCode = pointToVoxel(x, y, z, s); + QString octalCodeStr = octalCodeToHexString(octalCode); + qDebug() << "octal code: " << octalCodeStr << "\n"; + + } else { + qDebug() << "Unexpected number of parameters for getOctCode\n"; + } + } // Handles taking and SVO and splitting it into multiple SVOs based on // jurisdiction details @@ -361,9 +398,3 @@ void unitTest(VoxelTree * tree) { } } - - -int main(int argc, const char * argv[]) { - unitTest(&myTree); - return 0; -} \ No newline at end of file