#include <HYDROData_Stream.h>
#include <HYDROData_StricklerTable.h>
#include <HYDROData_LandCoverMap.h>
+#include <HYDROData_BCPolygon.h>
#include <CAM_Module.h>
#include <CAM_Study.h>
#include <SUIT_Study.h>
#include <SUIT_Tools.h>
#include <SUIT_TreeSync.h>
+#include <SUIT_DataObjectIterator.h>
#include <HYDROData_Document.h>
#include <HYDROData_ShapesGroup.h>
#endif
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
static HYDROData_SequenceOfObjects myCopyingObjects;
const int ENTRY_COLUMN = 2;
HYDROGUI_DataModel::HYDROGUI_DataModel( CAM_Module* theModule )
-: LightApp_DataModel( theModule )
+: LightApp_DataModel( theModule ), myIsAboutToClose(false)
{
+ DEBTRACE("HYDROGUI_DataModel");
update( module()->application()->activeStudy()->id() );
}
HYDROGUI_DataModel::~HYDROGUI_DataModel()
{
+ DEBTRACE("~HYDROGUI_DataModel");
}
bool HYDROGUI_DataModel::create( CAM_Study* theStudy )
{
+ DEBTRACE("create");
bool status = LightApp_DataModel::create( theStudy );
if ( status )
updateDocument();
CAM_Study* theStudy,
QStringList theFileList )
{
+ DEBTRACE("open");
LightApp_DataModel::open( theURL, theStudy, theFileList );
const int aStudyId = theStudy->id();
try
{
- res = HYDROData_Document::Load( (char*)aDataFullPath.toLatin1().constData(), aStudyId );
+ res = HYDROData_Document::Load( (char*)aDataFullPath.toLatin1().constData() );
}
catch(...)
{
bool HYDROGUI_DataModel::save( QStringList& theFileList )
{
+ DEBTRACE("save");
if( !module()->application()->activeStudy() )
return false;
CAM_Study*,
QStringList& theFileList )
{
+ DEBTRACE("saveAs");
myStudyURL = theURL;
return save( theFileList );
}
bool HYDROGUI_DataModel::close()
{
+ DEBTRACE("close");
+ myIsAboutToClose = true;
HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
if ( aModule )
aModule->clearCache();
return true;
}
+bool HYDROGUI_DataModel::isAboutToClose()
+{
+ DEBTRACE("isAboutToClose " << myIsAboutToClose);
+ return myIsAboutToClose;
+}
+
bool HYDROGUI_DataModel::dumpPython( const QString& theURL,
CAM_Study* theStudy,
bool isMultiFile,
QStringList& theListOfFiles )
{
+ DEBTRACE("dumpPython");
LightApp_DataModel::dumpPython( theURL, theStudy, isMultiFile, theListOfFiles );
int aStudyId = theStudy->id();
LightApp_Study* aStudy = ::qobject_cast<LightApp_Study*>( theStudy );
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
if ( aDocument.IsNull() || !aStudy )
return false;
void HYDROGUI_DataModel::update( const int theStudyId )
{
+ DEBTRACE("update");
LightApp_Application* anApp = dynamic_cast<LightApp_Application*>( module()->application() );
if( !anApp )
return;
// create a new root object
CAM_DataObject* aNewRootObj = new CAM_DataObject();
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theStudyId );
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
if( aDocument.IsNull() )
return;
// OBSTACLES
LightApp_DataObject* anObstaclesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_OBSTACLE ).toLatin1() ) );
+ //BC Polygons
+ LightApp_DataObject* aBCPolygonRootObj = createObject( aNewRootObj, tr( partitionName( KIND_BC_POLYGON ).toLatin1() ) );
+
// STRICKLER TABLES
LightApp_DataObject* aStricklerTablesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_STRICKLER_TABLE ).toLatin1() ) );
// VISUAL STATES
LightApp_DataObject* aVisualStateRootObj = createObject( aNewRootObj, tr( partitionName( KIND_VISUAL_STATE ).toLatin1() ) );
+
int aNoStricklerTableObj = 0;
+
HYDROData_Iterator anIterator( aDocument, KIND_UNKNOWN );
- for( ; anIterator.More(); anIterator.Next() ) {
+ std::vector<Handle(HYDROData_Entity)> ents;
+
+ for( ; anIterator.More(); anIterator.Next() )
+ ents.push_back(anIterator.Current());
+
+ for (int i = 0; i< ents.size();i++)
+ {
LightApp_DataObject* obj = 0;
- Handle(HYDROData_Entity) anObj = anIterator.Current();
+ Handle(HYDROData_Entity) anObj = ents[i];
if ( !anObj.IsNull() )
{
obj = createObject( aVisualStateRootObj, aVisualStateObj );
}
+ break;
+ }
+ case KIND_BC_POLYGON:
+ {
+ Handle(HYDROData_BCPolygon) aBCPolygonObj =
+ Handle(HYDROData_BCPolygon)::DownCast( anObj );
+ if( !aBCPolygonObj.IsNull() ) {
+ obj = createObject( aBCPolygonRootObj, aBCPolygonObj );
+ }
+
break;
}
}
// anObjectBrowser->openLevels();
//}
- HYDROGUI_DataModelSync aSync( aNewRootObj );
SUIT_DataObject* aRoot = root();
+
+ if (aRoot)
+ {
+ std::map<std::string, SUIT_DataObject*> entry2ObjNewRoot;
+ SUIT_DataObjectIterator::DetourType dt = SUIT_DataObjectIterator::DepthLeft;
+ for ( SUIT_DataObjectIterator it( aNewRootObj, dt ); it.current(); ++it )
+ {
+ LightApp_DataObject* aCurObjN = dynamic_cast<LightApp_DataObject*>(it.current());
+ if (aCurObjN)
+ entry2ObjNewRoot[aCurObjN->entry().toStdString()] = it.current();
+ }
+
+ for ( SUIT_DataObjectIterator it( aRoot, dt ); it.current(); ++it )
+ {
+ LightApp_DataObject* aCurObjO = dynamic_cast<LightApp_DataObject*>(it.current());
+ if (aCurObjO && aCurObjO->childCount() > 0)
+ {
+ std::string entry = aCurObjO->entry().toStdString();
+ SUIT_DataObject* newNode = entry2ObjNewRoot[entry];
+ if (newNode && aCurObjO->childCount() > 0)
+ {
+ DataObjectList newchildren;
+ newNode->children(newchildren);
+ //new root - remove children
+ std::map<std::string, SUIT_DataObject*> newNode2Entries;
+ for ( DataObjectList::const_iterator it = newchildren.begin(); it != newchildren.end(); ++it )
+ {
+ SUIT_DataObject* cc = *it;
+ LightApp_DataObject* obj = dynamic_cast<LightApp_DataObject*>(cc);
+ newNode2Entries[obj->entry().toStdString()] = cc;
+ newNode->removeChild(cc);
+ }
+ //
+ std::set<SUIT_DataObject*> objtemp;
+
+ DataObjectList oldchildren;
+ aCurObjO->children(oldchildren);
+ for ( DataObjectList::const_iterator it = oldchildren.begin(); it != oldchildren.end(); ++it )
+ {
+ SUIT_DataObject* old_ch = *it;
+ std::string entr = dynamic_cast<LightApp_DataObject*>(old_ch)->entry().toStdString();
+ if (newNode2Entries.count(entr) > 0)
+ {
+ SUIT_DataObject* obj = newNode2Entries[entr];
+ newNode->appendChild(obj);
+ objtemp.insert(obj);
+ }
+ }
+ //
+ for ( DataObjectList::const_iterator it = newchildren.begin(); it != newchildren.end(); ++it )
+ {
+ SUIT_DataObject* ch = *it;
+ if (objtemp.count(ch) == 0)
+ newNode->appendChild(ch);
+ }
+ { //IF DEBUG
+ //add. check
+ DataObjectList newchildren2;
+ newNode->children(newchildren2);
+ std::set<std::string> entries2, entries1;
+ for ( DataObjectList::const_iterator it = newchildren2.begin(); it != newchildren2.end(); ++it )
+ entries2.insert((dynamic_cast<LightApp_DataObject*>(*it))->entry().toStdString());
+ for ( DataObjectList::const_iterator it = newchildren.begin(); it != newchildren.end(); ++it )
+ entries1.insert((dynamic_cast<LightApp_DataObject*>(*it))->entry().toStdString());
+ assert(entries1 == entries2);
+ }
+ }
+ }
+ }
+ }
+
+ HYDROGUI_DataModelSync aSync( aNewRootObj );
bool isNewDoc = aRoot==0;
if( isNewDoc )
aRoot = createRootModuleObject( aStudyRoot );
if ( !myStates.isEmpty() )
{
ob->updateTree();
- ob->setOpenStates( myStates, ENTRY_COLUMN );
+ ob->setAutoOpenLevel( 1 );
+ //ob->setOpenStates( myStates, ENTRY_COLUMN );
myStates.clear();
}
}
void HYDROGUI_DataModel::updateModel()
{
+ DEBTRACE("updateModel");
HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
if( aModule )
update( aModule->getStudyId() );
case KIND_NATURAL_OBJECT: return "NATURAL_OBJECTS";
case KIND_STRICKLER_TABLE: return "STRICKLER_TABLES";
case KIND_LAND_COVER_MAP: return "LAND_COVER_MAPS";
+ case KIND_REGION: return "REGIONS";
+ case KIND_BC_POLYGON: return "BOUNDARY_POLYGONS";
default: break;
}
return QString();
Handle(HYDROData_Document) HYDROGUI_DataModel::getDocument() const
{
int aStudyId = module()->application()->activeStudy()->id();
- return HYDROData_Document::Document( aStudyId );
+ return HYDROData_Document::Document();
}
LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParent,
aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLIT_GROUP || aKind == KIND_ZONE ||
aKind == KIND_IMMERSIBLE_ZONE || aKind == KIND_REGION || aKind == KIND_BATHYMETRY ||
aKind == KIND_OBSTACLE || aKind == KIND_STREAM || aKind == KIND_CHANNEL ||
- aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP;
+ aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP ||
+ aKind == KIND_BC_POLYGON;
if ( !visibility )
{
Handle(HYDROData_Profile) aProfObj = Handle(HYDROData_Profile)::DownCast( theModelObject );
aNObject = Handle(HYDROData_NaturalObject)::DownCast( anEntity );
if ( !aNObject.IsNull() )
createObject( aCaseNOSect, aNObject, aGuiObj->entry(), false );
- }
+ }
}
+ LightApp_DataObject* aBoundaryPolygonSect =
+ createObject( aGuiObj, tr( "CASE_BOUNDARY_POLYGONS" ), aGuiObj->entry() );
+ HYDROData_SequenceOfObjects aBCPolygons = aCaseObj->GetBoundaryPolygons();
+ for (int i = 1; i <= aBCPolygons.Size(); i++ )
+ createObject( aBoundaryPolygonSect, aBCPolygons(i), aGuiObj->entry(), false );
+
LightApp_DataObject* aLandCoverMapSect =
createObject( aGuiObj, tr( "CASE_LAND_COVER_MAP" ), aGuiObj->entry() );
HYDROData_SequenceOfObjects aPolylines = aLandCoverMapObj->GetPolylines();
buildObjectPartition( aGuiObj, aPolylines, tr( "LAND_COVER_POLYLINES" ), true );*/
}
-
+ else if ( anObjectKind == KIND_BC_POLYGON )
+ {
+ Handle(HYDROData_BCPolygon) aBCObj =
+ Handle(HYDROData_BCPolygon)::DownCast( aDataObj );
+
+ LightApp_DataObject* aPolylineSect =
+ createObject( aGuiObj, tr( "BC_POLYGON_POLYLINE" ), aGuiObj->entry() );
+
+ Handle(HYDROData_PolylineXY) aPolyline = aBCObj->GetPolyline();
+ if ( !aPolyline.IsNull() && !aPolyline->IsRemoved() )
+ createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false );
+ }
HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
if( aModule )
aModule->enableLCMActions();
void HYDROGUI_DataModel::updateDocument()
{
+ DEBTRACE("updateDocument");
// Sets the default strickler coefficient from preferences to document.
Handle(HYDROData_Document) aDoc = getDocument();
SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr();
