Skip to content

Commit 96851e5

Browse files
Update with new videos and compilation instructions
1 parent 51faed2 commit 96851e5

File tree

4 files changed

+42
-18
lines changed

4 files changed

+42
-18
lines changed

JavaImportTool/JavaImportTool.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/JavaImportTool}/output.txt"/>
1010
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="envision.java.importtool.Main"/>
1111

12-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="jedit /home/dasenov/Research/experiment1/jedit/source/ ${project_loc}/../DebugBuild/projects/"/>
12+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="exp1 /home/mitko/experiment1_legend/ ${project_loc}/../DebugBuild/projects/"/>
1313

1414
<!--
1515
===== The following are some useful ways to generate projects =====

VisualizationBase/src/VisualizationBasePlugin.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ bool VisualizationBasePlugin::initialize(Core::EnvisionManager& manager)
8181

8282
// Enlarge and Center Main Window
8383

84-
vmi.getMainWindow()->resize(1280, 720); // 720p
84+
//vmi.getMainWindow()->resize(1280, 720); // 720p
85+
vmi.getMainWindow()->resize(1920, 1080); // 1080p
86+
8587
QRect desktop{QApplication::desktop()->screenGeometry()};
8688
int leftPos = desktop.width()/2-VisualizationManager::instance().getMainWindow()->width()/2;
8789
int topPos = desktop.height()/2-VisualizationManager::instance().getMainWindow()->height()/2;

doc/pages/compilation.dox

+6-11
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Other dependencies are:
1717
visualizations and cross-platform support.
1818
- <b>lp_solve 5.5</b>: http://lpsolve.sourceforge.net/ <br /> Lp Solve is used for calculating some of the more
1919
complex visualization layouts.
20-
- <b>Clang 3.8</b>: http://clang.llvm.org/ <br /> Clang is used for importing C++ projects in Envision. Support for
20+
- <b>Clang 6.0</b>: http://clang.llvm.org/ <br /> Clang is used for importing C++ projects in Envision. Support for
2121
importing C++ is preliminary and incomplete.
2222
- <b>libgit2</b>: https://libgit2.github.com/ <br /> Used for Envision's git-based version control.
2323
- <b>Python 3</b>: https://www.python.org/ <br /> Used for various scripts during building, testing and run-time execution (e.g. for information scripting).
@@ -28,13 +28,13 @@ Other dependencies are:
2828
Boost python is used to provide bindings for the python scripting.
2929
- <b>For the Java import tool only: Gradle </b>: http://gradle.org/ <br /> Used as build script for the JavaImportTool.
3030

31-
To install the dependencies on Ubuntu 16.04, run the following:
31+
To install the dependencies on Ubuntu 18.04, run the following:
3232
-# Install all necessary packages:
33-
\verbatim sudo apt-get install qt-sdk libqt5svg5 libqt5svg5-dev libqt5webkit5 libqt5webkit5-dev lp-solve liblpsolve55-dev libclang-3.8-dev clang-3.8 llvm-3.8 libgit2-dev google-perftools libgoogle-perftools-dev vera++ python3-dev libboost-python-dev libedit-dev \endverbatim
33+
\verbatim sudo apt-get install qt-sdk libqt5svg5 libqt5svg5-dev libqt5webkit5 libqt5webkit5-dev lp-solve liblpsolve55-dev libclang-6.0-dev clang-6.0 llvm-6.0 libgit2-dev google-perftools libgoogle-perftools-dev vera++ python3-dev libboost-python-dev libedit-dev \endverbatim
3434
-# Make the following symbolic link needed to use the shared library of lp solve:
3535
\verbatim sudo ln -s /usr/lib/lp_solve/liblpsolve55.so /usr/lib/liblpsolve55.so \endverbatim
3636
-# If you plan on using the C++ import feature you will also need an additional symbolic link to the clang libraries directly in main directory of Envision's source:
37-
\verbatim Envision$ ln -s /usr/lib/llvm-3.8/lib/ lib \endverbatim
37+
\verbatim Envision$ ln -s /usr/lib/llvm-6.0/lib/ lib \endverbatim
3838
-# If you plan on using the JavaImportTool you will need Gradle:
3939
\verbatim sudo apt-get install gradle \endverbatim
4040

