-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "HYDROGUI_Tool.h"
-#include <GEOMUtils.hxx>
+#include <CurveCreator_Utils.hxx>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewManager.h>
//! Profile data structre constructor
HYDROGUI_GeoreferencementDlg::ProfileGeoData::ProfileGeoData(
+ const QString& theName,
const QString& theXg, const QString& theYg,
const QString& theXd, const QString& theYd)
{
+ this->Name = theName;
this->isEmpty = theXg.isEmpty() && theYg.isEmpty() &&
theXd.isEmpty() && theYd.isEmpty();
this->isIncomplete = !isEmpty;
myModeButtons->blockSignals( isBlocked );
}
-void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataMap& theMap )
+void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataList& theData )
{
disconnect( myTable->model(), SIGNAL( dataChanged ( const QModelIndex&, const QModelIndex& ) ),
this, SLOT( onDataChanged() ) );
myTable->setRowCount( 0 );
- foreach ( const QString& aProfileName, theMap.keys() ) {
+ foreach ( const ProfileGeoData& aGeoData, theData ) {
// Check the current profile name
- if ( aProfileName.isEmpty() ) {
+ if ( aGeoData.Name.isEmpty() ) {
continue;
}
// Get georeferencement data for the current profile
- ProfileGeoData aGeoData = theMap.value( aProfileName );
QString aXg, anYg, aXd, anYd;
if ( !aGeoData.isEmpty ) {
- aXg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xg );
- anYg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yg );
- aXd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xd );
- anYd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yd );
+ aXg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xg, false );
+ anYg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yg, false );
+ aXd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xd, false );
+ anYd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yd, false );
}
// Insert row with the data
myTable->insertRow( aRow );
// "Profile" column
- QTableWidgetItem* aNameItem = new QTableWidgetItem( aProfileName );
- aNameItem->setFlags( Qt::ItemIsEnabled );
+ QTableWidgetItem* aNameItem = new QTableWidgetItem( aGeoData.Name );
+ aNameItem->setFlags( aNameItem->flags() & ~Qt::ItemIsEnabled );
+ /* Bold font is not used in other tables. Keep the common style.
QFont aFont = aNameItem->font();
aFont.setBold( true );
- aNameItem->setFont( aFont );
+ aNameItem->setFont( aFont );
+ */
myTable->setItem( aRow, 0, aNameItem );
// "Xg" column
this, SLOT( onDataChanged() ) );
}
-void HYDROGUI_GeoreferencementDlg::getData( ProfilesGeoDataMap& theMap )
+void HYDROGUI_GeoreferencementDlg::getData( ProfilesGeoDataList& theData ) const
{
- // Clear the map
- theMap.clear();
+ // Clear the list
+ theData.clear();
// Fill the map
bool isOk = false;
aXd = myTable->item( aRow, 3 )->text();
anYd = myTable->item( aRow, 4 )->text();
- theMap.insert( aProfileName, ProfileGeoData( aXg, anYg, aXd, anYd ) );
+ theData.append( ProfileGeoData( aProfileName, aXg, anYg, aXd, anYd ) );
}
}
// Get the selected point coordinates
OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
- gp_Pnt aPnt = GEOMUtils::ConvertClickToPoint( theEvent->x(), theEvent->y(),
- aViewPort->getView() );
+ gp_Pnt aPnt = CurveCreator_Utils::ConvertClickToPoint( theEvent->x(), theEvent->y(),
+ aViewPort->getView() );
// Set the coordinates to the corresponding cells of the table
int aColumnX = aColumn < 3 ? 1 : 3;
int aColumnY = aColumnX + 1;
- QString aXStr = HYDROGUI_Tool::GetCoordinateString( aPnt.X() );
- QString anYStr = HYDROGUI_Tool::GetCoordinateString( aPnt.Y() );
+ QString aXStr = HYDROGUI_Tool::GetCoordinateString( aPnt.X(), false );
+ QString anYStr = HYDROGUI_Tool::GetCoordinateString( aPnt.Y(), false );
myTable->item( aRow, aColumnX )->setText( aXStr );
myTable->item( aRow, aColumnY )->setText( anYStr );
}