cleanup iswacygnet header, 90 degree rotation fix, small optimization

modules/iswa/rendering/iswacygnet.h

@@ -64,7 +64,6 @@ struct Metadata {
 
 
 class IswaCygnet : public Renderable, public std::enable_shared_from_this<IswaCygnet> {
-    friend class IswaBaseGroup;
 
 public:
     IswaCygnet(const ghoul::Dictionary& dictionary);
@@ -134,6 +133,20 @@ protected:
 
     std::shared_ptr<Metadata> _data;
 
+    std::vector<std::shared_ptr<TransferFunction>> _transferFunctions;
+    std::future<DownloadManager::MemoryFile> _futureObject;
+
+    std::shared_ptr<IswaBaseGroup> _group;
+
+    bool _textureDirty;
+
+    // Must be set by children.
+    std::string _vsPath;
+    std::string _fsPath;
+    std::string _programName;
+
+private:
+    bool destroyShader();
     glm::dmat3 _stateMatrix;
 
     double _openSpaceTime;
@@ -142,21 +155,6 @@ protected:
     std::chrono::milliseconds _realTime;
     std::chrono::milliseconds _lastUpdateRealTime;
     int _minRealTimeUpdateInterval;
-
-    std::vector<std::shared_ptr<TransferFunction>> _transferFunctions;
-    std::future<DownloadManager::MemoryFile> _futureObject;
-
-    std::shared_ptr<IswaBaseGroup> _group;
-
-    bool _textureDirty;
-
-    std::string _vsPath;
-    std::string _fsPath;
-    std::string _programName;
-
-private:
-    bool destroyShader();
-
 };
 
 }//namespace openspace

modules/iswa/util/dataprocessortext.cpp

@@ -140,15 +140,15 @@ std::vector<float*> DataProcessorText::processData(std::string data, properties:
             if(line.find("#") == 0) continue;
 
             values = std::vector<float>();
-            std::stringstream ss(line);
+            std::stringstream ss(line); 
             copy(
-                std::istream_iterator<float> (ss),
+                std::next( std::istream_iterator<float> (ss), 3 ), //+3 because options x, y and z in the file
                 std::istream_iterator<float> (),
                 back_inserter(values)
             );
 
             for(int option : selectedOptions){
-                value = values[option+3]; //+3 because options x, y and z in the file
+                value = values[option]; 
                 dataOptions[option][numValues] = processDataPoint(value, option);
             }
             numValues++;

modules/kameleon/src/kameleonwrapper.cpp

@@ -464,12 +464,12 @@ float* KameleonWrapper::getUniformSliceValues(
                 if(value != missingValue){
                     doubleData[index] = value;
                     data[index] = value;
-                    if(value > maxValue){
-                        maxValue = value;
-                    }
-                    if(value < minValue){
-                        minValue = value;
-                    }
+                    // if(value > maxValue){
+                    //     maxValue = value;
+                    // }
+                    // if(value < minValue){
+                    //     minValue = value;
+                    // }
                 }else{
                     // std::cout << "value missing" << std::endl;
                     doubleData[index] = 0;