Add egs_editor support for transformations

nrc-cnrc · Xuan-Zheng05 · Aug 3, 2019 · Dec 13, 2019 · Aug 3, 2019 · Dec 13, 2019
commit d6fca0769a93b8f84c433ec2400265024b06efd8
@@ -58,12 +58,6 @@ void EGS_InputStruct::addBlockInputs(vector<shared_ptr<EGS_BlockInput>> blocks)
     blockInputs.insert(blockInputs.end(), blocks.begin(), blocks.end());
 }
 
-shared_ptr<EGS_BlockInput> EGS_InputStruct::addFloatingBlock(shared_ptr<EGS_BlockInput> block) {
-    floatingBlocks.push_back(block);
-
-    return floatingBlocks.back();
-}
-
 vector<shared_ptr<EGS_BlockInput>> EGS_InputStruct::getBlockInputs() {
     return blockInputs;
 }
@@ -111,6 +105,23 @@ vector<string> EGS_InputStruct::getLibraryOptions(string blockTitle) {
             }
         }
     }
+
+    // If nothing was found on the 2nd level blocks, search the top level ones
+    // This is the case for shapes
+    if(libOptions.size() < 1) {
+        for(auto& block : blockInputs) {
+            egsInformation("test getLibOpt2 %s %s\n",block->getTitle().c_str(),blockTitle.c_str() );
+            if(block && block->getTitle() == blockTitle) {
+                vector<string> libAr = block->getSingleInput("library")->getValues();
+                for(auto& lib : libAr) {
+                    if(lib.size() > 0) {
+                        libOptions.push_back(lib);
+                    }
+                }
+            }
+        }
+    }
+
     return libOptions;
 }
 
@@ -236,6 +247,12 @@ shared_ptr<EGS_BlockInput> EGS_BlockInput::getBlockInput(string title) {
         for(auto &block: blockInputs) {
             if(egsEquivStr(block->getTitle(), title)) {
                 return block;
+            } else {
+                // Do a recursive search
+                auto foundBlock = block->getBlockInput(title);
+                if(foundBlock) {
+                    return foundBlock;
+                }
             }
         }
     }

