* ./crlcore:
- Change: In Cyclop, rename COpenCellDialog in OpenCellDialog.
This commit is contained in:
parent
74e05d19ff
commit
babd0f5419
|
@ -6,9 +6,9 @@
|
||||||
)
|
)
|
||||||
|
|
||||||
set ( mocincludes Cyclop.h
|
set ( mocincludes Cyclop.h
|
||||||
COpenCellDialog.h
|
OpenCellDialog.h
|
||||||
)
|
)
|
||||||
set ( cpps COpenCellDialog.cpp
|
set ( cpps OpenCellDialog.cpp
|
||||||
DemoGo.cpp
|
DemoGo.cpp
|
||||||
Cyclop.cpp
|
Cyclop.cpp
|
||||||
CyclopMain.cpp
|
CyclopMain.cpp
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "hurricane/viewer/CellWidget.h"
|
#include "hurricane/viewer/CellWidget.h"
|
||||||
|
|
||||||
#include "COpenCellDialog.h"
|
#include "OpenCellDialog.h"
|
||||||
#include "DemoGo.h"
|
#include "DemoGo.h"
|
||||||
#include "Cyclop.h"
|
#include "Cyclop.h"
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ namespace CRL {
|
||||||
QString cellName;
|
QString cellName;
|
||||||
bool newViewer;
|
bool newViewer;
|
||||||
|
|
||||||
if ( COpenCellDialog::runDialog ( this, cellName, newViewer ) ) {
|
if ( OpenCellDialog::runDialog ( this, cellName, newViewer ) ) {
|
||||||
Cell* cell = getCellFromDb ( cellName.toStdString().c_str() );
|
Cell* cell = getCellFromDb ( cellName.toStdString().c_str() );
|
||||||
if ( cell ) {
|
if ( cell ) {
|
||||||
if ( newViewer ) {
|
if ( newViewer ) {
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
// | Author : Jean-Paul CHAPUT |
|
// | Author : Jean-Paul CHAPUT |
|
||||||
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
|
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
|
||||||
// | =============================================================== |
|
// | =============================================================== |
|
||||||
// | C++ Module : "./COpenCellDialog.cpp" |
|
// | C++ Module : "./OpenCellDialog.cpp" |
|
||||||
// | *************************************************************** |
|
// | *************************************************************** |
|
||||||
// | U p d a t e s |
|
// | U p d a t e s |
|
||||||
// | |
|
// | |
|
||||||
|
@ -67,7 +67,7 @@ using namespace std;
|
||||||
|
|
||||||
#include "crlcore/Environment.h"
|
#include "crlcore/Environment.h"
|
||||||
#include "crlcore/AllianceFramework.h"
|
#include "crlcore/AllianceFramework.h"
|
||||||
#include "COpenCellDialog.h"
|
#include "OpenCellDialog.h"
|
||||||
|
|
||||||
|
|
||||||
namespace CRL {
|
namespace CRL {
|
||||||
|
@ -78,12 +78,12 @@ namespace CRL {
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------
|
// -------------------------------------------------------------------
|
||||||
// Class : "COpenCellDialog".
|
// Class : "OpenCellDialog".
|
||||||
|
|
||||||
|
|
||||||
COpenCellDialog::COpenCellDialog ( QWidget* parent )
|
OpenCellDialog::OpenCellDialog ( QWidget* parent )
|
||||||
: QDialog(parent)
|
: QDialog (parent)
|
||||||
, _lineEdit(NULL)
|
, _lineEdit (NULL)
|
||||||
, _viewerCheckBox(NULL)
|
, _viewerCheckBox(NULL)
|
||||||
{
|
{
|
||||||
setWindowTitle ( tr("Open Cell") );
|
setWindowTitle ( tr("Open Cell") );
|
||||||
|
@ -151,21 +151,21 @@ namespace CRL {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const QString COpenCellDialog::getCellName () const
|
const QString OpenCellDialog::getCellName () const
|
||||||
{
|
{
|
||||||
return _lineEdit->text();
|
return _lineEdit->text();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool COpenCellDialog::newViewerRequest () const
|
bool OpenCellDialog::newViewerRequest () const
|
||||||
{
|
{
|
||||||
return _viewerCheckBox->isChecked();
|
return _viewerCheckBox->isChecked();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool COpenCellDialog::runDialog ( QWidget* parent, QString& name, bool& newViewerRequest )
|
bool OpenCellDialog::runDialog ( QWidget* parent, QString& name, bool& newViewerRequest )
|
||||||
{
|
{
|
||||||
COpenCellDialog* dialog = new COpenCellDialog ( parent );
|
OpenCellDialog* dialog = new OpenCellDialog ( parent );
|
||||||
bool dialogResult = (dialog->exec() == Accepted);
|
bool dialogResult = (dialog->exec() == Accepted);
|
||||||
|
|
||||||
name = dialog->getCellName ();
|
name = dialog->getCellName ();
|
||||||
|
@ -177,7 +177,7 @@ namespace CRL {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void COpenCellDialog::formatChanged ( int index )
|
void OpenCellDialog::formatChanged ( int index )
|
||||||
{
|
{
|
||||||
Environment* environment = AllianceFramework::get()->getEnvironment();
|
Environment* environment = AllianceFramework::get()->getEnvironment();
|
||||||
switch ( index ) {
|
switch ( index ) {
|
|
@ -43,7 +43,7 @@
|
||||||
// | Author : Jean-Paul CHAPUT |
|
// | Author : Jean-Paul CHAPUT |
|
||||||
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
|
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
|
||||||
// | =============================================================== |
|
// | =============================================================== |
|
||||||
// | C++ Header : "./COpenCellDialog.h" |
|
// | C++ Header : "./OpenCellDialog.h" |
|
||||||
// | *************************************************************** |
|
// | *************************************************************** |
|
||||||
// | U p d a t e s |
|
// | U p d a t e s |
|
||||||
// | |
|
// | |
|
||||||
|
@ -62,26 +62,22 @@ class QLineEdit;
|
||||||
namespace CRL {
|
namespace CRL {
|
||||||
|
|
||||||
|
|
||||||
class COpenCellDialog : public QDialog {
|
class OpenCellDialog : public QDialog {
|
||||||
Q_OBJECT;
|
Q_OBJECT;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static bool runDialog ( QWidget* parent, QString& name, bool& newViewerRequest );
|
static bool runDialog ( QWidget* parent, QString& name, bool& newViewerRequest );
|
||||||
const QString getCellName () const;
|
const QString getCellName () const;
|
||||||
bool newViewerRequest () const;
|
bool newViewerRequest () const;
|
||||||
protected:
|
protected:
|
||||||
COpenCellDialog ( QWidget* parent=NULL );
|
OpenCellDialog ( QWidget* parent=NULL );
|
||||||
protected slots:
|
protected slots:
|
||||||
void formatChanged ( int );
|
void formatChanged ( int );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
QLineEdit* _lineEdit;
|
QLineEdit* _lineEdit;
|
||||||
QCheckBox* _viewerCheckBox;
|
QCheckBox* _viewerCheckBox;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // End of CRL namespace.
|
} // End of CRL namespace.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue