Skip to content

Commit b6e5d58

Browse files
addisonElliottaddisonElliott
committed
Rename VisceralFatValidation to SIUE-Fat-Segmentation-Tool. Whitespace is not allowed in the project name so the hyphens are used since this is also what GitHub does.
Increment version for renaming of application. As of v1.0.2 the application will be renamed! Update release date in About dialog. Update windows installer for application rename For windows installer, automatically run the windeployqt binary when compiling the script so that it will copy necessary Qt DLLs. The third-party DLLs are specified and copied over in the script as well.
1 parent e417c49 commit b6e5d58

6 files changed

Lines changed: 61 additions & 30 deletions

File tree

‎README.md‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
# VisceralFatValidation
2-
This program will take in MRI images in the NIFTI format and display them on the screen. The user will draw a closed contour around specified areas of fat at multiple axial slices. These results are saved in a file to be validated with the VisceralFatSegmentation program. This program is created using Qt and C++.
1+
# SIUE Fat Segmentation Tool (SFST)
2+
This program consists of a variety of tools within one program to aid in fat segmentation via MRI and ultrasound imaging. As of now, the only tool available in the program is the ability to load in MRI images in the NIFTI format and display the axial and coronal slice views of the MRI. The user is able to trace the various depots of fat such as epicardial, pericardial, peri-aortic, subcutaneous, etc, for each axial slice of the MRI image. The traced user data can then be saved to a TXT file for further processing. This program is created and maintained by Electrical and Computer Engineering (ECE) department at Southern Illinois University Edwardsville (SIUE). This program is created using C++ and the Qt framework.
33

