diff --git a/hub/WINDOWS_INSTALL.md b/hub/WINDOWS_INSTALL.md index 0eb13976..c8db417b 100644 --- a/hub/WINDOWS_INSTALL.md +++ b/hub/WINDOWS_INSTALL.md @@ -2,16 +2,16 @@ This is an installation guide for Windows, covering all the steps needed to begin developing code for the Urban Simulation Platform 'Hub'. At the end of this process you will have installed and configured all the necessary applications, -set up your own project on CERC's Gitlab and created your first python file. +set up your own project on CERC's Gitea and created your first python file. ## Prepare your environment -g To develop any new code for the Urban Simulation Platform you must have the right software applications installed and configured. The Platform is written in python and so the applications you need are: * Miniconda +* SRA Files * Python Editor -You also need to register a user account with the CERC's code repository on Gitlab and have the necessary permissions for +You also need to register a user account with the CERC's code repository on Gitea and have the necessary permissions for creating new code. For that purpose, please, contact Guillermo (guillermo.gutierrezmorote@concordia.ca) or Koa (kekoa.wells@concordia.ca) as soon as possible. @@ -47,6 +47,21 @@ _The term '...' is not recognized as the name of a cmdlet, function,..._ To solve it, type 'Set-ExecutionPolicy Unrestricted' as shown in the image. +### Setup SRA + +1. Get the SRA executable and dll files from Guille or Koa +2. Create a folder in "C:\Program Files\" called "sra" + +![create_sra](docs/img_windows_install/img_34.png) + +3. Copy shortwave_integer.exe and pthreadGC2.dll into the sra folder. + +![create_sra](docs/img_windows_install/img_35.png) + +4. Add the newly created sra folder to the Path, similar to step 2 from the Miniconda setup above. + +![create_sra](docs/img_windows_install/img_36.png) + ### Get a Python editor 1. You will need a python editor in order to import the existing Hub source code and to write your own python code. @@ -55,7 +70,7 @@ an excellent open-source python editor. 2. Run the installer, and follow the installation instructions for PyCharm, you may change a few options, but the default ones should be fine. -**NOTE:** If Pycharm asks you to create a Virtual Environment, click **Cancel**. You will do it later using Conda instead. +**NOTE:** If PyCharm asks you to create a Virtual Environment, click **Cancel**. You will do it later using Conda instead. ![creating_virtual_environment](docs/img_windows_install/img_31.png) @@ -70,14 +85,12 @@ You can find it also at **Git->Clone...** ![pycharm get from version control](docs/img_windows_install/img_6.png) -3. Select **Git** as the **Version control**. For the URL use the link to the Hub repository, as seen below. +3. Select **Git** as the **Version control**. Open the [hub repository](https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub) +on Gitea and copy the URL from your browser to use as the URL inside PyCharm. ![pycharm get from version control screen](docs/img_windows_install/img_1.png) -(You can also copy this URL by going to the Hub repository in [Gitlab](https://rs-loy-gitlab.concordia.ca/Guille/hub.git) -and clicking on the **Copy URL** button, next to **Clone with HTTPS**) - -![gitlab get https](docs/img_windows_install/img_17.png) +![gitea get https](docs/img_windows_install/img_39.png) The Directory to store the Hub source code locally is automatically created for you. Edit this if you prefer it to be stored somewhere else. @@ -152,7 +165,7 @@ _lca_classes_,... And, click on the **Create** button. 3. Click on the **Git** button in the bottom-left corner to pop-up the window showing the Git information. See your new branch has been created under _Local_. -4. Now we need to let the CERC Gitlab repository know about this new branch. You do this by right-clicking on +4. Now we need to let the CERC Gitea repository know about this new branch. You do this by right-clicking on your branch and selecting **Push...** from the drop-down menu. 5. Then click on the **Push** button at the bottom-right of the **Push Commits** window. @@ -180,33 +193,35 @@ See the picture below. ![pycharm configuration screen](docs/img_windows_install/img_5.png) -## Set up a new project on Gitlab +## Set up a new project on Gitea +You will need an account before you can access the Gitea. Please contact Guillermo (guillermo.gutierrezmorote@concordia.ca) or +Koa (kekoa.wells@concordia.ca) to request an account. -1. Open a browser and to the [CERC Git](https://rs-loy-gitlab.concordia.ca/). Click on the blue **New project** button. +1. Open a browser and go to the [CERC Gitea](https://nextgenerations-cities.encs.concordia.ca/). Click on the **+** in the top right +and select "New Repository" or press the **+** below the Organization tab. -![git new project screen](docs/img_windows_install/img_14.png) +![git new project screen](docs/img_windows_install/img_37.png) 2. Choose the **Create blank project** option from the three options seen below. 3. Type in a name that describes your project: _hp_workflow_, _bus_system_optimization_... (remember to follow the CERC naming conventions described in the [Coding Style](PYGUIDE.md)). -Check the option **Initialize repository with a README**, and ideally, check the **Visibility Level** to be **Public**. +Ideally, uncheck the option **Make Repository Private**, and check the **Initialize Repository** Then click on the **Create project** button. -![git give a name](docs/img_windows_install/img_15.png) +![git give a name](docs/img_windows_install/img_38.png) You should then see a confirmation screen with all the information about your new project. ## Get your project into Pycharm -1. Now you can make a clone of this project, within PyCharm. First, copy the URL by clicking on the blue **Clone** button -and then click on the **Copy URL** button, next to the **Clone with HTTPS** link. +1. Now you can make a clone of this project, within PyCharm. First, go to the page of your repository on the Gitea and copy the URL. 2. Switch back to PyCharm and close the Hub project by choosing **File->Close Project**. You will then see the **Welcome To PyCharm** window again. 3. Clone a copy of your Project into PyCharm, following the steps 2-6 of the _GET THE CERC HUB SOURCE CODE_ -section above, but using the URL link that you just copied for your gitlab project. +section above, but using the URL link that you just copied for your Gitea project. 4. Select **File->Settings** to open the **Settings** window. From the panel on the left click on **Project: -> Project Structure**. @@ -242,5 +257,5 @@ city = GeometryFactory('citygml', path='myfile.gml').city 9. Always remember to push your own project changes as the last thing you do before ending your working day! First, commit your changes by clicking on the green check in the top-right corner of Pycharm. Add a comment that explains briefly your changes. -Then, pull by clicking on the blue arrow to be sure that there are no conflicts between your version (local) and the remote one (gitlab). +Then, pull by clicking on the blue arrow to be sure that there are no conflicts between your version (local) and the remote one (Gitea). Once the conflicts are solved and the merge in local is done, push the changes by clicking on the green arrow. diff --git a/hub/docs/img_macos_install/img_macos_install/img_0.png b/hub/docs/img_macos_install/img_macos_install/img_0.png new file mode 100644 index 00000000..829f9124 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_0.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_1.png b/hub/docs/img_macos_install/img_macos_install/img_1.png new file mode 100644 index 00000000..bd5caec3 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_1.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_10.png b/hub/docs/img_macos_install/img_macos_install/img_10.png new file mode 100644 index 00000000..8d6e8f26 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_10.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_11.png b/hub/docs/img_macos_install/img_macos_install/img_11.png new file mode 100644 index 00000000..f5071a18 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_11.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_12.png b/hub/docs/img_macos_install/img_macos_install/img_12.png new file mode 100644 index 00000000..a99c097d Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_12.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_13.png b/hub/docs/img_macos_install/img_macos_install/img_13.png new file mode 100644 index 00000000..8f74febf Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_13.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_14.png b/hub/docs/img_macos_install/img_macos_install/img_14.png new file mode 100644 index 00000000..ea939d7d Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_14.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_15.png b/hub/docs/img_macos_install/img_macos_install/img_15.png new file mode 100644 index 00000000..bfcfa889 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_15.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_16.png b/hub/docs/img_macos_install/img_macos_install/img_16.png new file mode 100644 index 00000000..f43f57c1 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_16.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_17.png b/hub/docs/img_macos_install/img_macos_install/img_17.png new file mode 100644 index 00000000..05aeac44 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_17.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_18.png b/hub/docs/img_macos_install/img_macos_install/img_18.png new file mode 100644 index 00000000..6bb1009c Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_18.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_19.png b/hub/docs/img_macos_install/img_macos_install/img_19.png new file mode 100644 index 00000000..182a4fef Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_19.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_2.png b/hub/docs/img_macos_install/img_macos_install/img_2.png new file mode 100644 index 00000000..021cf8fe Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_2.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_3.png b/hub/docs/img_macos_install/img_macos_install/img_3.png new file mode 100644 index 00000000..22b775c2 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_3.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_4.png b/hub/docs/img_macos_install/img_macos_install/img_4.png new file mode 100644 index 00000000..7592389b Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_4.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_5.png b/hub/docs/img_macos_install/img_macos_install/img_5.png new file mode 100644 index 00000000..12e92895 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_5.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_6.png b/hub/docs/img_macos_install/img_macos_install/img_6.png new file mode 100644 index 00000000..882ff66c Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_6.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_7.png b/hub/docs/img_macos_install/img_macos_install/img_7.png new file mode 100644 index 00000000..31351501 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_7.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_8.png b/hub/docs/img_macos_install/img_macos_install/img_8.png new file mode 100644 index 00000000..94c816f4 Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_8.png differ diff --git a/hub/docs/img_macos_install/img_macos_install/img_9.png b/hub/docs/img_macos_install/img_macos_install/img_9.png new file mode 100644 index 00000000..d801d0df Binary files /dev/null and b/hub/docs/img_macos_install/img_macos_install/img_9.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_0.png b/hub/docs/img_macos_install/img_windows_install/img_0.png new file mode 100644 index 00000000..5a3c6035 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_0.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_1.png b/hub/docs/img_macos_install/img_windows_install/img_1.png new file mode 100644 index 00000000..dd53449d Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_1.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_10.png b/hub/docs/img_macos_install/img_windows_install/img_10.png new file mode 100644 index 00000000..5e3528b4 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_10.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_11.png b/hub/docs/img_macos_install/img_windows_install/img_11.png new file mode 100644 index 00000000..2c87b995 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_11.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_12.png b/hub/docs/img_macos_install/img_windows_install/img_12.png new file mode 100644 index 00000000..99dab2f1 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_12.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_13.png b/hub/docs/img_macos_install/img_windows_install/img_13.png new file mode 100644 index 00000000..1542f551 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_13.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_14.png b/hub/docs/img_macos_install/img_windows_install/img_14.png new file mode 100644 index 00000000..822befbf Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_14.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_15.png b/hub/docs/img_macos_install/img_windows_install/img_15.png new file mode 100644 index 00000000..820e0790 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_15.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_16.png b/hub/docs/img_macos_install/img_windows_install/img_16.png new file mode 100644 index 00000000..2b53174b Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_16.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_17.png b/hub/docs/img_macos_install/img_windows_install/img_17.png new file mode 100644 index 00000000..ebb83cb4 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_17.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_2.png b/hub/docs/img_macos_install/img_windows_install/img_2.png new file mode 100644 index 00000000..1ccad7a4 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_2.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_20.png b/hub/docs/img_macos_install/img_windows_install/img_20.png new file mode 100644 index 00000000..52bf0302 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_20.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_21.png b/hub/docs/img_macos_install/img_windows_install/img_21.png new file mode 100644 index 00000000..cba7955c Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_21.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_22.png b/hub/docs/img_macos_install/img_windows_install/img_22.png new file mode 100644 index 00000000..5fd8bbca Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_22.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_23.png b/hub/docs/img_macos_install/img_windows_install/img_23.png new file mode 100644 index 00000000..db3310d3 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_23.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_24.png b/hub/docs/img_macos_install/img_windows_install/img_24.png new file mode 100644 index 00000000..bf1c7011 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_24.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_25.png b/hub/docs/img_macos_install/img_windows_install/img_25.png new file mode 100644 index 00000000..ea0fdb47 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_25.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_26.png b/hub/docs/img_macos_install/img_windows_install/img_26.png new file mode 100644 index 00000000..747b3f2d Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_26.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_27.png b/hub/docs/img_macos_install/img_windows_install/img_27.png new file mode 100644 index 00000000..05912b32 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_27.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_28.png b/hub/docs/img_macos_install/img_windows_install/img_28.png new file mode 100644 index 00000000..58532a42 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_28.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_29.png b/hub/docs/img_macos_install/img_windows_install/img_29.png new file mode 100644 index 00000000..2731ddeb Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_29.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_3.png b/hub/docs/img_macos_install/img_windows_install/img_3.png new file mode 100644 index 00000000..c9f27de3 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_3.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_30.png b/hub/docs/img_macos_install/img_windows_install/img_30.png new file mode 100644 index 00000000..7453f089 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_30.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_31.png b/hub/docs/img_macos_install/img_windows_install/img_31.png new file mode 100644 index 00000000..b4805b16 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_31.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_32.png b/hub/docs/img_macos_install/img_windows_install/img_32.png new file mode 100644 index 00000000..b7bbc2e5 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_32.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_33.png b/hub/docs/img_macos_install/img_windows_install/img_33.png new file mode 100644 index 00000000..4b95c30d Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_33.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_34.png b/hub/docs/img_macos_install/img_windows_install/img_34.png new file mode 100644 index 00000000..a8d8a99d Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_34.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_35.png b/hub/docs/img_macos_install/img_windows_install/img_35.png new file mode 100644 index 00000000..067b226e Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_35.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_36.png b/hub/docs/img_macos_install/img_windows_install/img_36.png new file mode 100644 index 00000000..975eaf9b Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_36.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_37.png b/hub/docs/img_macos_install/img_windows_install/img_37.png new file mode 100644 index 00000000..cb0679c0 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_37.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_38.png b/hub/docs/img_macos_install/img_windows_install/img_38.png new file mode 100644 index 00000000..5ea1783a Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_38.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_39.png b/hub/docs/img_macos_install/img_windows_install/img_39.png new file mode 100644 index 00000000..0463d4e6 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_39.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_4.png b/hub/docs/img_macos_install/img_windows_install/img_4.png new file mode 100644 index 00000000..3818b949 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_4.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_40.png b/hub/docs/img_macos_install/img_windows_install/img_40.png new file mode 100644 index 00000000..d01ff5b7 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_40.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_5.png b/hub/docs/img_macos_install/img_windows_install/img_5.png new file mode 100644 index 00000000..7251bd7a Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_5.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_6.png b/hub/docs/img_macos_install/img_windows_install/img_6.png new file mode 100644 index 00000000..4797089c Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_6.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_7.png b/hub/docs/img_macos_install/img_windows_install/img_7.png new file mode 100644 index 00000000..3beafb22 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_7.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_8.png b/hub/docs/img_macos_install/img_windows_install/img_8.png new file mode 100644 index 00000000..50d9984c Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_8.png differ diff --git a/hub/docs/img_macos_install/img_windows_install/img_9.png b/hub/docs/img_macos_install/img_windows_install/img_9.png new file mode 100644 index 00000000..3e483e84 Binary files /dev/null and b/hub/docs/img_macos_install/img_windows_install/img_9.png differ