Added WorkbenchSpecialVersionEnum. At this time, it is used to identi…

…fy a special version of Workbench for use with scenes from the first implementation of charting. The text "(first charting version)" appears in the Main Window titlebar, the Splash window, and the About wb_view dialog. This "first charting version" of Workbench has been created and executables are located in "/mnt/myelin/distribution/caret7_distribution/first_charting_workbench". The special version has been turned off in the code since the executables have been created.
Washington-University · Dec 15, 2016 · 23a5f9e · 23a5f9e
1 parent ea06af1
commit 23a5f9e
Show file tree

Hide file tree

Showing 9 changed files with 598 additions and 8 deletions.
diff --git a/src/Common/ApplicationInformation.cxx.in b/src/Common/ApplicationInformation.cxx.in
@@ -45,7 +45,23 @@ using namespace caret;
 ApplicationInformation::ApplicationInformation()
 : CaretObject()
 { 
-    this->name    = "Connectome Workbench";
+    this->workbenchSpecialVersion = WorkbenchSpecialVersionEnum::WORKBENCH_SPECIAL_VERSION_NO;
+    //this->workbenchSpecialVersion = WorkbenchSpecialVersionEnum::WORKBENCH_SPECIAL_VERSION_FIRST_CHARTING;
+
+    this->name = "Connectome Workbench";
+    this->nameForGuiLabel = this->name;
+    switch (this->workbenchSpecialVersion) {
+        case WorkbenchSpecialVersionEnum::WORKBENCH_SPECIAL_VERSION_NO:
+            /* use default naming */
+            break;
+        case WorkbenchSpecialVersionEnum::WORKBENCH_SPECIAL_VERSION_FIRST_CHARTING:
+            this->name = "Connectome Workbench (First Charting Version)";
+            this->nameForGuiLabel = ("<html>"
+                                     "Connectome Workbench<br>"
+                                     "(First Charting Version)"
+                                     "</html>");
+            break;
+    }
     this->version = "1.2.3";
     this->commit = "Commit: @COMMIT@";
     this->commitDate = "Commit Date: @COMMIT_DATE@";
@@ -94,6 +110,16 @@ ApplicationInformation::getName() const
     return this->name;
 }
 
+/**
+ * @return Name of the application formatted
+ *         specifically for use in a GUI QLabel.
+ */
+AString 
+ApplicationInformation::getNameForGuiLabel() const
+{
+    return this->nameForGuiLabel;
+}
+
 /**
  * @return Version of application.
  */
@@ -195,6 +221,18 @@ ApplicationInformation::getSummaryInformationInString(const AString& separator)
     return infoOut;
 }
 
+/**
+ * @return The Workbench Special Version
+ *
+ * Used for versions of Workbench that may or may 
+ * not be released and contains special functionality.
+ */
+WorkbenchSpecialVersionEnum::Enum 
+ApplicationInformation::getWorkbenchSpecialVersion() const
+{
+    return this->workbenchSpecialVersion;
+}
+
 /**
  * @return The type of application.
  */

diff --git a/src/Common/ApplicationInformation.h b/src/Common/ApplicationInformation.h
@@ -23,6 +23,7 @@
 
 #include "ApplicationTypeEnum.h"
 #include "CaretObject.h"
+#include "WorkbenchSpecialVersionEnum.h"
 
 namespace caret {
 
@@ -35,6 +36,8 @@ namespace caret {
 
         AString getName() const;
 
+        AString getNameForGuiLabel() const;
+
         AString getVersion() const;
 
         AString getCommit() const;
@@ -47,6 +50,8 @@ namespace caret {
 
         AString getCompiledWithDebugStatus() const;
 
+        WorkbenchSpecialVersionEnum::Enum getWorkbenchSpecialVersion() const;
+
         static ApplicationTypeEnum::Enum getApplicationType();
 
         static void setApplicationType(const ApplicationTypeEnum::Enum applicationType);
@@ -58,6 +63,8 @@ namespace caret {
 
         AString name;
 
+        AString nameForGuiLabel;
+
         AString version;
 
         AString commit;
@@ -70,6 +77,8 @@ namespace caret {
 
         AString compiledWithOpenMP;
 
+        WorkbenchSpecialVersionEnum::Enum workbenchSpecialVersion;
+
         static ApplicationTypeEnum::Enum s_applicationType;
     };
 

diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt
@@ -151,6 +151,7 @@ TriStateSelectionStatusEnum.h
 Vector3D.h
 VectorOperation.h
 VoxelIJK.h
+WorkbenchSpecialVersionEnum.h
 YokingGroupEnum.h
 
 ${MOC_SOURCE_FILES}
@@ -241,6 +242,7 @@ TileTabsConfiguration.cxx
 TriStateSelectionStatusEnum.cxx
 Vector3D.cxx
 VectorOperation.cxx
+WorkbenchSpecialVersionEnum.cxx
 YokingGroupEnum.cxx
 )