Fix names of a few more images

Author: sjoelund

usersguide-sphinx/Makefile

@@ -7,7 +7,7 @@ SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build
 
-ALLDEP = source/openmodelica.bib source/interface.inc $(OMEDIT_ICONS)
+ALLDEP = source/openmodelica.bib source/interface.inc $(OMEDIT_ICONS) $(OMOPTIM_ICONS)
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
@@ -230,8 +230,9 @@ OMEDIT_ICONS_SVG=$(OMEDIT_ICONS_BASE:%=source/media/omedit-icons/%)
 OMEDIT_ICONS_PNG=$(OMEDIT_ICONS_SVG:%.svg=%.png)
 OMEDIT_ICONS=$(OMEDIT_ICONS_SVG) $(OMEDIT_ICONS_PNG)
 
-omedit-icons:
-	echo $(OMEDIT_ICONS)
+OMOPTIM_ICONS_BASE=Add.png
+OMOPTIM_ICONS=$(OMOPTIM_ICONS_BASE:%=source/media/omoptim-icons/%)
+
 all-dep: $(ALLDEP)
 
 source/media/omedit-icons/%.svg: $(OPENMODELICAHOME)/../OMEdit/OMEdit/OMEditGUI/Resources/icons/%.svg
@@ -240,3 +241,7 @@ source/media/omedit-icons/%.svg: $(OPENMODELICAHOME)/../OMEdit/OMEdit/OMEditGUI/
 
 source/media/omedit-icons/%.png: source/media/omedit-icons/%.svg
 	inkscape "$<" --export-png="$@"
+
+source/media/omoptim-icons/%.png: $(OPENMODELICAHOME)/../OMOptim/OMOptim/GUI/Resources/icons/%.png
+	@mkdir -p source/media/omoptim-icons
+	cp -a "$<" "$@"

usersguide-sphinx/source/emscripten.rst

@@ -8,9 +8,6 @@ For more information, see https://github.com/tshort/openmodelica-javascript
 
 Below used on the MSL MultiBody RobotR3.fullRobot example model.
 
-|image48|
+.. image:: media/emscripten-model.png
 
-|image49|
-
-.. |image48| image:: media/image91.png
-.. |image49| image:: media/image92.png
+.. image:: media/emscripten-result.png

usersguide-sphinx/source/introduction.rst

@@ -495,7 +495,7 @@ Japenese, Chinese, and other kinds of UniCode characters can be used
 within quoted (single quote) identifiers, see for example the variable
 name to the right in the plot below:
 
-|image0|
+.. image :: media/bb-japanese.png
 
 Scripting with For-Loops, While-Loops, and If-Statements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1018,4 +1018,3 @@ C:\\dev> C:\\OpenModelica1.9.2 \\bin\\omc +showErrorMessages
 .. |omlogo| image:: logo.*
   :alt: OpenModelica logotype
   :height: 14pt
-.. |image0| image:: media/image7.png

usersguide-sphinx/source/optimization.rst

@@ -262,14 +262,14 @@ E.g. Python.exe ..\\share\\casadi\\scripts defaultStart.py
 BatchReactor.xml
 
 The control and state trajectories of the optimization results are shown
-in Figure 6 -47.
+below:
 
-|image31|
+.. |casadi-input| image:: media/casadi-input.png
+  :width: 40%
+.. |casadi-state| image:: media/casadi-state.png
+  :width: 40%
 
-|image32|
-
-Figure 647: **Optimization results for Batch Reactor model – state and
-control variables.**
+|casadi-input| |casadi-state|
 
 .. _parameter-sweep-optimization-using-omoptim:
 
@@ -554,9 +554,7 @@ Window Regions in OMOptim GUI
 
   Window regions in OMOptim GUI.
 
-.. |image31| image:: media/image57.png
-.. |image32| image:: media/image58.png
-.. |omoptim-blue-cross| image:: media/omoptim-blue-cross.png
+.. |omoptim-blue-cross| image:: media/omoptim-icons/Add.png
   :height: 12pt
 
 .. omc-reset ::