44
# Installation
55
1. Install [Qt Creator](https://www.qt.io/)
66
* I recommend using the offline installer and hand selecting which version of Qt Creator to install. There are binaries for particular versions of compilers such as VS 2015 64-bit, VS 2015 32-bit, MinGW, GCC, etc.
7-
2. [Build External Libraries](https://github.com/addisonElliott/VisceralFatValidation/wiki/Building-External-Libraries)
8-
3. Download VisceralFatValidation library
9-
4. To find external libraries, VisceralFatValidation uses custom.pro. This file will be different for each user depending on where the external libraries are installed and therefore is not tracked by GitHub. Sample custom.pro files are provided for each OS to get you started with building the application. Duplicate the necessary sample custom.pro and rename to custom.pro
7+
2. [Build External Libraries](wiki/Building-External-Libraries)
8+
3. Download SFST source code by cloning the repository or downloading ZIP file
9+
4. To find external libraries, custom.pro is used. This file will be different for each developer depending on where the external libraries are installed and therefore is not tracked by GitHub. Sample custom.pro files are provided for each OS to get you started with building the application. Duplicate the necessary sample custom.pro and rename to custom.pro
1010
* custom.pro.win.sample - Sample custom.pro file for Windows
1111
* __Change everything in brackets (e.g. \<OPENCV-PATH\>)__
1212
* custom.pro.macosx.sample - Sample custom.pro file for Mac OS X
1313
* __No changes should be required since libraries are assumed to be installed in /usr/local/{bin/lib/include}__
1414
5. Open Qt Creator
15-
6. Open VisceralFatValidation.pro project file
15+
6. Open SIUE-Fat-Segmentation-Tool.pro project file
1616
7. Run Project
1717

18-
# Dependencies
19-
The following libraries are required to build VisceralFatValidation
20-
* zlib
21-
* NIFTIclib
22-
* OpenCV
23-
24-
### [Building External Libraries](https://github.com/addisonElliott/VisceralFatValidation/wiki/Building-External-Libraries)
18+
### [Building External Libraries](wiki/Building-External-Libraries)

VisceralFatValidation.pro renamed to SIUE-Fat-Segmentation-Tool.pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1111
CONFIG += c++11
1212
!macx: CONFIG -= app_bundle
1313

14-
win32:VERSION = 1.0.1.0 # major.minor.patch.build
15-
else:VERSION = 1.0.1 # major.minor.patch
14+
win32:VERSION = 1.0.2.0 # major.minor.patch.build
15+
else:VERSION = 1.0.2 # major.minor.patch
1616

1717
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
1818

19-
TARGET = VisceralFatValidation
19+
TARGET = "SIUE Fat Segmentation Tool"
2020
TEMPLATE = app
2121

2222
CONFIG(release, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT QT_MESSAGELOGCONTEXT

‎WindowsInstaller.iss‎

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,31 @@
33

44
; MAKE SURE TO CHANGE THIS INFORMATION BEFORE BUILDING A NEW RELEASE
55
; MUST UPDATE VERSION NUMBER AND SOURCE DIRECTORY AT A MINIMUM
6-
#define MyAppName "Visceral Fat Validation"
7-
#define MyAppVersion "1.0.1.0"
6+
#define MyAppName "SIUE Fat Segmentation Tool"
7+
#define MyAppVersion "1.0.2.0"
88
#define MyAppPublisher "Addison Elliott"
9-
#define MyAppURL "https://github.com/addisonElliott/VisceralFatValidation"
10-
#define MyAppExeName "VisceralFatValidation.exe"
11-
#define OutputFilename "VisceralFatValidation-v1.0.1.0-Release-Win_x64"
9+
#define MyAppURL "https://github.com/addisonElliott/SIUE-Fat-Segmentation-Tool"
10+
#define MyAppExeName "SIUE Fat Segmentation Tool.exe"
11+
#define MyAppRelease "Release"
12+
13+
; Output filename and directory for the installer
14+
#define OutputFilename "SIUE-Fat-Segmentation-Tool-v" + MyAppVersion + "-" + MyAppRelease + "-Win_x64"
1215
#define OutputDirectory "D:\Users\addis\Desktop\Output"
13-
#define SrcDir "D:\Users\addis\Desktop\VisceralFatValidation-v1.0.1.0-Release"
16+
17+
; Source directory of the build. This should be the folder that Qt Creator generates when building
18+
#define SrcDir "D:\Users\addis\Documents\QtProjects\build-SIUE-Fat-Segmentation-Tool-Desktop_Qt_5_8_0_MSVC2015_64bit_Custom-" + MyAppRelease + "\" + LowerCase(MyAppRelease)
19+
20+
; Location of the binary directories for the external libraries: NIFTI, ZLIB, OpenCV Debug & Release
21+
#define NiftiBin "D:\DevelLibs\nifticlib\buildShared\bin"
22+
#define ZlibBin "D:\DevelLibs\zlib-1.2.8\build\bin"
23+
#define OpenCVBinDebug "D:\DevelLibs\opencv\build\\bin\Debug"
24+
#define OpenCVBinRelease "D:\DevelLibs\opencv\build\\bin\Release"
25+
26+
#define WinDeployQt "D:\DevelLibs\Qt\qt5-build\qtbase\bin\windeployqt.exe"
27+
28+
; Run WinDeployQt when compiling script to get Qt DLLs to directory
29+
; Add --debug or --release depending on MyAppRelease macro
30+
#expr Exec(WinDeployQt, SrcDir + " --" + LowerCase(MyAppRelease))
1431

1532
[Setup]
1633
; NOTE: The value of AppId uniquely identifies this application.
@@ -47,15 +64,35 @@ Name: {app}\platforms\; Permissions: users-modify
4764
Name: {app}\translations\; Permissions: users-modify
4865

4966
[Files]
50-
Source: "{#SrcDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
67+
Source: "{#NiftiBin}/niftiio.dll"; DestDir: "{app}"; Flags: ignoreversion
68+
Source: "{#NiftiBin}/nifticdf.dll"; DestDir: "{app}"; Flags: ignoreversion
69+
Source: "{#NiftiBin}/znz.dll"; DestDir: "{app}"; Flags: ignoreversion
70+
71+
Source: "{#ZlibBin}/zlib.dll"; DestDir: "{app}"; Flags: ignoreversion
72+
73+
#if MyAppRelease == "Debug"
74+
Source: "{#OpenCVBinDebug}/opencv_core310d.dll"; DestDir: "{app}"; Flags: ignoreversion
75+
Source: "{#OpenCVBinDebug}/opencv_imgproc310d.dll"; DestDir: "{app}"; Flags: ignoreversion
76+
Source: "{#OpenCVBinDebug}/opencv_highgui310d.dll"; DestDir: "{app}"; Flags: ignoreversion
77+
Source: "{#OpenCVBinDebug}/opencv_ml310d.dll"; DestDir: "{app}"; Flags: ignoreversion
78+
Source: "{#OpenCVBinDebug}/opencv_video310d.dll"; DestDir: "{app}"; Flags: ignoreversion
79+
#else
80+
Source: "{#OpenCVBinRelease}/opencv_core310.dll"; DestDir: "{app}"; Flags: ignoreversion
81+
Source: "{#OpenCVBinRelease}/opencv_imgproc310.dll"; DestDir: "{app}"; Flags: ignoreversion
82+
Source: "{#OpenCVBinRelease}/opencv_highgui310.dll"; DestDir: "{app}"; Flags: ignoreversion
83+
Source: "{#OpenCVBinRelease}/opencv_ml310.dll"; DestDir: "{app}"; Flags: ignoreversion
84+
Source: "{#OpenCVBinRelease}/opencv_video310.dll"; DestDir: "{app}"; Flags: ignoreversion
85+
#endif
86+
87+
Source: "{#SrcDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist
5188
Source: "{#SrcDir}\*.pdb"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist
52-
Source: "{#SrcDir}\VisceralFatValidation.exe"; DestDir: "{app}"; Flags: ignoreversion
53-
Source: "{#SrcDir}\VisceralFatValidation_resource.res"; DestDir: "{app}"; Flags: ignoreversion
89+
Source: "{#SrcDir}\{#MyAppName}.exe"; DestDir: "{app}"; Flags: ignoreversion
90+
Source: "{#SrcDir}\{#MyAppName}_resource.res"; DestDir: "{app}"; Flags: ignoreversion
5491
Source: "{#SrcDir}\iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs skipifsourcedoesntexist
5592
Source: "{#SrcDir}\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs skipifsourcedoesntexist
5693
Source: "{#SrcDir}\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs skipifsourcedoesntexist
5794
Source: "{#SrcDir}\translations\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs skipifsourcedoesntexist
58-
Source: "{#SrcDir}\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
95+
Source: "{#SrcDir}\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall skipifsourcedoesntexist
5996
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
6097

6198
[Icons]

‎main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
6868

6969
app = new Application(argc, argv);
7070
QCoreApplication::setOrganizationName("Southern Illinois University Edwardsville");
71-
QCoreApplication::setApplicationName("Visceral Fat Validation");
71+
QCoreApplication::setApplicationName("SIUE Fat Segmentation Tool");
7272
QCoreApplication::setApplicationVersion(APP_VERSION);
7373

7474
QSurfaceFormat format;

‎mainwindow.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ void MainWindow::on_actionExit_triggered()
8989
void MainWindow::on_actionAbout_triggered()
9090
{
9191
QMessageBox aboutBox(QMessageBox::Information, "About the Program",
92-
QObject::tr("<p><span style=\"font-weight: 600;\">Visceral Fat Validation v%1</span></p>"
92+
QObject::tr("<p><span style=\"font-weight: 600;\">SIUE Fat Segmentation Tool v%1</span></p>"
9393
"<p><span style=\"font-weight: 600;\">Creator:</span> Addison Elliott</p>"
94-
"<p><span style=\"font-weight: 600;\">Release Date: </span>2/06/2017</p>"
94+
"<p><span style=\"font-weight: 600;\">Release Date: </span>8/21/2017</p>"
9595
"<p><span style=\"font-weight: 600;\">Advisor:</span> Jon Klingensmith</p>"
9696
"<p><span style=\"font-weight: 600;\">School:</span> Southern Illinois University Edwardsville</p>"
9797
"<p><strong>Thanks To:&nbsp;</strong></p>"

‎mainwindow.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<bool>true</bool>
2121
</property>
2222
<property name="windowTitle">
23-
<string>Visceral Fat Segmentation</string>
23+
<string>SIUE Fat Segmentation Tool</string>
2424
</property>
2525
<widget class="QWidget" name="centralWidget">
2626
<layout class="QGridLayout" name="gridLayout">

0 commit comments

Comments
 (0)