Added license text, const auto refs, and changed for loops to range based

Author: tpat

src/Graphics/Widgets/WidgetFactory.cc

@@ -1,3 +1,31 @@
+/*
+For more information, please see: http://software.sci.utah.edu
+
+The MIT License
+
+Copyright (c) 2015 Scientific Computing and Imaging Institute,
+University of Utah.
+
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
 #include <Graphics/Widgets/WidgetFactory.h>
 
 using namespace SCIRun;

src/Graphics/Widgets/WidgetFactory.h

@@ -1,3 +1,31 @@
+/*
+For more information, please see: http://software.sci.utah.edu
+
+The MIT License
+
+Copyright (c) 2015 Scientific Computing and Imaging Institute,
+University of Utah.
+
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
 #ifndef Graphics_Graphics_Widgets_WidgetFactory_H
 #define Graphics_Graphics_Widgets_WidgetFactory_H
 

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -347,9 +347,7 @@ namespace SCIRun {
     //----------------------------------------------------------------------------------------------
 
     //----------------------------------------------------------------------------------------------
-    void SRInterface::select(const glm::ivec2& pos,
-      std::vector<Graphics::Datatypes::WidgetHandle> &objList,
-      int port)
+    void SRInterface::select(const glm::ivec2& pos, WidgetList& objList, int port)
     {
       mSelected = "";
       widgetSelected_ = false;
@@ -381,18 +379,18 @@ namespace SCIRun {
 
       int nameIndex = 0;
       //modify and add each object to draw
-      // for (auto& obj : objList)
-      for (int i = 0; i < objList.size(); i++)
+      for (auto& obj : objList)
       {
-        std::string objectName = objList[i]->uniqueID();
+        // auto& obj = objList[i];
+        std::string objectName = obj->uniqueID();
         uint32_t selid = getSelectIDForName(objectName);
         selMap.insert(std::make_pair(selid, objectName));
         glm::vec4 selCol = getVectorForID(selid);
 
         // Add vertex buffer objects.
         std::vector<char*> vbo_buffer;
         std::vector<size_t> stride_vbo;
-        for (auto it = objList[i]->vbos().cbegin(); it != objList[i]->vbos().cend(); ++it, ++nameIndex)
+        for (auto it = obj->vbos().cbegin(); it != obj->vbos().cend(); ++it, ++nameIndex)
         {
           const auto& vbo = *it;
 
@@ -417,7 +415,7 @@ namespace SCIRun {
 
         // Add index buffer objects.
         nameIndex = 0;
-        for (auto it = objList[i]->ibos().cbegin(); it != objList[i]->ibos().cend(); ++it, ++nameIndex)
+        for (auto it = obj->ibos().cbegin(); it != obj->ibos().cend(); ++it, ++nameIndex)
         {
           const auto& ibo = *it;
           GLenum primType = GL_UNSIGNED_SHORT;
@@ -466,7 +464,7 @@ namespace SCIRun {
         if (auto shaderMan = sm.lock())
         {
           // Add passes
-          for (auto& pass : objList[i]->passes())
+          for (auto& pass : obj->passes())
           {
             uint64_t entityID = getEntityIDForName(pass.passName, port);
 
@@ -480,7 +478,7 @@ namespace SCIRun {
               // We will be constructing a render list from the VBO and IBO.
               RenderList list;
 
-              for (const auto& vbo : objList[i]->vbos())
+              for (const auto& vbo : obj->vbos())
               {
                 if (vbo.name == pass.vboName)
                 {
@@ -584,14 +582,14 @@ namespace SCIRun {
         {
           mSelected = it->second;
 
-          for(int i = 0; i < objList.size(); i++)
+          for (auto &obj : objList)
           {
-            if(objList[i]->uniqueID() == it->second)
+            if (obj->uniqueID() == it->second)
             {
-              mOriginWorld = objList[i]->origin_;
-              mFlipAxisWorld = objList[i]->getFlipVector();
-              mWidgetMovement = objList[i]->getMovementType();
-              mConnectedWidgets = objList[i]->connectedIds_;
+              mOriginWorld = obj->origin_;
+              mFlipAxisWorld = obj->getFlipVector();
+              mWidgetMovement = obj->getMovementType();
+              mConnectedWidgets = obj->connectedIds_;
             }
           }
         }

src/Interface/Modules/Render/ES/SRInterface.h

@@ -150,7 +150,8 @@ namespace SCIRun {
 
       //---------------- Widgets -------------------------------------------------------------------
       // todo Selecting objects...
-      void select(const glm::ivec2& pos, std::vector<Graphics::Datatypes::WidgetHandle> &objList, int port);
+      typedef std::vector<Graphics::Datatypes::WidgetHandle> WidgetList;
+      void select(const glm::ivec2& pos, WidgetList& objList, int port);
       std::string &getSelection()          {return mSelected;}
       gen::Transform &getWidgetTransform() {return mWidgetTransform;}
 

src/Interface/Modules/Render/ViewScene.cc

@@ -1243,7 +1243,7 @@ void ViewSceneDialog::selectObject(const int x, const int y)
     std::string selName = spire->getSelection();
     if (selName != "")
     {
-      for (auto &obj : objList)
+      for (const auto &obj : objList)
       {
         if (obj->uniqueID() == selName)
         {

src/Modules/Legacy/Visualization/ShowAndEditDipoles.cc

@@ -292,15 +292,15 @@ void ShowAndEditDipoles::toggleLastVectorShown()
 void ShowAndEditDipoles::generateGeomsList()
 {
   auto state = get_state();
-  // Recreate geom list
-  geoms_.resize(0);
 
   // Rewrite all existing geom
-  for(auto arrow : arrows_)
+  geoms_.clear();
+  for(const auto& arrow : arrows_)
   {
-    for(auto widget : arrow->widgets_)
+    for(const auto& widget : arrow->widgets_)
       geoms_.push_back(widget);
   }
+
   if(state->getValue(ShowLines).toBool())
     geoms_.push_back(addLines());
 }
@@ -335,10 +335,11 @@ void ShowAndEditDipoles::processWidgetFeedback(const ModuleFeedback& var)
         }
 
         // Remove parantheses
-        for(size_t i = 0; i < matches.size(); i++)
+        for(auto& match : matches)
         {
-          matches[i] = matches[i].substr(1, matches[i].length()-2);
+          match = match.substr(1, match.length()-2);
         }
+
         // Cast to size_t
         widgetType = boost::lexical_cast<size_t>(matches[0]);
         widgetID = boost::lexical_cast<size_t>(matches[1]);
@@ -359,9 +360,9 @@ void ShowAndEditDipoles::processWidgetFeedback(const ModuleFeedback& var)
 
 void ShowAndEditDipoles::moveDipolesTogether(const Transform& transform)
 {
-  for(size_t i = 0; i < pos_.size(); i++)
+  for(auto& pos : pos_)
   {
-    pos_[i] = transform * pos_[i];
+    pos = transform * pos;
   }
 }