@@ -133,7 +133,6 @@ class EGS_EXPORT EGS_InputStruct {
     shared_ptr<EGS_BlockInput> addBlockInput(string blockTit, bool isReq = false);
     shared_ptr<EGS_BlockInput> addBlockInput(shared_ptr<EGS_BlockInput> block);
     void addBlockInputs(vector<shared_ptr<EGS_BlockInput>> blocks);
-    shared_ptr<EGS_BlockInput> addFloatingBlock(shared_ptr<EGS_BlockInput> block);
     vector<shared_ptr<EGS_BlockInput>> getBlockInputs();
     shared_ptr<EGS_BlockInput> getBlockInput(string title);
     shared_ptr<EGS_BlockInput> getLibraryBlock(string blockTitle, string libraryName);
@@ -142,7 +141,7 @@ class EGS_EXPORT EGS_InputStruct {
 private:
 
     vector<shared_ptr<EGS_BlockInput>> blockInputs;
-    vector<shared_ptr<EGS_BlockInput>> floatingBlocks;
+    vector<shared_ptr<EGS_BlockInput>> generalBlocks;
 };
 
 

@@ -76,6 +76,8 @@ static void setShapeInputs(shared_ptr<EGS_BlockInput> shapePtr) {
     shapePtr->addSingleInput("height", false, "The height of the cylinder, in cm.")->addDependency(typePtr, "cylinder");
     shapePtr->addSingleInput("phi range", false, "The minimum and maximum phi values, in degrees. This allows you restrict the cylinder to a shape like a slice of pie!")->addDependency(typePtr, "cylinder");
     shapePtr->addSingleInput("axis", false, "A unit vector that defines the axis of the cylinder.")->addDependency(typePtr, "cylinder");
+
+    addTransformationBlock(shapePtr);
 }
 
 /*! \defgroup Shapes Shapes

@@ -46,13 +46,23 @@
 #include "egs_libconfig.h"
 #include "egs_math.h"
 #include "egs_functions.h"
+#include "egs_input_struct.h"
 
 #include <iostream>
 
 using namespace std;
 
 class EGS_Input;
 
+static void addTransformationBlock(shared_ptr<EGS_BlockInput> blockPtr) {
+    shared_ptr<EGS_BlockInput> transBlock = blockPtr->addBlockInput("transformation");
+    transBlock->addSingleInput("translation", false, "The x, y, z translation offsets in cm.");
+    auto vecPtr = transBlock->addSingleInput("rotation vector", false, "Defines a rotation which, when applied to the 3D vector defined by this input, transforms it into a vector along the positive z-axis.");
+    auto rotPtr = transBlock->addSingleInput("rotation", false, "2, 3 or 9 floating point numbers define a rotation. See the documentation for details.");
+    vecPtr->addDependency(rotPtr, "", true);
+    rotPtr->addDependency(vecPtr, "", true);
+}
+
 /*! \brief A class for vector rotations.
 
   \ingroup egspp_main

@@ -457,19 +457,21 @@ void EGS_Editor::autoComplete() {
 
         vector<shared_ptr<EGS_BlockInput>> blockInputs = inputBlockTemplate->getBlockInputs(blockTitle.toStdString());
 
+        //vector<shared_ptr<EGS_BlockInput>> generalInputs = inputBlockTemplate->getGeneralBlock(blockTitle.toStdString());
+
         // Populate the popup list
         QStringList itemList;
 
         // Add all the single inputs for the top level block
         for(auto &inp: singleInputs) {
-            if(!egsEquivStr(inp->getTag(), "library")) {
+            //if(!egsEquivStr(inp->getTag(), "library")) {
                 // Skip any inputs that have a dependency which is not satisfied
                 if(inputHasDependency(inp) && inputDependencySatisfied(inp, cursor) == false) {
                     continue;
                 }
 
                 itemList << QString((inp->getTag() + " = ").c_str());
-            }
+            //}
         }
 
         // Store the block titles in a set to remove duplicates
@@ -543,6 +545,7 @@ void EGS_Editor::autoComplete() {
             QTextCharFormat format;
             format.setUnderlineStyle(QTextCharFormat::NoUnderline);
 
+            egsInformation("testQQ %s %s\n",blockTit.toLatin1().data(), selectedText.toLatin1().data());
             auto inputPtr = inputBlockTemplate->getBlockInput(blockTit.toStdString());
             if(!inputPtr) {
                 // Red underline the input tag
@@ -635,14 +638,25 @@ shared_ptr<EGS_BlockInput> EGS_Editor::getBlockInput(QString &blockTitle, QTextC
     // If we couldn't find a library tag in the current block,
     // try searching the containing block (if there is one)
     if(library.size() < 1) {
-        // If we're current on a :start line, start searching on the next line
+        egsInformation("test searching containing block %s\n", blockTitle.toLatin1().data());
+
+        // If we're currently on a :start line, start searching on the next line
         // so that we're actually starting within the block
         QTextBlock blockEnd;
-        if(cursor.block().text().contains(":start ")) {
-            blockEnd = getBlockEnd(cursor.block().next());
-        } else {
-            blockEnd = getBlockEnd(cursor.block());
+        blockEnd = cursor.block();
+        int loopGuard = 10000;
+        int i = 0;
+        while(blockEnd.text().contains(":start ")) {
+            blockEnd = getBlockEnd(blockEnd.next());
+            if(++i > loopGuard) {
+                egsInformation("Warning: Encountered infinite loop while processing the input file. Contact the developers to report this bug.\n");
+                break;
+            }
+            if(blockEnd.isValid()) {
+                blockEnd = blockEnd.next();
+            }
         }
+        blockEnd = getBlockEnd(blockEnd);
         if(!blockEnd.isValid()) {
             return nullptr;
         }
@@ -652,7 +666,35 @@ shared_ptr<EGS_BlockInput> EGS_Editor::getBlockInput(QString &blockTitle, QTextC
 
         // Check for the library tag here
         library = getInputValue("library", blockEnd, foundTag);
-        egsInformation("test searching containing block %s\n", library.toLatin1().data());
+
+        // If we still didn't find the library, search one block higher
+        if(library.size() < 1) {
+            egsInformation("test searching containing block2 %s\n", blockTitle.toLatin1().data());
+            // If we're currently on a :start line, start searching on the next line
+            // so that we're actually starting within the block
+            int loopGuard = 10000;
+            int i = 0;
+            while(blockEnd.text().contains(":start ")) {
+                blockEnd = getBlockEnd(blockEnd.next());
+                if(++i > loopGuard) {
+                    egsInformation("Warning: Encountered infinite loop while processing the input file. Contact the developers to report this bug.\n");
+                    break;
+                }
+                if(blockEnd.isValid()) {
+                    blockEnd = blockEnd.next();
+                }
+            }
+            blockEnd = getBlockEnd(blockEnd);
+            if(!blockEnd.isValid()) {
+                return nullptr;
+            }
+
+            // Go to the line after the end of the current input block
+            blockEnd = blockEnd.next();
+
+            // Check for the library tag here
+            library = getInputValue("library", blockEnd, foundTag);
+        }
     }
 
     // If we got the library tag, we can directly look up this input block structure

@@ -287,6 +287,7 @@ GeometryViewControl::GeometryViewControl(QWidget *parent, const char *name)
             continue;
         }
 
+        // Geometries
         createGeomFunction isGeom = (createGeomFunction) egs_lib.resolve("createGeometry");
         if (isGeom) {
             egsInformation(" testgeom %s\n",libName.toLatin1().data());
@@ -330,6 +331,7 @@ GeometryViewControl::GeometryViewControl(QWidget *parent, const char *name)
             }
         }
 
+        // Sources
         createSourceFunction isSource = (createSourceFunction) egs_lib.resolve("createSource");
         if (isSource) {
             egsInformation(" testsrc %s\n",libName.toLatin1().data());
@@ -373,6 +375,7 @@ GeometryViewControl::GeometryViewControl(QWidget *parent, const char *name)
             }
         }
 
+        // Shapes
         createShapeFunction isShape = (createShapeFunction) egs_lib.resolve("createShape");
         if (isShape) {
             egsInformation(" testshape %s\n",libName.toLatin1().data());
@@ -382,7 +385,7 @@ GeometryViewControl::GeometryViewControl(QWidget *parent, const char *name)
 
                 shared_ptr<EGS_BlockInput> shape = getInputs();
                 if (shape) {
-                    inputStruct->addFloatingBlock(shape);
+                    inputStruct->addBlockInput(shape);
 
                     vector<shared_ptr<EGS_SingleInput>> singleInputs = shape->getSingleInputs();
                     for (auto &inp : singleInputs) {