From 1317aa877b022850c0d0b9c8fe60691145996dbf Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Tue, 6 Oct 2020 07:19:58 -0400 Subject: [PATCH 1/4] disabled molecular throughout --- src/applications/MolecularSubtypePredictor.cxx | 3 +++ src/view/gui/fMainWindow.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/applications/MolecularSubtypePredictor.cxx b/src/applications/MolecularSubtypePredictor.cxx index 7262d62dc..600173b15 100644 --- a/src/applications/MolecularSubtypePredictor.cxx +++ b/src/applications/MolecularSubtypePredictor.cxx @@ -198,6 +198,9 @@ int PrepareNewMolecularPredictionModel(const std::string inputdirectory, int main(int argc, char **argv) { + std::cout << "This functionality has been removed from this CaPTk release, \ +and we are actively testing an optimized robust implementation.\n"; + return EXIT_FAILURE; #ifdef BUILD_MSUBTYPE cbica::CmdParser parser = cbica::CmdParser(argc, argv, "MolecularSubtypePredictor"); parser.addRequiredParameter("t", "type", cbica::Parameter::STRING, "", "The option of preparing a new model (=0), and for testing on an existing model (=1)"); diff --git a/src/view/gui/fMainWindow.cpp b/src/view/gui/fMainWindow.cpp index 204aaad11..f8d0689e2 100644 --- a/src/view/gui/fMainWindow.cpp +++ b/src/view/gui/fMainWindow.cpp @@ -384,7 +384,7 @@ fMainWindow::fMainWindow() // TBD: this needs to be controlled from CMake and not hard-coded here std::string brainAppList = " EGFRvIIISVMIndex EGFRvIIISurrogateIndex RecurrenceEstimator PseudoProgressionEstimator"; #ifdef BUILD_MSUBTYPE - brainAppList += " MolecularSubtypePredictor "; + //brainAppList += " MolecularSubtypePredictor "; #endif brainAppList += "SurvivalPredictor PopulationAtlases WhiteStripe confetti"; std::string breastAppList = ""; From 418b82282febe9cfd26772dd76a2d377e5a9ef5a Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Tue, 6 Oct 2020 07:20:05 -0400 Subject: [PATCH 2/4] pushed version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40cfed051..7142f18ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ SET( ${PROJECT_NAME}_Variant "Full" ) # the particular variant of CaPTk (Full/Ne SET( PROJECT_VERSION_MAJOR 1 ) SET( PROJECT_VERSION_MINOR 8 ) -SET( PROJECT_VERSION_PATCH 0 ) +SET( PROJECT_VERSION_PATCH 1 ) SET( PROJECT_VERSION_TWEAK ) # check for the string "nonRelease" in the PROJECT_VERSION_PATCH variable From 980ba8b19d011071ab9f78b385a6cc9664928f90 Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Tue, 6 Oct 2020 07:20:28 -0400 Subject: [PATCH 3/4] updated html --- docs/1_credits.html | 2 +- docs/BraTS_Metrics.html | 2 +- docs/BreastCancer_LIBRA.html | 2 +- docs/BreastCancer_breastSegmentation.html | 2 +- docs/BreastCancer_texture.html | 2 +- docs/Diffusion_Derivatives.html | 2 +- docs/Download.html | 2 +- docs/FAQ.html | 2 +- docs/Getting_Started.html | 2 +- docs/Glioblastoma_Atlas.html | 2 +- docs/Glioblastoma_Confetti.html | 2 +- docs/Glioblastoma_Directionality.html | 2 +- docs/Glioblastoma_EGFRvIII.html | 2 +- docs/Glioblastoma_PHI.html | 2 +- docs/Glioblastoma_Pseudoprogression.html | 2 +- docs/Glioblastoma_Recurrence.html | 2 +- docs/Glioblastoma_Survival.html | 2 +- docs/Glioblastoma_WhiteStripe.html | 2 +- docs/How_To_Guides.html | 2 +- docs/Installation.html | 2 +- docs/LungCancer_SBRT.html | 2 +- docs/PCA_Extraction.html | 2 +- docs/People.html | 2 +- docs/Perfusion_Alignment.html | 2 +- docs/Perfusion_Derivatives.html | 2 +- docs/ReleaseNotes.html | 2 +- docs/Science.html | 2 +- docs/Technical_Reference.html | 2 +- docs/Training_Module.html | 2 +- docs/ht_FeatureExtraction.html | 2 +- docs/ht_Preprocessing.html | 2 +- docs/ht_Segmentation.html | 2 +- docs/ht_SpecialApps.html | 2 +- docs/ht_utilities.html | 2 +- docs/index.html | 2 +- docs/index.qhp | 2 +- docs/pages.html | 2 +- docs/preprocessing_bias.html | 2 +- docs/preprocessing_brats.html | 2 +- docs/preprocessing_dcm2nii.html | 2 +- docs/preprocessing_histoMatch.html | 2 +- docs/preprocessing_reg.html | 2 +- docs/preprocessing_susan.html | 2 +- docs/preprocessing_zScoreNorm.html | 2 +- docs/seg_DL.html | 2 +- docs/seg_GeoTrain.html | 2 +- docs/seg_Geodesic.html | 2 +- docs/seg_SNAP.html | 2 +- docs/tr_FeatureExtraction.html | 2 +- docs/tr_integration.html | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/1_credits.html b/docs/1_credits.html index e3b25ff33..5e068184a 100644 --- a/docs/1_credits.html +++ b/docs/1_credits.html @@ -12,7 +12,7 @@

- Cancer Imaging Phenomics Toolkit (CaPTk) v.1.8.0  | Contact: software@cbica.upenn.edu + Cancer Imaging Phenomics Toolkit (CaPTk) v.1.8.1  | Contact: software@cbica.upenn.edu
Disclaimer: CaPTk has been designed for non-commercial research purposes only and has not been reviewed or approved by the Food and Drug Administration (FDA). It is not intended or recommended for clinical application.
diff --git a/docs/BraTS_Metrics.html b/docs/BraTS_Metrics.html index a1f945044..c1c8e86eb 100644 --- a/docs/BraTS_Metrics.html +++ b/docs/BraTS_Metrics.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/BreastCancer_LIBRA.html b/docs/BreastCancer_LIBRA.html index caaf3ded4..b2860fbf3 100644 --- a/docs/BreastCancer_LIBRA.html +++ b/docs/BreastCancer_LIBRA.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/BreastCancer_breastSegmentation.html b/docs/BreastCancer_breastSegmentation.html index 0ca2dbd83..50e442e27 100644 --- a/docs/BreastCancer_breastSegmentation.html +++ b/docs/BreastCancer_breastSegmentation.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/BreastCancer_texture.html b/docs/BreastCancer_texture.html index 3ede3ca48..bbe2d264f 100644 --- a/docs/BreastCancer_texture.html +++ b/docs/BreastCancer_texture.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Diffusion_Derivatives.html b/docs/Diffusion_Derivatives.html index 2453e6022..7ac80e2e3 100644 --- a/docs/Diffusion_Derivatives.html +++ b/docs/Diffusion_Derivatives.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Download.html b/docs/Download.html index 03f543dba..485dbb879 100644 --- a/docs/Download.html +++ b/docs/Download.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/FAQ.html b/docs/FAQ.html index ae3b32b74..c42438973 100644 --- a/docs/FAQ.html +++ b/docs/FAQ.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Getting_Started.html b/docs/Getting_Started.html index 5a473aefc..cf36a60bf 100644 --- a/docs/Getting_Started.html +++ b/docs/Getting_Started.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_Atlas.html b/docs/Glioblastoma_Atlas.html index 963abd14d..eaaf9f7eb 100644 --- a/docs/Glioblastoma_Atlas.html +++ b/docs/Glioblastoma_Atlas.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_Confetti.html b/docs/Glioblastoma_Confetti.html index e67757f4f..2c190f66f 100644 --- a/docs/Glioblastoma_Confetti.html +++ b/docs/Glioblastoma_Confetti.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_Directionality.html b/docs/Glioblastoma_Directionality.html index 6062713f5..a711510a5 100644 --- a/docs/Glioblastoma_Directionality.html +++ b/docs/Glioblastoma_Directionality.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_EGFRvIII.html b/docs/Glioblastoma_EGFRvIII.html index 1aad51c76..0448d7a94 100644 --- a/docs/Glioblastoma_EGFRvIII.html +++ b/docs/Glioblastoma_EGFRvIII.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_PHI.html b/docs/Glioblastoma_PHI.html index 3574b2edf..8b84ea4aa 100644 --- a/docs/Glioblastoma_PHI.html +++ b/docs/Glioblastoma_PHI.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_Pseudoprogression.html b/docs/Glioblastoma_Pseudoprogression.html index 23794b092..2b89d38ef 100644 --- a/docs/Glioblastoma_Pseudoprogression.html +++ b/docs/Glioblastoma_Pseudoprogression.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_Recurrence.html b/docs/Glioblastoma_Recurrence.html index 7b91f7fbd..5ecb313ca 100644 --- a/docs/Glioblastoma_Recurrence.html +++ b/docs/Glioblastoma_Recurrence.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_Survival.html b/docs/Glioblastoma_Survival.html index aab46da7e..4f365a638 100644 --- a/docs/Glioblastoma_Survival.html +++ b/docs/Glioblastoma_Survival.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Glioblastoma_WhiteStripe.html b/docs/Glioblastoma_WhiteStripe.html index 824c31922..f170317d4 100644 --- a/docs/Glioblastoma_WhiteStripe.html +++ b/docs/Glioblastoma_WhiteStripe.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/How_To_Guides.html b/docs/How_To_Guides.html index 0f2564820..ab77ea306 100644 --- a/docs/How_To_Guides.html +++ b/docs/How_To_Guides.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Installation.html b/docs/Installation.html index 168968701..936a9ba7b 100644 --- a/docs/Installation.html +++ b/docs/Installation.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/LungCancer_SBRT.html b/docs/LungCancer_SBRT.html index 41ba24379..d451cd488 100644 --- a/docs/LungCancer_SBRT.html +++ b/docs/LungCancer_SBRT.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/PCA_Extraction.html b/docs/PCA_Extraction.html index 24f98ef06..59f2213e1 100644 --- a/docs/PCA_Extraction.html +++ b/docs/PCA_Extraction.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/People.html b/docs/People.html index e8a93cddb..6d842f4a6 100644 --- a/docs/People.html +++ b/docs/People.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Perfusion_Alignment.html b/docs/Perfusion_Alignment.html index 579592c8c..2cf6dcc08 100644 --- a/docs/Perfusion_Alignment.html +++ b/docs/Perfusion_Alignment.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Perfusion_Derivatives.html b/docs/Perfusion_Derivatives.html index 4248570f2..9647e7dd4 100644 --- a/docs/Perfusion_Derivatives.html +++ b/docs/Perfusion_Derivatives.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html index 05e0f6884..629337091 100644 --- a/docs/ReleaseNotes.html +++ b/docs/ReleaseNotes.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Science.html b/docs/Science.html index 8a7751dfe..239f2e952 100644 --- a/docs/Science.html +++ b/docs/Science.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Technical_Reference.html b/docs/Technical_Reference.html index 271495d91..421fe30f0 100644 --- a/docs/Technical_Reference.html +++ b/docs/Technical_Reference.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/Training_Module.html b/docs/Training_Module.html index b7acc142e..28f9708da 100644 --- a/docs/Training_Module.html +++ b/docs/Training_Module.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/ht_FeatureExtraction.html b/docs/ht_FeatureExtraction.html index 5c0b611ee..a019b332b 100644 --- a/docs/ht_FeatureExtraction.html +++ b/docs/ht_FeatureExtraction.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/ht_Preprocessing.html b/docs/ht_Preprocessing.html index 56edbb06c..f5d82e404 100644 --- a/docs/ht_Preprocessing.html +++ b/docs/ht_Preprocessing.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/ht_Segmentation.html b/docs/ht_Segmentation.html index 2883a54b8..c2bc3c992 100644 --- a/docs/ht_Segmentation.html +++ b/docs/ht_Segmentation.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/ht_SpecialApps.html b/docs/ht_SpecialApps.html index 934b96d10..2d2a83352 100644 --- a/docs/ht_SpecialApps.html +++ b/docs/ht_SpecialApps.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/ht_utilities.html b/docs/ht_utilities.html index 6a9341db0..fc75fb6c5 100644 --- a/docs/ht_utilities.html +++ b/docs/ht_utilities.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/index.html b/docs/index.html index a0893de5a..fc92e8bc6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/index.qhp b/docs/index.qhp index 10791c1b8..6557f0e32 100644 --- a/docs/index.qhp +++ b/docs/index.qhp @@ -5,7 +5,7 @@ doxygen -
+
diff --git a/docs/pages.html b/docs/pages.html index 6b4c1d22d..38aabf4ab 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_bias.html b/docs/preprocessing_bias.html index 344d9045d..16409e0ab 100644 --- a/docs/preprocessing_bias.html +++ b/docs/preprocessing_bias.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_brats.html b/docs/preprocessing_brats.html index dcc5a875d..b1b5595cb 100644 --- a/docs/preprocessing_brats.html +++ b/docs/preprocessing_brats.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_dcm2nii.html b/docs/preprocessing_dcm2nii.html index eacfc72e1..19ca839cb 100644 --- a/docs/preprocessing_dcm2nii.html +++ b/docs/preprocessing_dcm2nii.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_histoMatch.html b/docs/preprocessing_histoMatch.html index 4ae0f6a3e..b4101021a 100644 --- a/docs/preprocessing_histoMatch.html +++ b/docs/preprocessing_histoMatch.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_reg.html b/docs/preprocessing_reg.html index 687c196a6..92cfca568 100644 --- a/docs/preprocessing_reg.html +++ b/docs/preprocessing_reg.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_susan.html b/docs/preprocessing_susan.html index 074037cd4..c27d86002 100644 --- a/docs/preprocessing_susan.html +++ b/docs/preprocessing_susan.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/preprocessing_zScoreNorm.html b/docs/preprocessing_zScoreNorm.html index c33f23afc..f0f9ec3db 100644 --- a/docs/preprocessing_zScoreNorm.html +++ b/docs/preprocessing_zScoreNorm.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/seg_DL.html b/docs/seg_DL.html index c9651599f..88685ab87 100644 --- a/docs/seg_DL.html +++ b/docs/seg_DL.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/seg_GeoTrain.html b/docs/seg_GeoTrain.html index 6a848140f..db128cacc 100644 --- a/docs/seg_GeoTrain.html +++ b/docs/seg_GeoTrain.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/seg_Geodesic.html b/docs/seg_Geodesic.html index 789a9eccf..f2f4da685 100644 --- a/docs/seg_Geodesic.html +++ b/docs/seg_Geodesic.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/seg_SNAP.html b/docs/seg_SNAP.html index b9e505b62..2f3fbd563 100644 --- a/docs/seg_SNAP.html +++ b/docs/seg_SNAP.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/tr_FeatureExtraction.html b/docs/tr_FeatureExtraction.html index 988800c15..58fdb8d04 100644 --- a/docs/tr_FeatureExtraction.html +++ b/docs/tr_FeatureExtraction.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
diff --git a/docs/tr_integration.html b/docs/tr_integration.html index 68a7f073a..f52e2c892 100644 --- a/docs/tr_integration.html +++ b/docs/tr_integration.html @@ -30,7 +30,7 @@
Cancer Imaging Phenomics Toolkit (CaPTk) -  1.8.0 +  1.8.1
From 0b0500bff854e03c1f52aaf9547de3f048a878a2 Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Tue, 6 Oct 2020 07:48:23 -0400 Subject: [PATCH 4/4] version update --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 4c2cc6a53..470cb9a57 100644 --- a/Readme.md +++ b/Readme.md @@ -36,7 +36,7 @@ This work is in part supported by the grant U24-CA189523, awarded by the Nationa By downloading CaPTk, you agree to our [License](./LICENSE). You can review Installation Instructions [here](https://cbica.github.io/CaPTk/Installation.html). -## Latest Stable (1.8.0) +## Latest Stable (1.8.1) | Platform (x64) | Link | |:--------------:|:------------------------------------------------:|