jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./hurricane/src/hviewer : 

- Cleanup (part 2) : changing file names.
This commit is contained in:
Jean-Paul Chaput 2008-11-26 10:13:31 +00:00
parent 01ddcf4279
commit 88c2d138ad
27 changed files with 105 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
hurricane/doc/hviewer/HInspectorWidget.dox → hurricane/doc/hviewer/InspectorWidget.dox
View File

4
hurricane/doc/hviewer/doxyfile
View File

@ -105,8 +105,8 @@ INPUT = \
../../src/hviewer/hurricane/viewer/CellWidget.h \
../../src/hviewer/hurricane/viewer/CellViewer.h \
CellViewer.dox \
../../src/hviewer/hurricane/viewer/HInspectorWidget.h \
HInspectorWidget.dox
../../src/hviewer/hurricane/viewer/InspectorWidget.h \
InspectorWidget.dox
FILE_PATTERNS = *.h \

56
hurricane/src/hviewer/CMakeLists.txt
View File

@ -8,30 +8,30 @@
hurricane/viewer/PaletteNamedItem.h
hurricane/viewer/PaletteLayerItem.h
hurricane/viewer/PaletteWidget.h
hurricane/viewer/HGraphics.h
hurricane/viewer/GraphicsWidget.h
hurricane/viewer/DynamicLabel.h
hurricane/viewer/HMousePosition.h
hurricane/viewer/MousePositionWidget.h
hurricane/viewer/Selector.h
hurricane/viewer/SelectCommand.h
hurricane/viewer/CellWidget.h
hurricane/viewer/CellWidgets.h
hurricane/viewer/CellViewer.h
hurricane/viewer/RecordModel.h
hurricane/viewer/HInspectorWidget.h
hurricane/viewer/HSelectionPopupModel.h
hurricane/viewer/HSelectionPopup.h
hurricane/viewer/HSelectionModel.h
hurricane/viewer/HSelection.h
hurricane/viewer/HNetlistModel.h
hurricane/viewer/HNetlist.h
hurricane/viewer/HDisplayFilter.h
hurricane/viewer/InspectorWidget.h
hurricane/viewer/SelectionPopupModel.h
hurricane/viewer/SelectionPopup.h
hurricane/viewer/SelectionModel.h
hurricane/viewer/SelectionWidget.h
hurricane/viewer/NetlistModel.h
hurricane/viewer/NetlistWidget.h
hurricane/viewer/DisplayFilterWidget.h
hurricane/viewer/ControllerWidget.h
)
set ( exports hurricane/viewer/ScreenUtilities.h
hurricane/viewer/DisplayStyle.h
hurricane/viewer/ColorScale.h
hurricane/viewer/Graphics.h
hurricane/viewer/HGraphics.h
hurricane/viewer/GraphicsWidget.h
hurricane/viewer/Selector.h
hurricane/viewer/Command.h
hurricane/viewer/AreaCommand.h
@ -42,27 +42,27 @@
hurricane/viewer/CellWidget.h
hurricane/viewer/CellWidgets.h
hurricane/viewer/CellViewer.h
hurricane/viewer/HInspectorWidget.h
hurricane/viewer/HSelectionPopupModel.h
hurricane/viewer/HSelectionPopup.h
hurricane/viewer/HSelectionModel.h
hurricane/viewer/HSelection.h
hurricane/viewer/InspectorWidget.h
hurricane/viewer/SelectionPopupModel.h
hurricane/viewer/SelectionPopup.h
hurricane/viewer/SelectionModel.h
hurricane/viewer/SelectionWidget.h
hurricane/viewer/NetInformations.h
hurricane/viewer/HNetlist.h
hurricane/viewer/HDisplayFilter.h
hurricane/viewer/NetlistWidget.h
hurricane/viewer/DisplayFilterWidget.h
hurricane/viewer/ControllerWidget.h
)
set ( cpps ScreenUtilities.cpp
DisplayStyle.cpp
ColorScale.cpp
Graphics.cpp
HGraphics.cpp
GraphicsWidget.cpp
PaletteItem.cpp
PaletteNamedItem.cpp
PaletteLayerItem.cpp
PaletteWidget.cpp
DynamicLabel.cpp
HMousePosition.cpp
MousePositionWidget.cpp
Selector.cpp
Command.cpp
AreaCommand.cpp
@ -73,15 +73,15 @@
CellWidget.cpp
CellViewer.cpp
RecordModel.cpp
HInspectorWidget.cpp
HSelectionPopupModel.cpp
HSelectionPopup.cpp
HSelectionModel.cpp
HSelection.cpp
InspectorWidget.cpp
SelectionPopupModel.cpp
SelectionPopup.cpp
SelectionModel.cpp
SelectionWidget.cpp
NetInformations.cpp
HNetlistModel.cpp
HNetlist.cpp
HDisplayFilter.cpp
NetlistModel.cpp
NetlistWidget.cpp
DisplayFilterWidget.cpp
ControllerWidget.cpp
)

