mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
0029009: Configuration - provide a way to get visual dif of SVG images
New helper script svgdiff.bat is added in adm folder. It can be used for enabling visual diff for SVG images in TortouseGit; see Git guide for details.
This commit is contained in:
parent
471a2ca0bf
commit
efe9d99730
31
adm/svgdiff.bat
Normal file
31
adm/svgdiff.bat
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
@echo off
|
||||||
|
rem Script to diff SVG images visually (as PNG) in TortoiseGit client
|
||||||
|
rem
|
||||||
|
rem It assumes that Inkscape and TortoiseGitIDiff executables are either
|
||||||
|
rem installed in default locations in Program Files, or are accessible by PATH
|
||||||
|
rem
|
||||||
|
rem To use this script for diffing SVG images, open TortoiseGit settings
|
||||||
|
rem (Start -> Programs -> TortoiseGit -> Settings), select "Diff Viewer",
|
||||||
|
rem click button "Advanced..." on the right tab and then add new record:
|
||||||
|
rem - Extension: .svg
|
||||||
|
rem - External program: <path to OCCT>\adm\svgdiff.bat %base %mine %bname %yname
|
||||||
|
|
||||||
|
rem Remove double quotes around arguments
|
||||||
|
set "f1=%1"
|
||||||
|
set "f2=%2"
|
||||||
|
set "f1=%f1:~1,-1%.png"
|
||||||
|
set "f2=%f2:~1,-1%.png"
|
||||||
|
|
||||||
|
rem Check if Inkscape and TortoiseGit are installed in default locations in
|
||||||
|
rem ProgramFiles; if not, assume they still may be accessible by PATH
|
||||||
|
set "inkscape=%ProgramFiles%\Inkscape\inkscape.exe"
|
||||||
|
if not exist "%inkscape%" set inkscape=inkscape.exe
|
||||||
|
set "tgitidiff=%ProgramFiles%\TortoiseGit\bin\TortoiseGitIDiff.exe"
|
||||||
|
if not exist "%tgitidiff%" set tgitidiff=TortoiseGitIDiff.exe
|
||||||
|
|
||||||
|
rem Convert SVG to PNG using Inkscape
|
||||||
|
"%inkscape%" -e "%f1%" %1
|
||||||
|
"%inkscape%" -e "%f2%" %2
|
||||||
|
|
||||||
|
rem Call Tortoise differ
|
||||||
|
"%tgitidiff%" /left:"%f1%" /right:"%f2%" /lefttitle:%3 /righttitle:%4
|
@ -82,7 +82,7 @@ The official repository contains:
|
|||||||
|
|
||||||
@subsection occt_gitguide_1_5 Version of Git
|
@subsection occt_gitguide_1_5 Version of Git
|
||||||
|
|
||||||
The repository is tested to work with Git 1.7.6 to 1.7.9.
|
The repository is tested to work with Git 1.7.6 and above.
|
||||||
Please do not use versions below 1.7.1 as they are known to cause troubles.
|
Please do not use versions below 1.7.1 as they are known to cause troubles.
|
||||||
|
|
||||||
@section occt_gitguide_2 Installing Tools for Work with Git
|
@section occt_gitguide_2 Installing Tools for Work with Git
|
||||||
@ -139,6 +139,13 @@ The official repository contains:
|
|||||||
|
|
||||||
@figure{OCCT_GitGuide_V2_image006.png,"",320}
|
@figure{OCCT_GitGuide_V2_image006.png,"",320}
|
||||||
|
|
||||||
|
Optionally, you can set up TortoiseGit to use visual diff utility for SVG images used in OCCT documentation.
|
||||||
|
For that, click on item "Diff Viewer" in the Settings dialog, then click button "Advanced..." on the right tab add new record with the following parameters:
|
||||||
|
- Extension: <code>.svg</code>
|
||||||
|
- External program: <code><path_to_OCCT>\\adm\\svgdiff.bat %%base %%mine %%bname %%yname</code>
|
||||||
|
|
||||||
|
@figure{OCCT_GitGuide_V2_svgdiff.png,"",709}
|
||||||
|
|
||||||
@subsection occt_gitguide_2_2 Linux platform
|
@subsection occt_gitguide_2_2 Linux platform
|
||||||
|
|
||||||
We assume that Linux users have Git already installed and available in the *PATH*.
|
We assume that Linux users have Git already installed and available in the *PATH*.
|
||||||
|
BIN
dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_svgdiff.png
Normal file
BIN
dox/dev_guides/git_guide/images/OCCT_GitGuide_V2_svgdiff.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 54 KiB |
Loading…
x
Reference in New Issue
Block a user