diff --git a/hurricane/doc/hviewer/HInspectorWidget.dox b/hurricane/doc/hviewer/InspectorWidget.dox similarity index 100% rename from hurricane/doc/hviewer/HInspectorWidget.dox rename to hurricane/doc/hviewer/InspectorWidget.dox diff --git a/hurricane/doc/hviewer/doxyfile b/hurricane/doc/hviewer/doxyfile index 6e080ef4..c95104d1 100644 --- a/hurricane/doc/hviewer/doxyfile +++ b/hurricane/doc/hviewer/doxyfile @@ -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 \ diff --git a/hurricane/src/hviewer/CMakeLists.txt b/hurricane/src/hviewer/CMakeLists.txt index 8c4d6b12..a06151ea 100644 --- a/hurricane/src/hviewer/CMakeLists.txt +++ b/hurricane/src/hviewer/CMakeLists.txt @@ -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 ) diff --git a/hurricane/src/hviewer/CellViewer.cpp b/hurricane/src/hviewer/CellViewer.cpp index b1122151..3b793bc2 100644 --- a/hurricane/src/hviewer/CellViewer.cpp +++ b/hurricane/src/hviewer/CellViewer.cpp @@ -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" diff --git a/hurricane/src/hviewer/HDisplayFilter.cpp b/hurricane/src/hviewer/DisplayFilterWidget.cpp similarity index 98% rename from hurricane/src/hviewer/HDisplayFilter.cpp rename to hurricane/src/hviewer/DisplayFilterWidget.cpp index 86ab15c0..df0b3d08 100644 --- a/hurricane/src/hviewer/HDisplayFilter.cpp +++ b/hurricane/src/hviewer/DisplayFilterWidget.cpp @@ -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 { diff --git a/hurricane/src/hviewer/HGraphics.cpp b/hurricane/src/hviewer/GraphicsWidget.cpp similarity index 97% rename from hurricane/src/hviewer/HGraphics.cpp rename to hurricane/src/hviewer/GraphicsWidget.cpp index 747ab812..7640bb84 100644 --- a/hurricane/src/hviewer/HGraphics.cpp +++ b/hurricane/src/hviewer/GraphicsWidget.cpp @@ -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 { diff --git a/hurricane/src/hviewer/HInspectorWidget.cpp b/hurricane/src/hviewer/InspectorWidget.cpp similarity index 98% rename from hurricane/src/hviewer/HInspectorWidget.cpp rename to hurricane/src/hviewer/InspectorWidget.cpp index 040393c7..c0b857af 100644 --- a/hurricane/src/hviewer/HInspectorWidget.cpp +++ b/hurricane/src/hviewer/InspectorWidget.cpp @@ -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" diff --git a/hurricane/src/hviewer/HMousePosition.cpp b/hurricane/src/hviewer/MousePositionWidget.cpp similarity index 94% rename from hurricane/src/hviewer/HMousePosition.cpp rename to hurricane/src/hviewer/MousePositionWidget.cpp index a38ab8ea..1bfe31ae 100644 --- a/hurricane/src/hviewer/HMousePosition.cpp +++ b/hurricane/src/hviewer/MousePositionWidget.cpp @@ -16,7 +16,7 @@ // | Author : Jean-Paul CHAPUT | // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | -// | C++ Module : "./MousePositionWidget.cpp" | +// | C++ Module : "./MousePositionWidget.cpp" | // | *************************************************************** | // | U p d a t e s | // | | @@ -26,8 +26,7 @@ #include #include "hurricane/viewer/DynamicLabel.h" -//# include "hurricane/viewer/MousePositionWidget.h" -#include "hurricane/viewer/HMousePosition.h" +#include "hurricane/viewer/MousePositionWidget.h" namespace Hurricane { diff --git a/hurricane/src/hviewer/HNetlistModel.cpp b/hurricane/src/hviewer/NetlistModel.cpp similarity index 98% rename from hurricane/src/hviewer/HNetlistModel.cpp rename to hurricane/src/hviewer/NetlistModel.cpp index 5b95b494..0b1a0725 100644 --- a/hurricane/src/hviewer/HNetlistModel.cpp +++ b/hurricane/src/hviewer/NetlistModel.cpp @@ -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 { diff --git a/hurricane/src/hviewer/HNetlist.cpp b/hurricane/src/hviewer/NetlistWidget.cpp similarity index 96% rename from hurricane/src/hviewer/HNetlist.cpp rename to hurricane/src/hviewer/NetlistWidget.cpp index 7de2c404..0de92771 100644 --- a/hurricane/src/hviewer/HNetlist.cpp +++ b/hurricane/src/hviewer/NetlistWidget.cpp @@ -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 { diff --git a/hurricane/src/hviewer/SelectCommand.cpp b/hurricane/src/hviewer/SelectCommand.cpp index 1f6561e9..73ccb8f7 100644 --- a/hurricane/src/hviewer/SelectCommand.cpp +++ b/hurricane/src/hviewer/SelectCommand.cpp @@ -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)) ); diff --git a/hurricane/src/hviewer/HSelectionModel.cpp b/hurricane/src/hviewer/SelectionModel.cpp similarity index 96% rename from hurricane/src/hviewer/HSelectionModel.cpp rename to hurricane/src/hviewer/SelectionModel.cpp index 306c3f68..1443516f 100644 --- a/hurricane/src/hviewer/HSelectionModel.cpp +++ b/hurricane/src/hviewer/SelectionModel.cpp @@ -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 { diff --git a/hurricane/src/hviewer/HSelectionPopup.cpp b/hurricane/src/hviewer/SelectionPopup.cpp similarity index 63% rename from hurricane/src/hviewer/HSelectionPopup.cpp rename to hurricane/src/hviewer/SelectionPopup.cpp index 2679a8bb..c39d8d91 100644 --- a/hurricane/src/hviewer/HSelectionPopup.cpp +++ b/hurricane/src/hviewer/SelectionPopup.cpp @@ -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 -// Sophie Belloeil -// Hugo Clément -// Jean-Paul Chaput -// Damien Dupuis -// Christian Masson -// Marek Sroka -// -// 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 (); diff --git a/hurricane/src/hviewer/HSelectionPopupModel.cpp b/hurricane/src/hviewer/SelectionPopupModel.cpp similarity index 60% rename from hurricane/src/hviewer/HSelectionPopupModel.cpp rename to hurricane/src/hviewer/SelectionPopupModel.cpp index 6976fc77..bbc33146 100644 --- a/hurricane/src/hviewer/HSelectionPopupModel.cpp +++ b/hurricane/src/hviewer/SelectionPopupModel.cpp @@ -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 -// Sophie Belloeil -// Hugo Clément -// Jean-Paul Chaput -// Damien Dupuis -// Christian Masson -// Marek Sroka -// -// 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 (); @@ -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(); diff --git a/hurricane/src/hviewer/HSelection.cpp b/hurricane/src/hviewer/SelectionWidget.cpp similarity index 97% rename from hurricane/src/hviewer/HSelection.cpp rename to hurricane/src/hviewer/SelectionWidget.cpp index f0589346..90bad895 100644 --- a/hurricane/src/hviewer/HSelection.cpp +++ b/hurricane/src/hviewer/SelectionWidget.cpp @@ -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 { diff --git a/hurricane/src/hviewer/hurricane/viewer/HDisplayFilter.h b/hurricane/src/hviewer/hurricane/viewer/DisplayFilterWidget.h similarity index 100% rename from hurricane/src/hviewer/hurricane/viewer/HDisplayFilter.h rename to hurricane/src/hviewer/hurricane/viewer/DisplayFilterWidget.h diff --git a/hurricane/src/hviewer/hurricane/viewer/HGraphics.h b/hurricane/src/hviewer/hurricane/viewer/GraphicsWidget.h similarity index 100% rename from hurricane/src/hviewer/hurricane/viewer/HGraphics.h rename to hurricane/src/hviewer/hurricane/viewer/GraphicsWidget.h diff --git a/hurricane/src/hviewer/hurricane/viewer/HInspectorWidget.h b/hurricane/src/hviewer/hurricane/viewer/InspectorWidget.h similarity index 100% rename from hurricane/src/hviewer/hurricane/viewer/HInspectorWidget.h rename to hurricane/src/hviewer/hurricane/viewer/InspectorWidget.h diff --git a/hurricane/src/hviewer/hurricane/viewer/HMousePosition.h b/hurricane/src/hviewer/hurricane/viewer/MousePositionWidget.h similarity index 100% rename from hurricane/src/hviewer/hurricane/viewer/HMousePosition.h rename to hurricane/src/hviewer/hurricane/viewer/MousePositionWidget.h diff --git a/hurricane/src/hviewer/hurricane/viewer/HNetlistModel.h b/hurricane/src/hviewer/hurricane/viewer/NetlistModel.h similarity index 100% rename from hurricane/src/hviewer/hurricane/viewer/HNetlistModel.h rename to hurricane/src/hviewer/hurricane/viewer/NetlistModel.h diff --git a/hurricane/src/hviewer/hurricane/viewer/HNetlist.h b/hurricane/src/hviewer/hurricane/viewer/NetlistWidget.h similarity index 96% rename from hurricane/src/hviewer/hurricane/viewer/HNetlist.h rename to hurricane/src/hviewer/hurricane/viewer/NetlistWidget.h index 788b8733..02312b06 100644 --- a/hurricane/src/hviewer/hurricane/viewer/HNetlist.h +++ b/hurricane/src/hviewer/hurricane/viewer/NetlistWidget.h @@ -16,15 +16,15 @@ // | Author : Jean-Paul CHAPUT | // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | -// | C++ Header : "./NetlistWidget.h" | +// | C++ Header : "./NetlistWidget.h" | // | *************************************************************** | // | U p d a t e s | // | | // x-----------------------------------------------------------------x -#ifndef __HURRICANE_NETLIST_WIDGET_H__ -#define __HURRICANE_NETLIST_WIDGET_H__ +#ifndef __HURRICANE_NETLIST_WIDGET__ +#define __HURRICANE_NETLIST_WIDGET__ #include @@ -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; diff --git a/hurricane/src/hviewer/hurricane/viewer/SelectCommand.h b/hurricane/src/hviewer/hurricane/viewer/SelectCommand.h index 441b115c..590dcbe8 100644 --- a/hurricane/src/hviewer/hurricane/viewer/SelectCommand.h +++ b/hurricane/src/hviewer/hurricane/viewer/SelectCommand.h @@ -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 -// Sophie Belloeil -// Hugo Clément -// Jean-Paul Chaput -// Damien Dupuis -// Christian Masson -// Marek Sroka -// -// 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,26 +45,26 @@ namespace Hurricane { class Cell; class Selector; - class HSelectionPopup; + class SelectionPopup; class SelectCommand : public QObject, public AreaCommand { Q_OBJECT; public: - SelectCommand (); - virtual ~SelectCommand (); - virtual bool mousePressEvent ( CellWidget*, QMouseEvent* ); - virtual bool mouseReleaseEvent ( CellWidget*, QMouseEvent* ); - void bindToAction ( QAction* action ); + SelectCommand (); + virtual ~SelectCommand (); + virtual bool mousePressEvent ( CellWidget*, QMouseEvent* ); + virtual bool mouseReleaseEvent ( CellWidget*, QMouseEvent* ); + void bindToAction ( QAction* action ); signals: - void selectionToggled ( Occurrence occurrence, bool fromPopup ); + void selectionToggled ( Occurrence occurrence, bool fromPopup ); private: - QAction* _selectAction; - HSelectionPopup* _selectionPopup; + QAction* _selectAction; + SelectionPopup* _selectionPopup; private: - SelectCommand ( const SelectCommand& ); - SelectCommand& operator= ( const SelectCommand& ); + SelectCommand ( const SelectCommand& ); + SelectCommand& operator= ( const SelectCommand& ); }; diff --git a/hurricane/src/hviewer/hurricane/viewer/HSelectionModel.h b/hurricane/src/hviewer/hurricane/viewer/SelectionModel.h similarity index 100% rename from hurricane/src/hviewer/hurricane/viewer/HSelectionModel.h rename to hurricane/src/hviewer/hurricane/viewer/SelectionModel.h diff --git a/hurricane/src/hviewer/hurricane/viewer/HSelectionPopup.h b/hurricane/src/hviewer/hurricane/viewer/SelectionPopup.h similarity index 57% rename from hurricane/src/hviewer/hurricane/viewer/HSelectionPopup.h rename to hurricane/src/hviewer/hurricane/viewer/SelectionPopup.h index 9c9b0e40..377e3c44 100644 --- a/hurricane/src/hviewer/hurricane/viewer/HSelectionPopup.h +++ b/hurricane/src/hviewer/hurricane/viewer/SelectionPopup.h @@ -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 -// Sophie Belloeil -// Hugo Clément -// Jean-Paul Chaput -// Damien Dupuis -// Christian Masson -// Marek Sroka -// -// 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; }; diff --git a/hurricane/src/hviewer/hurricane/viewer/HSelectionPopupModel.h b/hurricane/src/hviewer/hurricane/viewer/SelectionPopupModel.h similarity index 57% rename from hurricane/src/hviewer/hurricane/viewer/HSelectionPopupModel.h rename to hurricane/src/hviewer/hurricane/viewer/SelectionPopupModel.h index 54d45f9b..f6b9af4d 100644 --- a/hurricane/src/hviewer/hurricane/viewer/HSelectionPopupModel.h +++ b/hurricane/src/hviewer/hurricane/viewer/SelectionPopupModel.h @@ -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 -// Sophie Belloeil -// Hugo Clément -// Jean-Paul Chaput -// Damien Dupuis -// Christian Masson -// Marek Sroka -// -// 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 (); diff --git a/hurricane/src/hviewer/hurricane/viewer/HSelection.h b/hurricane/src/hviewer/hurricane/viewer/SelectionWidget.h similarity index 97% rename from hurricane/src/hviewer/hurricane/viewer/HSelection.h rename to hurricane/src/hviewer/hurricane/viewer/SelectionWidget.h index 9586d0dc..8c19717a 100644 --- a/hurricane/src/hviewer/hurricane/viewer/HSelection.h +++ b/hurricane/src/hviewer/hurricane/viewer/SelectionWidget.h @@ -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; diff --git a/hurricane/src/hviewer/images/swiss-knife.png b/hurricane/src/hviewer/images/swiss-knife.png new file mode 100644 index 00000000..c2a9b92f Binary files /dev/null and b/hurricane/src/hviewer/images/swiss-knife.png differ