Skip to content

Commit

Permalink
Change project name
Browse files Browse the repository at this point in the history
  • Loading branch information
vietanhdev committed Mar 15, 2019
1 parent 414aa22 commit 0d2d2ec
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)

# Specify project title
project(ml-cam)
project(FaceCam)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

Expand Down
20 changes: 10 additions & 10 deletions CMakeLists.txt.user
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<valuelist type="QVariantList" key="CMake.Configuration"/>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Default</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Default</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
Expand Down Expand Up @@ -111,7 +111,7 @@
<valuelist type="QVariantList" key="CMake.Configuration">
<value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
</valuelist>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
Expand Down Expand Up @@ -155,7 +155,7 @@
<valuelist type="QVariantList" key="CMake.Configuration">
<value type="QString">CMAKE_BUILD_TYPE:STRING=Release</value>
</valuelist>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
Expand Down Expand Up @@ -199,7 +199,7 @@
<valuelist type="QVariantList" key="CMake.Configuration">
<value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
</valuelist>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Release with Debug Information</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Release with Debug Information</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
Expand Down Expand Up @@ -243,7 +243,7 @@
<valuelist type="QVariantList" key="CMake.Configuration">
<value type="QString">CMAKE_BUILD_TYPE:STRING=MinSizeRel</value>
</valuelist>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Minimum Size Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Minimum Size Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
Expand Down Expand Up @@ -338,15 +338,15 @@
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">ml-cam</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">facecam</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Default/bin</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Default/bin</value>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">ml-cam</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">facecam</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.ml-cam</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.facecam</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
Expand Down Expand Up @@ -397,7 +397,7 @@
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qimgv</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/mnt/DATA/HUST2019/Projects/build-ml-cam-Desktop-Default/bin</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/mnt/DATA/HUST2019/Projects/build-facecam-Desktop-Default/bin</value>
<value type="int" key="PE.EnvironmentAspect.Base">-1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qimgv</value>
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ make

- Run
```
./ml-cam
./FaceCam
```

### Setup for Windows 10
Expand Down Expand Up @@ -115,13 +115,13 @@ cd build-win
cmake -G "Visual Studio 15 2017 Win64" ..
```

- Open `build-win\ml-cam.sln` with Visual Studio 2017.
- Open `build-win\FaceCam.sln` with Visual Studio 2017.

- Set `ml-cam` as StartUp project. (Right click `ml-cam` project > Set as StartUp project)
- Set `FaceCam` as StartUp project. (Right click `FaceCam` project > Set as StartUp project)

- Right click `ml-cam` project > **Properties** > **Configuration Properties** > **C/C++** > **Code Generation** > Set **Runtime Library** to `Multi-threaded (/MT)`. **You need to check this option again after changing the build mode (debug/release)**.
- Right click `FaceCam` project > **Properties** > **Configuration Properties** > **C/C++** > **Code Generation** > Set **Runtime Library** to `Multi-threaded (/MT)`. **You need to check this option again after changing the build mode (debug/release)**.

- Set Working Directory in Debugging to TargetDir: Right click `ml-cam` project > **Properties** > **Configuration Properties** > **Debugging** > Set **Working Directory** to `$(TargetDir)`.
- Set Working Directory in Debugging to TargetDir: Right click `FaceCam` project > **Properties** > **Configuration Properties** > **Debugging** > Set **Working Directory** to `$(TargetDir)`.

- Build project with Visual Studio 2017.

Expand All @@ -130,18 +130,18 @@ cmake -G "Visual Studio 15 2017 Win64" ..
+ For Release Build
```
cd build-win\Release
windeployqt.exe --release .\ml-cam.exe
windeployqt.exe --release FaceCam.exe
```

+ For Debug Build
```
cd build-win\Debug
windeployqt.exe --debug .\ml-cam.exe
windeployqt.exe --debug FaceCam.exe
```

- **NOTE**:
+ If you build with Release mode, `cd build-win\Release`.
+ Only after you run `windeployqt.exe .\ml-cam.exe` successfully, you can run the excutable file `ml-cam.exe`.
+ Only after you run `windeployqt.exe .\FaceCam.exe` successfully, you can run the excutable file `FaceCam.exe`.



Expand Down
2 changes: 1 addition & 1 deletion src/file_storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fs::path FileStorage::getVideoPath() { return VIDEO_FOLDER; }
bool FileStorage::saveImage(const cv::Mat& img) {

// *** Create a unique file name for each image
// The image path is formated like this: .../mLearningCam/Photos/2019-02-08-21-55-88.1549637628399.png
// The image path is formated like this: .../FaceCam/Photos/2019-02-08-21-55-88.1549637628399.png

std::stringstream filename;

Expand Down
2 changes: 1 addition & 1 deletion src/file_storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace ml_cam {

class FileStorage {
private:
const fs::path DATA_FOLDER_NAME = "mLearningCam";
const fs::path DATA_FOLDER_NAME = "FaceCam";
const fs::path PHOTO_FOLDER_NAME = "Photos";
const fs::path VIDEO_FOLDER_NAME = "Videos";
fs::path DATA_FOLDER;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>mLearning Cam</string>
<string>FaceCam</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) {

// Create frameless window (and set windowState or title)
FramelessWindow framelessWindow;
framelessWindow.setWindowTitle("mLearning Cam");
framelessWindow.setWindowTitle("FaceCam");
framelessWindow.setWindowIcon(a.style()->standardIcon(QStyle::SP_DesktopIcon));

// Create our mainwindow instance
Expand Down

0 comments on commit 0d2d2ec

Please sign in to comment.