Skip to content
Snippets Groups Projects
Commit 7046afbc authored by RICQUIER FLORIAN's avatar RICQUIER FLORIAN :duck:
Browse files

fix : remove old logos, improve logso and new names

parent 2217b4dc
No related branches found
No related tags found
No related merge requests found
Pipeline #215773 failed
Showing
with 32 additions and 55 deletions
Package: OptirrigManual
Package: optirrigMANUAL
Type: Package
Title: OptirrigManual
Title: optirrigMANUAL
Version: 0.1.0
Authors@R: c(
person("UMR G-Eau Aqua Department INRAE Montpellier", "Team Optimiste", role = c("aut", "cre"), email = "florian.ricquier@inrae.fr"))
......@@ -10,7 +10,7 @@ License: GPL (>= 3)
LazyData: true
Depends:
R (>= 2.10),
OptirrigCore (>= 0.4.0)
optirrigCORE (>= 0.4.0)
Imports:
fairify,
Suggests:
......@@ -20,7 +20,7 @@ Suggests:
usethis,
testthat (>= 3.0.0)
remotes:
git::https://package_read:NypwTCoxFT6f6yDQruje@forgemia.inra.fr/optirrigdev/OptirrigCore.git,
git::https://package_read:NypwTCoxFT6f6yDQruje@forgemia.inra.fr/optirrigdev/optirrigCORE.git,
git::https://forgemia.inra.fr/umr-g-eau/fairify.git
VignetteBuilder: knitr
RoxygenNote: 7.3.1
......
# OptirrigManual 0.1.0
# optirrigMANUAL 0.1.0
# <img src="man/figures/logo_OptirrigManual_200px.png" alt="Optirrig" align="right" style="width:200px"/> OptirrigManual: User Manual & Documentation : R Package support
# <img src="man/figures/logo_optirrigMANUAL_200px.png" alt="Optirrig" align="right" style="width:200px"/> optirrigMANUAL: User Manual & Documentation : R Package support
<!-- badges: start -->
[![CRAN](https://www.r-pkg.org/badges/version-ago/OptirrigManual)](https://forgemia.inra.fr/optirrigdev/OptirrigManual.git)
[![CRAN](https://www.r-pkg.org/badges/version-ago/optirrigMANUAL)](https://forgemia.inra.fr/optirrigdev/optirrigMANUAL.git)
[![License:
GPL-3](https://img.shields.io/badge/license-GPL--3-orange.svg)](https://cran.r-project.org/web/licenses/GPL-3)
[![Dev check
status](https://forgemia.inra.fr/optirrigdev/OptirrigManual/badges/main/pipeline.svg)](forgemia.inra.fr/optirrigdev/OptirrigManual/-/pipelines)
status](https://forgemia.inra.fr/optirrigdev/optirrigMANUAL/badges/main/pipeline.svg)](forgemia.inra.fr/optirrigdev/optirrigMANUAL/-/pipelines)
<!-- badges: end -->
Optirrig is a conceptual 1D model with multiple functionalities. Its
......@@ -21,18 +21,18 @@ integrating functionality as required.
## Installation
You can install the development version of OptirrigManual like so:
You can install the development version of optirrigMANUAL like so:
``` r
install.packages("remotes")
remotes::install_git("https://package_read:NypwTCoxFT6f6yDQruje@forgemia.inra.fr/optirrigdev/OptirrigManual.git", build_vignettes = TRUE)
remotes::install_git("https://read_only:R77TN1F7k-n7PqoixcRh@forgemia.inra.fr/optirrigdev/optirrigMANUAL.git", build_vignettes = TRUE)
```
## Launch the library
``` r
library(OptirrigCore)
library(OptirrigManual)
library(optirrigCORE)
library(optirrigMANUAL)
```
## Documentation
......
......@@ -2,12 +2,17 @@
output: github_document
---
# <img src="man/figures/logo_OptirrigManual_200px.png" alt="Optirrig" align="right" style="width:200px"/> OptirrigManual: User Manual & Documentation : R Package support
```{r, include = FALSE}
library(optirrigCORE)
resizeLogo(filePath = "man/figures/logo_optirrigMANUAL.png", widths = c(200, 50))
```
# <img src="man/figures/logo_optirrigMANUAL_200px.png" alt="Optirrig" align="right" style="width:200px"/> optirrigMANUAL: User Manual & Documentation : R Package support
<!-- badges: start -->
[![CRAN](https://www.r-pkg.org/badges/version-ago/OptirrigManual)]( https://forgemia.inra.fr/optirrigdev/OptirrigManual.git)
[![CRAN](https://www.r-pkg.org/badges/version-ago/optirrigMANUAL)]( https://forgemia.inra.fr/optirrigdev/optirrigMANUAL.git)
[![License: GPL-3](https://img.shields.io/badge/license-GPL--3-orange.svg)](https://cran.r-project.org/web/licenses/GPL-3)
[![Dev check status](https://forgemia.inra.fr/optirrigdev/OptirrigManual/badges/main/pipeline.svg)](forgemia.inra.fr/optirrigdev/OptirrigManual/-/pipelines)
[![Dev check status](https://forgemia.inra.fr/optirrigdev/optirrigMANUAL/badges/main/pipeline.svg)](forgemia.inra.fr/optirrigdev/optirrigMANUAL/-/pipelines)
<!-- badges: end -->
```{r opts, include = FALSE}
......@@ -25,18 +30,18 @@ The purpose of this package is to serve as a basis for developing and integratin
## Installation
You can install the development version of OptirrigManual like so:
You can install the development version of optirrigMANUAL like so:
``` r
install.packages("remotes")
remotes::install_git("https://package_read:NypwTCoxFT6f6yDQruje@forgemia.inra.fr/optirrigdev/OptirrigManual.git", build_vignettes = TRUE)
remotes::install_git("https://read_only:R77TN1F7k-n7PqoixcRh@forgemia.inra.fr/optirrigdev/optirrigMANUAL.git", build_vignettes = TRUE)
```
## Launch the library
``` r
library(OptirrigCore)
library(OptirrigManual)
library(optirrigCORE)
library(optirrigMANUAL)
```
## Documentation
......
url: https://optirrig.pages.mia.inra.fr/OptirrigManual/
url: https://optirrig.pages.mia.inra.fr/optirrigMANUAL/
template:
package: pkgdown
params:
......@@ -30,7 +30,7 @@ navbar:
components:
gitlab: ~
icon: fab fa-gitlab fa-lg
href: https://forgemia.inra.fr/optirrigdev/OptirrigManual
href: https://forgemia.inra.fr/optirrigdev/optirrigMANUAL
reports:
text: Reports
menu:
......@@ -42,6 +42,6 @@ navbar:
href: reports/WP2_Prima_MAGO_livrable/index.html
repo:
url:
home: https://forgemia.inra.fr/optirrigdev/OptirrigManual
source: https://forgemia.inra.fr/optirrigdev/OptirrigManual/-/tree/main/
issue: https://forgemia.inra.fr/optirrigdev/OptirrigManual/-/issues
home: https://forgemia.inra.fr/optirrigdev/optirrigMANUAL
source: https://forgemia.inra.fr/optirrigdev/optirrigMANUAL/-/tree/main/
issue: https://forgemia.inra.fr/optirrigdev/optirrigMANUAL/-/issues
flowchart TD
A[OptirrigCore] -->|Ex-Post| B(Usage Analytique)
A[OptirrigCore] -->|Ex-Ante| C(Usage Prospectif)
A[OptirrigCore] -->|OAD| D(Usage en temps réel)
A[optirrigCORE] -->|Ex-Post| B(Usage Analytique)
A[optirrigCORE] -->|Ex-Ante| C(Usage Prospectif)
A[optirrigCORE] -->|OAD| D(Usage en temps réel)
B --> |Reproduction de situation
passées, recherche d'alternative
......
man/figures/logo_OptirrigACS.png

481 KiB

man/figures/logo_OptirrigACS_200px.png

26.9 KiB

man/figures/logo_OptirrigACS_50px.png

3.75 KiB

man/figures/logo_OptirrigBeet.png

347 KiB

man/figures/logo_OptirrigBeet_200px.png

25.9 KiB

man/figures/logo_OptirrigBeet_50px.png

4.49 KiB

man/figures/logo_OptirrigChart.png

413 KiB

man/figures/logo_OptirrigChart_200px.png

27.1 KiB

man/figures/logo_OptirrigChart_50px.png

4.68 KiB

createStickers <- function() {
# Liste des packages requis
packages <- c("showtext", "sysfonts", "hexSticker")
# Vérifie et installe les packages manquants
for(pkg in packages){
if(!require(pkg, character.only = TRUE)){
install.packages(pkg)
library(pkg, character.only = TRUE)
}
}
# Configuration de showtext pour utiliser les polices Google
sysfonts::font_add_google("Raleway", "Raleway")
showtext::showtext_auto()
# Création du sticker
hexSticker::sticker("man/figures/logo_OptirrigCore.png",
s_x = 1, s_y = 1, s_width = 0.85,
package = "",
p_color = "#003366",
h_fill = "white",
h_color = "#003366",
filename = "man/figures/logo_OptirrigCore_sticker.png")
}
createStickers()
man/figures/logo_OptirrigCore.png

118 KiB

man/figures/logo_OptirrigCore_200px.png

26.8 KiB

man/figures/logo_OptirrigCore_50px.png

4.61 KiB

man/figures/logo_OptirrigCore_init.png

120 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment