Commit 6670707c authored by Olivier Lagrasse's avatar Olivier Lagrasse

- Add more outputs for the configure script.

- Change the ViTE version from 1.1 to 1.2.
- [Bug fix] Fix a bug with the geometry initialization of render area: when the vertical slider is scrolled before a trace is loaded, the container texts of the next loaded trace is shifted.
parent 224052b5
......@@ -141,7 +141,6 @@ usage()
echo " --tau_libdir=<path>"
echo " library path to the TAU libraries"
echo ""
exit 0
}
......@@ -151,6 +150,7 @@ while [ 0 -lt $# ]; do
case $OPT in
--help|-h) # help
usage
exit 0
;;
--enable_spinning_logo) # good openGL spinning rabbit :)
defines="$defines SPINNING_LOGO"
......@@ -204,8 +204,13 @@ while [ 0 -lt $# ]; do
qtcolorlibdir=`echo $OPT | awk -F"--qtcolor_libdir=" '{print $2}'`
;;
*)
usage
echo "";
echo "invalid option : $OPT";
exit 0;
echo "";
echo "exit";
echo "";
exit 0;
esac
done
......@@ -358,4 +363,16 @@ EOF
# basename erase the path of acces of the command
MAKE=`basename $MAKE`
if [ $with_otf = 1 ]; then
echo OTF support [OK]
else
echo OTF support [DISABLE]
fi
if [ $with_tau = 1 ]; then
echo TAU support [OK]
else
echo TAU spport [DISABLE]
fi
echo ViTE is now configured for building. Just run \'$MAKE\'.
......@@ -59,12 +59,12 @@
* \def VITE_VERSION
* \brief the ViTE version (string)
*/
#define VITE_VERSION "1.1"
#define VITE_VERSION "1.2"
/*!
* \def VITE_DATE
* \brief the ViTE release date (string)
*/
#define VITE_DATE "January 2010"
#define VITE_DATE "July 2010"
/*!
* \def VITE_WEBSITE
* \brief the ViTE website (string)
......@@ -79,7 +79,7 @@
* \def VITE_MINOR
* \brief the vite minor version (integer)
*/
#define VITE_MINOR 1
#define VITE_MINOR 2
/*!
* \brief Unity for count elements such as number of states or events... NOT USED YET
......
......@@ -69,70 +69,62 @@ using namespace std;
Geometry::Geometry(){
_counter_last_x = 0.0;
_counter_last_y = 0.0;
init_geometry();
/* init main informations about OpenGL scene and QGLWidget size */
/* Camera is placed on (0,0,0) and looks to (0,0,-1) */
_z_ruler_over = -0.4;
_z_ruler = -0.5;
_z_ruler_under = -0.6;
_z_container = -1.0;
_z_container_under = -1.2;
_z_arrow = -3.0;/* closer to camera than containers or states (MUST be negative)*/
_z_event = -2.0;/* closer to camera than containers or states (MUST be negative)*/
_z_counter = -4.0;
_z_state = -5.0;
}
// Info::Render::width = 100;
// Info::Render::height = 100; /* 100 OpenGL units for the render scene height */
Geometry::~Geometry(){
}
/***********************************
*
*
*
* Init function.
*
*
*
***********************************/
void Geometry::init_geometry(){
_counter_last_x = 0.0;
_counter_last_y = 0.0;
/* init main informations about OpenGL scene and QGLWidget size */
_x_scale_container_state = 0.2;/* 20% of screen is used for containers then the other part for states */
_ruler_height = 8.5; /* height of the ruler */
_ruler_y = 0.0; /* highness of the ruler */
_default_entity_x_translate = 20;/* Info::Render::width * _x_scale_container_state */
/*Info::Container::x_max = 0;
Info::Container::y_max = 0;
Info::Container::x_min = 0;
Info::Container::y_min = 0;*/
_state_y_max = 0;
_state_y_min = 0;
// _ruler_distance = 5;
// _minimum_distance_for_selection = 5;/* 5 pixels */
// _selection_rectangle_alpha = 0.5;
_x_state_scale = 1;/* for states scaling */
_x_state_translate = 0;/* for states translation */
_y_state_scale = 1;/* for states scaling */
_y_state_translate = 0;/* for states translation */
_x_scroll_pos = 0;/* horizontal bar placed on 0 */
_y_scroll_pos = 0;/* vertical bar placed on 0 */
/* Camera is placed on (0,0,0) and looks to (0,0,-1) */
_z_ruler_over = -0.4;
_z_ruler = -0.5;
_z_ruler_under = -0.6;
_z_container = -1.0;
_z_container_under = -1.2;
_z_arrow = -3.0;/* closer to camera than containers or states (MUST be negative)*/
_z_event = -2.0;/* closer to camera than containers or states (MUST be negative)*/
_z_counter = -4.0;
_z_state = -5.0;
/* Set in the child class */
// Info::Screen::width = 0;
//Info::Screen::height = 0;
}
Geometry::~Geometry(){
}
/***********************************
/***********************************
*
*
*
......
......@@ -251,6 +251,18 @@ public:
virtual ~Geometry();
/***********************************
*
* Init function.
*
**********************************/
/*!
* \brief Initialize geometry attributes.
*/
void init_geometry();
/***********************************
*
* Coordinate convert functions.
......
......@@ -417,12 +417,9 @@ bool Render_opengl::build(){
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
replace_scale(1);/* for states scaling */
_x_state_translate = 0;/* for states translation */
_y_state_scale = 1;/* for states scaling */
_y_state_translate = 0;/* for states translation */
_x_scroll_pos = 0;/* horizontal bar placed on 0 */
_y_scroll_pos = 0;/* vertical bar placed on 0 */
init_geometry();/* Initialize geometry */
#ifdef SPINNING_LOGO
if (_wait_timer != NULL){
......@@ -441,7 +438,6 @@ bool Render_opengl::build(){
QImage buf = grabFrameBuffer(true);
_minimap.init(buf);
updateGL();
// create_minimap(200, 150);
return true;//_render_instance->display_build();
}
......@@ -477,27 +473,7 @@ bool Render_opengl::unbuild(){
_state = DRAWING_STATE_WAITING;/* change the drawing state */
_wait_angle=0.0f;/* begin with 0 rad angle */
/* init measurement attributes */
/* Info::Container::x_max = 0;
Info::Container::y_max = 0;
Info::Container::x_min = 0;
Info::Container::y_min = 0;
Info::Entity::x_max = 0;
Info::Entity::x_min = 0;*/
// _state_x_max = 0;
_state_y_max = 0;
// _state_x_min = 0;
_state_y_min = 0;
/* TODO: call method which release Geometry attribute values */
_x_state_scale = 1;/* for states scaling */
_x_state_translate = 0;/* for states translation */
_y_state_scale = 1;/* for states scaling */
_y_state_translate = 0;/* for states translation */
_x_scroll_pos = 0;/* horizontal bar placed on 0 */
_y_scroll_pos = 0;
/* clear lists to store container texts */
_text_pos.clear();
......@@ -506,12 +482,6 @@ bool Render_opengl::unbuild(){
_arrows.clear();
_circles.clear();
_texts.clear();
/* clear the event vector */
// _events.clear();
/* clear the arrow vector */
// _arrows.clear();
/* empty the selection stack */
while(false == _previous_selection.empty())
......@@ -532,6 +502,8 @@ bool Render_opengl::unbuild(){
#endif // SPINNING_LOGO
_minimap.release();
init_geometry();/* Initialize geometry */
return true;//_render_instance->display_unbuild();
}
......@@ -680,7 +652,7 @@ void Render_opengl::draw_text(const Element_pos x, const Element_pos y, const El
if (_draw_state) message << "Fatal error! Cannot put text in state lists!" << Message::ende;
Container_text_ buf;
buf.x = x;
buf.y = render_to_trace_y(y);/* Cancel previous transformation. */
buf.value = s;
......@@ -750,7 +722,9 @@ void Render_opengl::start_draw(){
_draw_ruler = false;
_draw_arrow = false;
_draw_event = false;
init_geometry();/* Initialize geometry */
}
void Render_opengl::start_draw_containers(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment