# HG changeset patch # User Alain Mazy # Date 1706883468 -3600 # Node ID 2be8d5889045e89c62fd41d7a4993b986fb68a60 # Parent b00f7426db5261b222d629ba37d9b786cd0c20b6# Parent c819a8138cad18dd5042eb25a821cd0b18e900ff merge diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/developers/repositories.rst --- a/Sphinx/source/developers/repositories.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/developers/repositories.rst Fri Feb 02 15:17:48 2024 +0100 @@ -78,27 +78,6 @@ `__ to browse the code with richer features than the Web interface. -.. highlight:: text - -You might have to set up a host fingerprint in the Mercurial -configuration. Add the following lines to your ``~/.hgrc`` file:: - - [hostfingerprints] - hg.orthanc-server.com = 06:AE:A1:EE:61:74:77:26:F3:D5:5C:AB:91:0E:39:B1:95:7F:00:25 - -.. highlight:: bash - -For reference, here is the command that was used to generate this SHA1 -fingerprint (`click here for more information -`__):: - - $ openssl s_client -servername hg.orthanc-server.com -connect hg.orthanc-server.com:443 \ - < /dev/null 2>/dev/null | openssl x509 -fingerprint -sha1 -noout -in /dev/stdin - -**Important:** As our certificates are changed periodically, you'll -have to regularly update your configuration file once Mercurial -complains about an unexpected fingerprint. - Recent versions of Mercurial ............................ @@ -117,7 +96,7 @@ and add the following lines:: [hostsecurity] - hg.orthanc-server.com:fingerprints=sha256:13:CA:46:BB:84:96:BD:D4:F7:09:94:60:0F:C2:3B:BA:87:E2:33:50:75:ED:0A:44:81:DF:80:EB:44:6B:C5:40 + orthanc.uclouvain.be:fingerprints=sha256:30:1d:d8:b6:a2:50:23:6a:a1:b7:da:66:b6:aa:2f:fa:59:f3:9d:cd:ed:f8:2c:49:14:57:25:39:84:b9:60:db .. highlight:: bash @@ -125,9 +104,34 @@ SHA256 fingerprint (`click here for more information `__):: - $ openssl s_client -servername hg.orthanc-server.com -connect hg.orthanc-server.com:443 \ + $ openssl s_client -servername orthanc.uclouvain.be -connect orthanc.uclouvain.be:443 \ < /dev/null 2>/dev/null | openssl x509 -fingerprint -sha256 -noout -in /dev/stdin +**Important:** As our certificates are changed periodically, you'll +have to regularly update your configuration file once Mercurial +complains about an unexpected fingerprint. + + +Old versions of Mercurial +^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. highlight:: text + +For old versions of Mercurial that do not support SHA256, add the +following lines to your ``~/.hgrc`` file:: + + [hostfingerprints] + orthanc.uclouvain.be = 69:C0:EF:E7:05:BB:2A:0B:88:EA:E8:00:C6:1A:95:A3:53:74:C1:D4 + +.. highlight:: bash + +For reference, here is the command that was used to generate this SHA1 +fingerprint (`click here for more information +`__):: + + $ openssl s_client -servername orthanc.uclouvain.be -connect orthanc.uclouvain.be:443 \ + < /dev/null 2>/dev/null | openssl x509 -fingerprint -sha1 -noout -in /dev/stdin + Write access ^^^^^^^^^^^^ @@ -200,16 +204,11 @@ recommended way of contributing to Orthanc is always by :ref:`creating contributed plugins `. -* Importantly, before any contribution with significant intellectual - property (i.e. if the contribution go beyond a simple patch) can be - accepted into the Orthanc repositories, its author must sign a - :ref:`CLA `. This allows the University Hospital of Liège, the - Osimis company, and UCLouvain university to act as the official - guardians of the whole Orthanc ecosystem. Note that another - advantage of creating plugins over submitting core to the core - project is that signing a CLA is never needed. Make sure to +* If intellectual property is of importance to you, make sure to carefully read our :ref:`FAQ about the licensing of submitted code - `. + `. If you are concerned about intellectual + property, consider creating plugins instead of submitting code + directly to the core project. .. _hg-patch: diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/integrations/integrate-osirix-using-dicom.rst --- a/Sphinx/source/integrations/integrate-osirix-using-dicom.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/integrations/integrate-osirix-using-dicom.rst Fri Feb 02 15:17:48 2024 +0100 @@ -28,12 +28,11 @@ } -Configuration of Docker images by Osimis ----------------------------------------- +Configuration of Docker images by Orthanc Team +---------------------------------------------- -This section applies if you are using the `Docker images by Osimis -`__ -to run Orthanc. +This section applies if using the :ref:`Docker images by Orthanc Team +` to run Orthanc. Add Modality through Environmental variable in docker:: diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/integrations/integrate-osirix-using-dicomweb.rst --- a/Sphinx/source/integrations/integrate-osirix-using-dicomweb.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/integrations/integrate-osirix-using-dicomweb.rst Fri Feb 02 15:17:48 2024 +0100 @@ -44,7 +44,7 @@ Configuration of Docker images by Orthanc Team ----------------------------------------- +---------------------------------------------- This section applies if you are using the :ref:`orthancteam/orthanc Docker image ` to run Orthanc. diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/plugins/dicomweb.rst --- a/Sphinx/source/plugins/dicomweb.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/plugins/dicomweb.rst Fri Feb 02 15:17:48 2024 +0100 @@ -439,7 +439,7 @@ contacting this DICOMweb server. By default, the global value ``HttpTimeout`` is used. -**Remark:** A :ref:`plugin by Osimis ` is available to +**Remark:** Another :ref:`plugin for Orthanc ` is available to dynamically create authenticated connections to Google Cloud Platform. **Important remark:** When querying a DICOMweb server, Orthanc will diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/plugins/google-cloud-platform.rst --- a/Sphinx/source/plugins/google-cloud-platform.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/plugins/google-cloud-platform.rst Fri Feb 02 15:17:48 2024 +0100 @@ -10,7 +10,7 @@ Introduction ------------ -Osimis freely provides the `source code +The Orthanc project freely provides the `source code `__ of a plugin to interface Orthanc with the Healthcare API of `Google Cloud Platform (GCP) `__ through diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/plugins/neuro.rst --- a/Sphinx/source/plugins/neuro.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/plugins/neuro.rst Fri Feb 02 15:17:48 2024 +0100 @@ -49,7 +49,7 @@ and `macOS `__ are available as well. Furthermore, the :ref:`Docker images ` -``jodogne/orthanc-plugins`` and ``osimis/orthanc`` also contain the +``jodogne/orthanc-plugins`` and ``orthancteam/orthanc`` also contain the plugin. diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/plugins/ohif.rst --- a/Sphinx/source/plugins/ohif.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/plugins/ohif.rst Fri Feb 02 15:17:48 2024 +0100 @@ -65,7 +65,7 @@ and `macOS ` are available as well. Furthermore, the :ref:`Docker images ` -``jodogne/orthanc-plugins`` and ``osimis/orthanc`` also contain the +``jodogne/orthanc-plugins`` and ``orthancteam/orthanc`` also contain the plugin. Debian and Ubuntu packages can be found in the :ref:`standalone repository ` ``https://debian.orthanc-labs.com/``. diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/plugins/osimis-webviewer.rst --- a/Sphinx/source/plugins/osimis-webviewer.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/plugins/osimis-webviewer.rst Fri Feb 02 15:17:48 2024 +0100 @@ -1,7 +1,7 @@ .. _osimis_webviewer: -Osimis Web Viewer plugin (deprecated) +Osimis Web viewer plugin (deprecated) ===================================== .. contents:: @@ -11,10 +11,11 @@ The Osimis Web viewer is now deprecated and superseded by the :ref:`Stone Web viewer `. -This plugin by Osimis extends Orthanc with a Web viewer of medical -images, with more advanced features than the basic :ref:`Orthanc Web -viewer plugin `. The Osimis plugin adds tools for -measuring, for viewing multiple series, and for split-pane. +This plugin, originally written by Osimis, extends Orthanc with a Web +viewer of medical images, with more advanced features than the basic +:ref:`Orthanc Web viewer plugin `. The Osimis Web viewer +plugin adds tools for measuring, for viewing multiple series, and for +split-pane. This plugin adds a dedicated button to Orthanc Explorer to open the viewer that looks like the following image: @@ -98,27 +99,27 @@ FAQ --- -- **Can I use the Osimis Viewer in a medical environment ?** +- **Can I use the Osimis Web viewer in a medical environment?** - The Osimis Viewer is not a Medical Device; it is not CE marked or FDA approved. + The Osimis Web viewer is not a Medical Device; it is not CE marked or FDA approved. - The Osimis Viewer is an open source Viewer that cannot be used for diagnostic or therapeutic purposes. + The Osimis Web viewer is an open source Viewer that cannot be used for diagnostic or therapeutic purposes. However, the viewer can be used as a communication tool that allows Researchers, Teachers, Technicians, General Practitioner or Patients to visualize medical images for information only. Check your local regulations to ensure you're using it in a legal manner. -- **What video formats are supported by the Osimis Web Viewer ?** +- **What video formats are supported by the Osimis Web viewer?** - The set of codecs supported by the Osimis Viewer is an intersection + The set of codecs supported by the Osimis Web viewer is an intersection of the sets of codecs supported by the `DICOM standard `__ and those supported by the `web browsers `__. In short, this mostly comes down to just MPEG-4. -- **Where are the annotations stored ?** +- **Where are the annotations stored?** Annotations are stored in :ref:`metadata ` (id ``9999``) in a custom format. Note that annotation storage is disabled by diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/plugins/postgresql.rst --- a/Sphinx/source/plugins/postgresql.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/plugins/postgresql.rst Fri Feb 02 15:17:48 2024 +0100 @@ -317,7 +317,7 @@ ` Transaction modes (``pg-transactions`` beta version only) -^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. highlight:: json diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/users/docker-osimis.rst --- a/Sphinx/source/users/docker-osimis.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/users/docker-osimis.rst Fri Feb 02 15:17:48 2024 +0100 @@ -1,15 +1,8 @@ .. _docker-osimis: -.. highlight:: bash osimis/orthanc Docker images ============================ -.. contents:: - :depth: 3 - -.. warning:: - - From February 2024, you should now use :ref:`orthancteam/orthanc ` Docker images instead of the ``osimis/orthanc`` ones. - - +The content of this page was replaced by the following on 2024-02-01: +:ref:`orthancteam/orthanc Docker images `. diff -r b00f7426db52 -r 2be8d5889045 Sphinx/source/users/docker.rst --- a/Sphinx/source/users/docker.rst Fri Feb 02 15:13:19 2024 +0100 +++ b/Sphinx/source/users/docker.rst Fri Feb 02 15:17:48 2024 +0100 @@ -33,7 +33,7 @@ (i.e. manual edition of the configuration files). These images are most useful to **software developers and researchers**. -* Our commercial partner `Orthanc Team `__ also +* Our commercial partner `Orthanc Team `__ also `publishes separated Docker images `__. These ``orthancteam/orthanc`` images are used by the technical team of