From de251bfa3d05607dc3bf70194c3fec6a4bcefb9e Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 15 Oct 2015 08:17:52 +0300 Subject: [PATCH] patch for crashes after colors redesign --- src/HYDROGUI/HYDROGUI_ChannelOp.cxx | 4 ++-- src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx | 4 ++-- src/HYDROGUI/HYDROGUI_LandCoverOp.cxx | 4 ++-- src/HYDROGUI/HYDROGUI_StreamOp.cxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx index 958d9b8a..e052d7d0 100644 --- a/src/HYDROGUI/HYDROGUI_ChannelOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ChannelOp.cxx @@ -267,8 +267,8 @@ void HYDROGUI_ChannelOp::onCreatePreview() { myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() ); - QColor aFillingColor = myEditedObject->DefaultFillingColor(); - QColor aBorderColor = myEditedObject->DefaultBorderColor(); + QColor aFillingColor = Qt::blue; + QColor aBorderColor = Qt::transparent; if ( !myEditedObject.IsNull() ) { aFillingColor = myEditedObject->GetFillingColor(); diff --git a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx index 2e1c844d..3af761cb 100644 --- a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx @@ -242,8 +242,8 @@ void HYDROGUI_ImmersibleZoneOp::onCreatePreview( const QString& thePolylineName if ( aViewManager && myPreviewPrs ) { - QColor aFillingColor = myEditedObject->DefaultFillingColor(); - QColor aBorderColor = myEditedObject->DefaultBorderColor(); + QColor aFillingColor = Qt::darkBlue; + QColor aBorderColor = Qt::transparent; if ( !myEditedObject.IsNull() ) { aFillingColor = myEditedObject->GetFillingColor(); aBorderColor = myEditedObject->GetBorderColor(); diff --git a/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx index 76f4aec9..205b1486 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx +++ b/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx @@ -281,8 +281,8 @@ void HYDROGUI_LandCoverOp::onCreatePreview( const QStringList& thePolylineNames if ( aViewManager && myPreviewPrs ) { - QColor aFillingColor = myEditedObject->DefaultFillingColor(); - QColor aBorderColor = myEditedObject->DefaultBorderColor(); + QColor aFillingColor = Qt::magenta; + QColor aBorderColor = Qt::transparent; if ( !myEditedObject.IsNull() ) { aFillingColor = myEditedObject->GetFillingColor(); aBorderColor = myEditedObject->GetBorderColor(); diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx index c7070ef2..5835dc95 100755 --- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx +++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx @@ -291,8 +291,8 @@ void HYDROGUI_StreamOp::createPreview() { myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() ); - QColor aFillingColor = myEditedObject->DefaultFillingColor(); - QColor aBorderColor = myEditedObject->DefaultBorderColor(); + QColor aFillingColor = Qt::green; + QColor aBorderColor = Qt::transparent; if ( !myEditedObject.IsNull() ) { aFillingColor = myEditedObject->GetFillingColor(); -- 2.39.2