Moved externs from vaxml.cpp to globals.cpp

palaeoware · Oct 31, 2018 · 8855ad5 · 8855ad5
1 parent 1aa7d58
commit 8855ad5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/SPIERSview/src/globals.cpp b/SPIERSview/src/globals.cpp
@@ -8,6 +8,8 @@ bool isFileDirty = false;
 bool sp2Lock = false;
 bool containsPresurfaced = false;
 bool containsNonPresurfaced = false;
+bool isFirstObject;
+bool isVaxmlMode;
 
 double applicationScaleX;
 double applicationScaleY;
@@ -23,6 +25,12 @@ float scaleBallScale;
 float mmPerUnit;
 float scaleMatrix[16];
 float defaultClipAngle;
+float minX;
+float maxX;
+float minY;
+float maxY;
+float minZ;
+float maxZ;
 
 int colorBackgroundRed;
 int colorBackgroundGreen;
@@ -44,3 +52,12 @@ QScreen *currentScreen;
 QString fname; //filename passed in argv
 QString currentfile; //SPV file being processed at moment (used for status)
 QString stlHash;
+QStringList infoComments;
+QStringList infoReference;
+QStringList infoAuthor;
+QStringList infoSpecimen;
+QStringList infoProvenance;
+QStringList infoClassificationName;
+QStringList infoClassificationRank;
+QStringList infoTitle;
+QMatrix4x4 globalMatrix;
diff --git a/SPIERSview/src/vaxml.cpp b/SPIERSview/src/vaxml.cpp
@@ -18,24 +18,6 @@
 #include "ui_mainwindow.h"
 #include "../SPIERScommon/netmodule.h"
 
-bool isFirstObject;
-bool isVaxmlMode;
-float minX;
-float maxX;
-float minY;
-float maxY;
-float minZ;
-float maxZ;
-QStringList infoComments;
-QStringList infoReference;
-QStringList infoAuthor;
-QStringList infoSpecimen;
-QStringList infoProvenance;
-QStringList infoClassificationName;
-QStringList infoClassificationRank;
-QStringList infoTitle;
-QMatrix4x4 globalMatrix;
-
 /**
  * @brief VAXML::VAXML
  */