@@ -51,13 +51,8 @@ to use but we recommend Qt Creator. The instructions below show you how to set-u
5151
- Go to: Tools > Options > Build & Run > Kits. Make sure that the default desktop kit uses the appropriate version
5252
of Qt.
5353
-# Open the top-level \c CMakeLists.txt file with Qt Creator.
54-
-# On Qt creator 3.x, use the following arguments for CMake \verbatim -DCMAKE_BUILD_TYPE=Debug \endverbatim
55-
or alternatively, if you want to compile with clang: \verbatim -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-3.8 \endverbatim
56-
-# In the Projects view, under *build* make sure that:
57-
- The build directory points to a directory that is a peer of Envision's directory. e.g.
58-
\verbatim../build-envision-Desktop-Debug\endverbatim
59-
- (Qt creator 4 or later) the CMAKE_BUILD_TYPE variable is set to *Debug*.
60-
-# Also in the Projects view, change the arguments of cmake/make to specify parallel compilation and the *install* target:
54+
-# On Qt creator 4.x, set the CMake Build type to \verbatim Debug \endverbatim.
55+
-# In the Projects view, change the arguments of cmake/make to specify parallel compilation and the *install* target:
6156
\verbatim-j8 install\endverbatim
6257
The *install* target is needed in order to copy all necessary files to the DebugBuild directory.
6358
Substitute 8 for the number of threads your hardware supports.

doc/pages/main.dox

+32-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
editor and is used for large-scale software development.
66

77
Envision is an open-source project using the BSD license. The project is based on the
8-
<a href="http://qt-project.org/">Qt</a> framework and is cross-platform. <a href="http://www.pm.inf.ethz.ch/research/envision.html">Envision is developed at ETH Zurich</a> in the context of <a href="http://www.pm.inf.ethz.ch/people/person-detail.html?persid=167548">Dimitar Asenov's PhD studies</a>.
8+
<a href="http://qt-project.org/">Qt</a> framework and is cross-platform. <a href="http://www.pm.inf.ethz.ch/research/envision.html">Envision was originally developed at ETH Zurich</a> in the context of <a href="http://www.pm.inf.ethz.ch/people/person-detail.html?persid=167548">Dimitar Asenov's PhD studies</a>.
99

1010
To read about the motivation for building Envision and find out what are some of the key ideas for the IDE, please
1111
see \ref motivation "the motivation page".
1212

1313
\subsection videos Videos
1414

1515
\htmlonly
16-
<iframe width="640" height="360" src="https://www.youtube.com/embed/9X9stH2T-7w" frameborder="0" allowfullscreen>
16+
<iframe width="1280" height="720" src="https://www.youtube.com/embed/5YMaCQEoPe0" frameborder="0" allowfullscreen>
1717
</iframe>
1818
<br/>
1919
\endhtmlonly
@@ -22,17 +22,44 @@
2222
<br/>
2323

2424
\htmlonly
25-
<iframe width="640" height="360" src="https://www.youtube.com/embed/GD0W5HEteu8" frameborder="0" allowfullscreen>
25+
<iframe width="1280" height="720" src="https://www.youtube.com/embed/GD0W5HEteu8" frameborder="0" allowfullscreen>
2626
</iframe>
2727
<br/>
2828
\endhtmlonly
29-
A demonstration of how the visualizations and interactions in Envision can be customized for embedded
29+
A demo of how the visualizations and interactions in Envision can be customized for embedded
3030
domain-specific languages.
3131

3232
<br/>
3333

3434
\htmlonly
35-
<iframe width="640" height="360" src="https://www.youtube.com/embed/0j8-Bjhnl4c" frameborder="0" allowfullscreen>
35+
<iframe width="1280" height="720" src="https://www.youtube.com/embed/Cvjgt6nVo1I" frameborder="0" allowfullscreen>
36+
</iframe>
37+
<br/>
38+
\endhtmlonly
39+
A demo of useful ways to improve the readability of long methods with styled comments in Envision.
40+
41+
<br/>
42+
43+
\htmlonly
44+
<iframe width="1280" height="720" src="https://www.youtube.com/embed/ZueXhX0ojs4" frameborder="0" allowfullscreen>
45+
</iframe>
46+
<br/>
47+
\endhtmlonly
48+
A demo of Envision's advanced version control features.
49+
50+
<br/>
51+
52+
\htmlonly
53+
<iframe width="1280" height="720" src="https://www.youtube.com/embed/kYaRKuUy9rA" frameborder="0" allowfullscreen>
54+
</iframe>
55+
<br/>
56+
\endhtmlonly
57+
A demo of scripting Envision using its built-in command prompt, e.g. to perform a data-based refactoring.
58+
59+
<br/>
60+
61+
\htmlonly
62+
<iframe width="1280" height="720" src="https://www.youtube.com/embed/0j8-Bjhnl4c" frameborder="0" allowfullscreen>
3663
</iframe>
3764
<br/>
3865
\endhtmlonly

0 commit comments

Comments
 (0)