3
hurricane/src/hviewer/CellViewer.cpp
View File

@ -37,8 +37,7 @@
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/CellWidget.h"
#include "hurricane/viewer/CellViewer.h"
//#include "hurricane/viewer/MousePositionWidget.h"
#include "hurricane/viewer/HMousePosition.h"
#include "hurricane/viewer/MousePositionWidget.h"
#include "hurricane/viewer/ControllerWidget.h"

3
hurricane/src/hviewer/HDisplayFilter.cpp → hurricane/src/hviewer/DisplayFilterWidget.cpp
View File

@ -32,8 +32,7 @@
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/CellWidget.h"
//#include "hurricane/viewer/DisplayFilterWidget.h"
#include "hurricane/viewer/HDisplayFilter.h"
#include "hurricane/viewer/DisplayFilterWidget.h"
namespace Hurricane {

3
hurricane/src/hviewer/HGraphics.cpp → hurricane/src/hviewer/GraphicsWidget.cpp
View File

@ -32,8 +32,7 @@
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/DisplayStyle.h"
//#include "hurricane/viewer/GraphicsWidget.h"
#include "hurricane/viewer/HGraphics.h"
#include "hurricane/viewer/GraphicsWidget.h"
namespace Hurricane {

3
hurricane/src/hviewer/HInspectorWidget.cpp → hurricane/src/hviewer/InspectorWidget.cpp
View File

@ -36,8 +36,7 @@
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/RecordModel.h"
//#include "hurricane/viewer/InspectorWidget.h"
#include "hurricane/viewer/HInspectorWidget.h"
#include "hurricane/viewer/InspectorWidget.h"
#include "hurricane/Slot.h"

3
hurricane/src/hviewer/HMousePosition.cpp → hurricane/src/hviewer/MousePositionWidget.cpp
View File

@ -26,8 +26,7 @@
#include <QHBoxLayout>
#include "hurricane/viewer/DynamicLabel.h"
//# include "hurricane/viewer/MousePositionWidget.h"
#include "hurricane/viewer/HMousePosition.h"
#include "hurricane/viewer/MousePositionWidget.h"
namespace Hurricane {

2
hurricane/src/hviewer/HNetlistModel.cpp → hurricane/src/hviewer/NetlistModel.cpp
View File

@ -31,7 +31,7 @@
#include "hurricane/Cell.h"
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/NetInformations.h"
#include "hurricane/viewer/HNetlistModel.h"
#include "hurricane/viewer/NetlistModel.h"
namespace Hurricane {

6
hurricane/src/hviewer/HNetlist.cpp → hurricane/src/hviewer/NetlistWidget.cpp
View File

@ -34,10 +34,8 @@
#include "hurricane/Net.h"
#include "hurricane/viewer/Graphics.h"
//#include "hurricane/viewer/NetlistModel.h"
//#include "hurricane/viewer/NetlistWidget.h"
#include "hurricane/viewer/HNetlistModel.h"
#include "hurricane/viewer/HNetlist.h"
#include "hurricane/viewer/NetlistModel.h"
#include "hurricane/viewer/NetlistWidget.h"
namespace Hurricane {

4
hurricane/src/hviewer/SelectCommand.cpp
View File

@ -31,7 +31,7 @@
# include "hurricane/viewer/CellWidget.h"
# include "hurricane/viewer/SelectCommand.h"
# include "hurricane/viewer/HSelectionPopup.h"
# include "hurricane/viewer/SelectionPopup.h"
namespace Hurricane {
@ -46,7 +46,7 @@ namespace Hurricane {
, _selectAction(NULL)
, _selectionPopup(NULL)
{
_selectionPopup = new HSelectionPopup ();
_selectionPopup = new SelectionPopup ();
connect ( _selectionPopup, SIGNAL(occurrenceSelected(Occurrence,bool))
, this , SIGNAL(selectionToggled (Occurrence,bool)) );

6
hurricane/src/hviewer/HSelectionModel.cpp → hurricane/src/hviewer/SelectionModel.cpp
View File

@ -32,10 +32,8 @@
#include "hurricane/Occurrence.h"
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/Selector.h"
//#include "hurricane/viewer/SelectionModel.h"
//#include "hurricane/viewer/SelectionWidget.h"
#include "hurricane/viewer/HSelectionModel.h"
#include "hurricane/viewer/HSelection.h"
#include "hurricane/viewer/SelectionModel.h"
#include "hurricane/viewer/SelectionWidget.h"
namespace Hurricane {

57
hurricane/src/hviewer/HSelectionPopup.cpp → hurricane/src/hviewer/SelectionPopup.cpp
View File

@ -1,36 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
//
// $Id$
@ -42,7 +15,7 @@
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Module : "./HSelectionPopup.cpp" |
// | C++ Module : "./SelectionPopup.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
@ -59,15 +32,15 @@
#include "hurricane/Commons.h"
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/HSelectionPopupModel.h"
#include "hurricane/viewer/HSelectionPopup.h"
#include "hurricane/viewer/SelectionPopupModel.h"
#include "hurricane/viewer/SelectionPopup.h"
namespace Hurricane {
HSelectionPopup::HSelectionPopup ( QWidget* parent )
SelectionPopup::SelectionPopup ( QWidget* parent )
: QWidget(parent)
, _model(NULL)
, _view(NULL)
@ -81,7 +54,7 @@ namespace Hurricane {
_rowHeight = QFontMetrics(Graphics::getFixedFont()).height() + 4;
_model = new HSelectionPopupModel ( this );
_model = new SelectionPopupModel ( this );
_view = new QTableView ( this );
_view->setShowGrid ( false );
@ -109,28 +82,28 @@ namespace Hurricane {
}
void HSelectionPopup::popup ()
void SelectionPopup::popup ()
{
show ();
grabMouse ();
}
void HSelectionPopup::forceRowHeight ()
void SelectionPopup::forceRowHeight ()
{
for ( int rows=_model->rowCount()-1; rows >= 0 ; rows-- )
_view->setRowHeight ( rows, _rowHeight );
}
void HSelectionPopup::keyPressEvent ( QKeyEvent* event )
void SelectionPopup::keyPressEvent ( QKeyEvent* event )
{
event->ignore();
}
void HSelectionPopup::mouseMoveEvent ( QMouseEvent* event )
void SelectionPopup::mouseMoveEvent ( QMouseEvent* event )
{
QModelIndex index = _view->indexAt ( event->pos() );
if ( index.isValid() )
@ -141,7 +114,7 @@ namespace Hurricane {
void HSelectionPopup::mouseReleaseEvent ( QMouseEvent* event )
void SelectionPopup::mouseReleaseEvent ( QMouseEvent* event )
{
releaseMouse ();
hide ();
@ -157,19 +130,19 @@ namespace Hurricane {
}
void HSelectionPopup::add ( Occurrence occurrence, bool showChange )
void SelectionPopup::add ( Occurrence occurrence, bool showChange )
{
_model->add ( occurrence, showChange );
}
void HSelectionPopup::clear ()
void SelectionPopup::clear ()
{
_model->clear ();
}
void HSelectionPopup::updateLayout ()
void SelectionPopup::updateLayout ()
{
_model->updateLayout ();

55
hurricane/src/hviewer/HSelectionPopupModel.cpp → hurricane/src/hviewer/SelectionPopupModel.cpp
View File

@ -1,36 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
//
// $Id$
@ -43,7 +16,7 @@
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Module : "./HSelectionPopupModel.cpp" |
// | C++ Module : "./SelectionPopupModel.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
@ -57,25 +30,25 @@
#include "hurricane/Occurrence.h"
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/Selector.h"
#include "hurricane/viewer/HSelectionPopupModel.h"
#include "hurricane/viewer/SelectionPopupModel.h"
namespace Hurricane {
HSelectionPopupModel::HSelectionPopupModel ( QObject* parent )
SelectionPopupModel::SelectionPopupModel ( QObject* parent )
: QAbstractTableModel(parent)
, _occurrences(NULL)
{ }
HSelectionPopupModel::~HSelectionPopupModel ()
SelectionPopupModel::~SelectionPopupModel ()
{
clear ();
}
void HSelectionPopupModel::add ( Occurrence occurrence, bool showChange )
void SelectionPopupModel::add ( Occurrence occurrence, bool showChange )
{
if ( !_occurrences ) _occurrences = new vector<Occurrence> ();
@ -84,7 +57,7 @@ namespace Hurricane {
}
void HSelectionPopupModel::clear ()
void SelectionPopupModel::clear ()
{
if ( _occurrences ) {
delete _occurrences;
@ -94,13 +67,13 @@ namespace Hurricane {
}
void HSelectionPopupModel::updateLayout ()
void SelectionPopupModel::updateLayout ()
{
emit layoutChanged ();
}
QVariant HSelectionPopupModel::data ( const QModelIndex& index, int role ) const
QVariant SelectionPopupModel::data ( const QModelIndex& index, int role ) const
{
static QFont occurrenceFont = Graphics::getFixedFont ( QFont::Normal );
static QFont entityFont = Graphics::getFixedFont ( QFont::Bold, false );
@ -143,7 +116,7 @@ namespace Hurricane {
}
QVariant HSelectionPopupModel::headerData ( int section
QVariant SelectionPopupModel::headerData ( int section
, Qt::Orientation orientation
, int role ) const
{
@ -158,20 +131,20 @@ namespace Hurricane {
}
int HSelectionPopupModel::rowCount ( const QModelIndex& parent ) const
int SelectionPopupModel::rowCount ( const QModelIndex& parent ) const
{
if ( !_occurrences ) return 1;
return _occurrences->size();
}
int HSelectionPopupModel::columnCount ( const QModelIndex& parent ) const
int SelectionPopupModel::columnCount ( const QModelIndex& parent ) const
{
return 1;
}
Occurrence HSelectionPopupModel::getOccurrence ( int row )
Occurrence SelectionPopupModel::getOccurrence ( int row )
{
if ( !_occurrences || (row >= (int)_occurrences->size()) )
return Occurrence();

6
hurricane/src/hviewer/HSelection.cpp → hurricane/src/hviewer/SelectionWidget.cpp
View File

@ -38,10 +38,8 @@
#include "hurricane/Cell.h"
#include "hurricane/viewer/Graphics.h"
//#include "hurricane/viewer/SelectionModel.h"
//#include "hurricane/viewer/SelectionWidget.h"
#include "hurricane/viewer/HSelectionModel.h"
#include "hurricane/viewer/HSelection.h"
#include "hurricane/viewer/SelectionModel.h"
#include "hurricane/viewer/SelectionWidget.h"
namespace Hurricane {

0
hurricane/src/hviewer/hurricane/viewer/HDisplayFilter.h → hurricane/src/hviewer/hurricane/viewer/DisplayFilterWidget.h
View File

0
hurricane/src/hviewer/hurricane/viewer/HGraphics.h → hurricane/src/hviewer/hurricane/viewer/GraphicsWidget.h
View File

0
hurricane/src/hviewer/hurricane/viewer/HInspectorWidget.h → hurricane/src/hviewer/hurricane/viewer/InspectorWidget.h
View File

0
hurricane/src/hviewer/hurricane/viewer/HMousePosition.h → hurricane/src/hviewer/hurricane/viewer/MousePositionWidget.h
View File

0
hurricane/src/hviewer/hurricane/viewer/HNetlistModel.h → hurricane/src/hviewer/hurricane/viewer/NetlistModel.h
View File

6
hurricane/src/hviewer/hurricane/viewer/HNetlist.h → hurricane/src/hviewer/hurricane/viewer/NetlistWidget.h
View File

@ -23,8 +23,8 @@
// x-----------------------------------------------------------------x
#ifndef __HURRICANE_NETLIST_WIDGET_H__
#define __HURRICANE_NETLIST_WIDGET_H__
#ifndef __HURRICANE_NETLIST_WIDGET__
#define __HURRICANE_NETLIST_WIDGET__
#include <QWidget>
@ -33,7 +33,7 @@
#include "hurricane/Commons.h"
#include "hurricane/viewer/CellWidget.h"
#include "hurricane/viewer/HNetlistModel.h"
#include "hurricane/viewer/NetlistModel.h"
class QSortFilterProxyModel;

35
hurricane/src/hviewer/hurricane/viewer/SelectCommand.h
View File

@ -1,36 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
//
// $Id$
@ -72,7 +45,7 @@ namespace Hurricane {
class Cell;
class Selector;
class HSelectionPopup;
class SelectionPopup;
class SelectCommand : public QObject, public AreaCommand {
@ -88,7 +61,7 @@ namespace Hurricane {
void selectionToggled ( Occurrence occurrence, bool fromPopup );
private:
QAction* _selectAction;
HSelectionPopup* _selectionPopup;
SelectionPopup* _selectionPopup;
private:
SelectCommand ( const SelectCommand& );
SelectCommand& operator= ( const SelectCommand& );

0
hurricane/src/hviewer/hurricane/viewer/HSelectionModel.h → hurricane/src/hviewer/hurricane/viewer/SelectionModel.h
View File

41
hurricane/src/hviewer/hurricane/viewer/HSelectionPopup.h → hurricane/src/hviewer/hurricane/viewer/SelectionPopup.h
View File

@ -1,36 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
//
// $Id$
@ -43,7 +16,7 @@
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Header : "./HSelectionPopup.h" |
// | C++ Header : "./SelectionPopup.h" |
// | *************************************************************** |
// | U p d a t e s |
// | |
@ -70,14 +43,14 @@ class QHeaderView;
namespace Hurricane {
class HSelectionPopupModel;
class SelectionPopupModel;
class HSelectionPopup : public QWidget {
class SelectionPopup : public QWidget {
Q_OBJECT;
public:
HSelectionPopup ( QWidget* parent=NULL );
SelectionPopup ( QWidget* parent=NULL );
void updateLayout ();
void popup ();
signals:
@ -92,7 +65,7 @@ namespace Hurricane {
virtual void mouseReleaseEvent ( QMouseEvent* event );
private:
HSelectionPopupModel* _model;
SelectionPopupModel* _model;
QTableView* _view;
int _rowHeight;
};

39
hurricane/src/hviewer/hurricane/viewer/HSelectionPopupModel.h → hurricane/src/hviewer/hurricane/viewer/SelectionPopupModel.h
View File

@ -1,36 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
//
// $Id$
@ -43,7 +16,7 @@
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Header : "./HSelectionPopupModel.h" |
// | C++ Header : "./SelectionPopupModel.h" |
// | *************************************************************** |
// | U p d a t e s |
// | |
@ -71,12 +44,12 @@ namespace Hurricane {
class Selector;
class HSelectionPopupModel : public QAbstractTableModel {
class SelectionPopupModel : public QAbstractTableModel {
Q_OBJECT;
public:
HSelectionPopupModel ( QObject* parent=NULL );
~HSelectionPopupModel ();
SelectionPopupModel ( QObject* parent=NULL );
~SelectionPopupModel ();
void add ( Occurrence occurrence, bool showChange=false );
void clear ();
void updateLayout ();

3
hurricane/src/hviewer/hurricane/viewer/HSelection.h → hurricane/src/hviewer/hurricane/viewer/SelectionWidget.h
View File

@ -33,8 +33,7 @@
#include "hurricane/Commons.h"
#include "hurricane/Occurrence.h"
//#include "hurricane/viewer/SelectionModel.h"
#include "hurricane/viewer/HSelectionModel.h"
#include "hurricane/viewer/SelectionModel.h"
class QSortFilterProxyModel;

BIN
hurricane/src/hviewer/images/swiss-knife.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB