Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch for correct immersible zone color in preview
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Tool.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_Tool.cxx
b/src/HYDROGUI/HYDROGUI_Tool.cxx
index 7370fa3150755baf2c1dde3169fcd584ee5a335c..6cc4ae17009cd18d049be5fbea233d8d5a6b88b0 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/
src/HYDROGUI/HYDROGUI_Tool.cxx
@@
-184,7
+184,7
@@
QString HYDROGUI_Tool::GetTempDir( const bool theToCreate )
#ifdef WNT
tmpdir = "C:\\";
#else
#ifdef WNT
tmpdir = "C:\\";
#else
- tmpdir =
"/tmp"
;
+ tmpdir =
strdup( "/tmp" )
;
#endif
}
aRes = tmpdir;
#endif
}
aRes = tmpdir;
@@
-209,7
+209,6
@@
void HYDROGUI_Tool::SetActiveViewManager( HYDROGUI_Module* theModule,
bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& theObject,
const QString& theViewerType )
{
bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& theObject,
const QString& theViewerType )
{
-
if ( theObject.IsNull() )
return false;
if ( theObject.IsNull() )
return false;
@@
-228,7
+227,8
@@
bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& the
anObjectKind == KIND_CHANNEL ||
anObjectKind == KIND_DIGUE ||
anObjectKind == KIND_DUMMY_3D ||
anObjectKind == KIND_CHANNEL ||
anObjectKind == KIND_DIGUE ||
anObjectKind == KIND_DUMMY_3D ||
- anObjectKind == KIND_BATHYMETRY
+ anObjectKind == KIND_BATHYMETRY ||
+ anObjectKind == KIND_LAND_COVER_MAP
#ifdef DEB_GROUPS
|| anObjectKind == KIND_SHAPES_GROUP ||
anObjectKind == KIND_SPLITTED_GROUP
#ifdef DEB_GROUPS
|| anObjectKind == KIND_SHAPES_GROUP ||
anObjectKind == KIND_SPLITTED_GROUP
@@
-662,7
+662,7
@@
QColor HYDROGUI_Tool::GenerateFillingColor( HYDROGUI_Module* theModule,
QColor HYDROGUI_Tool::GenerateFillingColor( const Handle(HYDROData_Document)& theDoc,
const QStringList& theZoneNames )
{
QColor HYDROGUI_Tool::GenerateFillingColor( const Handle(HYDROData_Document)& theDoc,
const QStringList& theZoneNames )
{
- QColor aFillingColor(
HYDROData_ImmersibleZone::DefaultFillingColor()
);
+ QColor aFillingColor(
Qt::darkBlue
);
int aCounter = 0;
int aR = 0, aG = 0, aB = 0;
int aCounter = 0;
int aR = 0, aG = 0, aB = 0;
@@
-809,4
+809,4
@@
void HYDROGUI_Tool::DeleteGeomObjects( HYDROGUI_Module* theModule, const QString
aStudyBuilder->RemoveObject( aSObject );
}
}
aStudyBuilder->RemoveObject( aSObject );
}
}
-}
\ No newline at end of file
+}