-// 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
Handle(HYDROData_Object) anObject1, anObject2;
HYDROData_PriorityType aPriority;
HYDROData_Zone::MergeAltitudesType aMergeType;
- for ( int anIndex = 0; anIndex < myEditedObject->GetRulesCount(); anIndex++ ) {
+ for ( int anIndex = 0; ; anIndex++ )
+ {
if ( myEditedObject->GetRule( anIndex, anObject1, aPriority, anObject2, aMergeType ) ) {
HYDROData_CustomRule aRule;
aRule.Object1 = anObject1;
aRules << aRule;
}
+ else
+ break;
}
aPanel->setRules( aRules );
}
theBrowseObjectsEntries.append( anEntry );
}
+ // For manual mode priority rules are redundant
+ if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) {
+ myEditedObject->ClearRules( false );
+ }
+
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
return true;
QString aNewCaseName = aPanel->getObjectName();
QString anOldCaseName = myEditedObject->GetName();
+ bool isNameChanged = anOldCaseName != aNewCaseName;
- bool anIsToUpdateOb = myIsEdit && anOldCaseName != aNewCaseName;
-
+ bool anIsToUpdateOb = isNameChanged;
+
// At first we must to update the case name because of
// automatic names generation for regions and zones
myEditedObject->SetName( aNewCaseName );
-
- // Clear rules
- myEditedObject->ClearRules();
-
+
// Set parameters for automatic mode
int aMode = aPanel->getMode();
if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) {
myEditedObject->AddGeometryObject( anObject );
}
+ // Clear priority rules
+ //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
+ myEditedObject->ClearRules( true );
+ //@ASL }
// Set priority rules
foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
myEditedObject->AddRule( aRule.Object1, aRule.Priority,
aRule.Object2, aRule.MergeType );
}
}
- aPanel->setMoveZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
+ aPanel->setEditZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
if ( myEditedObject->IsMustBeUpdated() )
{
myShowZones = true;
myEditedObject->Update();
-
+
//aPanel->setEditedObject( myEditedObject );
aPanel->refreshZonesBrowser();
-
+
+ closePreview();
createPreview();
+
+ anIsToUpdateOb = true;
}
else
{
setZonesVisible( true );
+
+ if ( isNameChanged ) {
+ module()->getDataModel()->updateObjectTree( myEditedObject );
+ }
}
- if ( anIsToUpdateOb )
- module()->getApp()->updateObjectBrowser( false );
+ if ( anIsToUpdateOb ) {
+ SUIT_DataBrowser* anObjBrowser = ((LightApp_Application*)module()->application())->objectBrowser();
+ if ( anObjBrowser ) {
+ anObjBrowser->updateTree( module()->getDataModel()->getDataObject( myEditedObject ), false );
+ }
+ }
QApplication::restoreOverrideCursor();
}