Fix GADRAS drf directory in macOS app, and some small compile error.

Also update version 1.0.13 in CMakeLists.txt.
sandialabs · Sep 22, 2024 · 1fe57a5 · 1fe57a5
1 parent 2e9cf50
commit 1fe57a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1...3.20 FATAL_ERROR)
 
-project(InterSpec VERSION 1.0.12)
+project(InterSpec VERSION 1.0.13)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/src/DrfSelect.cpp b/src/DrfSelect.cpp
@@ -477,6 +477,8 @@ namespace
 
    string trialpath = InterSpec::staticDataDirectory();
    trial_paths.push_back( trialpath );
+   trialpath = SpecUtils::lexically_normalize_path( SpecUtils::append_path( trialpath, "..") );
+   trial_paths.push_back( trialpath );
 
    trialpath = SpecUtils::append_path( SpecUtils::append_path( trialpath, ".."), "data_ouo" );
    trialpath = SpecUtils::lexically_normalize_path( trialpath );

diff --git a/src/PeakInfoDisplay.cpp b/src/PeakInfoDisplay.cpp
@@ -1157,7 +1157,7 @@ void PeakInfoDisplay::init()
 
   auto enableDisableCsv = [this,csvButton,copyButton](){
     const bool enable = (m_model->rowCount() > 0);
-    csvButton->setEnabled( enable );
+    csvButton->setDisabled( !enable );
     copyButton->setEnabled( enable );
   };
 

diff --git a/target/osx/CMakeLists.txt b/target/osx/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
-project( InterSpecApp VERSION 1.0.12 )
+project( InterSpecApp VERSION 1.0.13 )
 
 if(POLICY CMP0114)
   # Add @rpath to the install_name of shared libraries and frameworks that are part of a macOS application bundle.