From 7198f2622fe1a08821e554f2e478e4764ab625c6 Mon Sep 17 00:00:00 2001 From: rkv Date: Mon, 2 Dec 2013 12:01:41 +0000 Subject: [PATCH] Icons are shown in the object browser tree. --- src/HYDROGUI/HYDROGUI_DataObject.cxx | 35 +++++++- src/HYDROGUI/HYDROGUI_DataObject.h | 12 +++ src/HYDROGUI/resources/HYDROGUI_images.ts | 88 ++++++++++++++++++++ src/HYDROGUI/resources/icon_artobj.png | Bin 0 -> 654 bytes src/HYDROGUI/resources/icon_bathymetry.png | Bin 0 -> 604 bytes src/HYDROGUI/resources/icon_calculation.png | Bin 0 -> 663 bytes src/HYDROGUI/resources/icon_hydro_obj.png | Bin 0 -> 542 bytes src/HYDROGUI/resources/icon_image.png | Bin 0 -> 790 bytes src/HYDROGUI/resources/icon_obstacle.png | Bin 0 -> 718 bytes src/HYDROGUI/resources/icon_partition.png | Bin 0 -> 632 bytes src/HYDROGUI/resources/icon_polyline.png | Bin 0 -> 544 bytes src/HYDROGUI/resources/icon_polyline_xy.png | Bin 0 -> 392 bytes src/HYDROGUI/resources/icon_profile.png | Bin 0 -> 718 bytes src/HYDROGUI/resources/icon_river.png | Bin 0 -> 558 bytes src/HYDROGUI/resources/icon_stream.png | Bin 0 -> 761 bytes src/HYDROGUI/resources/icon_vis_state.png | Bin 0 -> 588 bytes 16 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 src/HYDROGUI/resources/icon_artobj.png create mode 100644 src/HYDROGUI/resources/icon_bathymetry.png create mode 100644 src/HYDROGUI/resources/icon_calculation.png create mode 100644 src/HYDROGUI/resources/icon_hydro_obj.png create mode 100644 src/HYDROGUI/resources/icon_image.png create mode 100644 src/HYDROGUI/resources/icon_obstacle.png create mode 100644 src/HYDROGUI/resources/icon_partition.png create mode 100644 src/HYDROGUI/resources/icon_polyline.png create mode 100644 src/HYDROGUI/resources/icon_polyline_xy.png create mode 100644 src/HYDROGUI/resources/icon_profile.png create mode 100644 src/HYDROGUI/resources/icon_river.png create mode 100644 src/HYDROGUI/resources/icon_stream.png create mode 100644 src/HYDROGUI/resources/icon_vis_state.png diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx index c35afa88..64f579ff 100644 --- a/src/HYDROGUI/HYDROGUI_DataObject.cxx +++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx @@ -24,6 +24,9 @@ #include #include +#include +#include +#include HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent, Handle(HYDROData_Entity) theData, @@ -99,6 +102,27 @@ QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co return aColor; } +QPixmap HYDROGUI_DataObject::icon( const int theId ) const +{ + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + if ( theId == NameId ) + { + QString anIcon; + Handle(HYDROData_Entity) aDataObject = modelObject(); + if( aDataObject.IsNull() ) + { + anIcon = QObject::tr( "HYDRO_TYPE0_ICO" ); // KIND_UNKNOWN + } + else + { + anIcon = QObject::tr( QString("HYDRO_TYPE%1_ICO").arg( (int)aDataObject->GetKind() ).toAscii() ); + } + + return aResMgr->loadPixmap( "HYDRO", anIcon ); + } + return LightApp_DataObject::icon( theId ); +} + QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject, const bool theWithPrefix ) { @@ -147,10 +171,19 @@ QString HYDROGUI_NamedObject::name() const return myName; } +QPixmap HYDROGUI_NamedObject::icon( const int theId ) const +{ + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + if ( theId == NameId ) + { + return aResMgr->loadPixmap( "HYDRO", QObject::tr( "PARTITION_ICO" ) ); + } + return LightApp_DataObject::icon( theId ); +} + HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent, const QString& theName, const QString& theParentEntry ) : HYDROGUI_NamedObject( theParent, theName, theParentEntry ), CAM_DataObject( theParent ) { } - diff --git a/src/HYDROGUI/HYDROGUI_DataObject.h b/src/HYDROGUI/HYDROGUI_DataObject.h index 72f31ed5..ea9fb38c 100644 --- a/src/HYDROGUI/HYDROGUI_DataObject.h +++ b/src/HYDROGUI/HYDROGUI_DataObject.h @@ -85,6 +85,11 @@ public: */ virtual QColor color( const ColorRole, const int = NameId ) const; + /** + * Returns the object icon. + */ + virtual QPixmap icon( const int = NameId ) const; + /** * Returns the model data object. */ @@ -121,6 +126,7 @@ protected: Handle(HYDROData_Entity) myData; ///< object from data model QString myParentEntry; bool myIsValid; ///< indicates if the object is valid + QPixmap myIcon; }; /** @@ -154,9 +160,15 @@ public: */ virtual QString name() const; + /** + * Returns the object icon. + */ + virtual QPixmap icon( const int = NameId ) const; + private: QString myName; ///< name in the OB QString myParentEntry; + QPixmap myIcon; }; /** diff --git a/src/HYDROGUI/resources/HYDROGUI_images.ts b/src/HYDROGUI/resources/HYDROGUI_images.ts index 633906cf..c2b9f7a8 100644 --- a/src/HYDROGUI/resources/HYDROGUI_images.ts +++ b/src/HYDROGUI/resources/HYDROGUI_images.ts @@ -22,5 +22,93 @@ UNDO_ICO icon_undo.png + + PARTITION_ICO + icon_partition.png + + + HYDRO_TYPE0_ICO + icon_hydro_obj.png + + + HYDRO_TYPE1_ICO + icon_image.png + + + HYDRO_TYPE2_ICO + icon_polyline.png + + + HYDRO_TYPE3_ICO + icon_bathymetry.png + + + HYDRO_TYPE4_ICO + icon_hydro_obj.png + + + HYDRO_TYPE5_ICO + icon_hydro_obj.png + + + HYDRO_TYPE6_ICO + icon_river.png + + + HYDRO_TYPE7_ICO + icon_stream.png + + + HYDRO_TYPE8_ICO + icon_hydro_obj.png + + + HYDRO_TYPE9_ICO + icon_hydro_obj.png + + + HYDRO_TYPE10_ICO + icon_obstacle.png + + + HYDRO_TYPE11_ICO + icon_hydro_obj.png + + + HYDRO_TYPE12_ICO + icon_profile.png + + + HYDRO_TYPE13_ICO + icon_hydro_obj.png + + + HYDRO_TYPE14_ICO + icon_polyline_xy.png + + + HYDRO_TYPE15_ICO + icon_calculation.png + + + HYDRO_TYPE16_ICO + icon_hydro_obj.png + + + HYDRO_TYPE17_ICO + icon_hydro_obj.png + + + HYDRO_TYPE18_ICO + icon_vis_state.png + + + HYDRO_TYPE19_ICO + icon_artobj.png + + + HYDRO_TYPE20_ICO + icon_hydro_obj.png + diff --git a/src/HYDROGUI/resources/icon_artobj.png b/src/HYDROGUI/resources/icon_artobj.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd0b2aa3bb303995a1197ab8c6ab8a16f101602 GIT binary patch literal 654 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 UE^AkjH2?qr07*qoM6N<$g55TCX8-^I literal 0 HcmV?d00001 diff --git a/src/HYDROGUI/resources/icon_obstacle.png b/src/HYDROGUI/resources/icon_obstacle.png new file mode 100644 index 0000000000000000000000000000000000000000..44279dcec7def22ebd46793a2510659707811df0 GIT binary patch literal 718 zcmV;<0x|uGP)hSoKGW9TxuUH~#duP*tojy_#{)vAeN*+Ibb zvBB${^T~8NnapJ~P!$f}_px2GVAUHA>Bp~4eSh{BV0vueQ9{?okK}Vmr&HjJLy{S( z0JQrSL0}ug} zL<-5S0c5&Q;KRF@xb*NnQ}^ppGzHRkVO1@pj-CO74cA;p=vR@<6rgo>Lka_)Q$yhS z2=`jn1PI>);|jJ{KEnFd0V9(qOQAEH#g5BSD=my< z=aqIWL%?oMSX zs+{I=GZ_&WF5v+E8L zNdvl}6HJeDQKKFZST{OQHywPL{p8KBIumj4T8?s_w%(f~#S6njxx2;QqERSzqo+8C zjjc8OEU%*Sqp~x*xc%VCOyw4gUbq(tw1lgoXx`HVs0gK|-QT;Nk*gBnKlTn_z-{ zmhYU)-7d3t&KJ-ik94}dotgJ$-pr9P27{QufTqgxGmAP3uNoaE7bGM|sxpx{$6x!S zseeO+ZJ)Bq=VzY*TTvP$C03r?ILjc0=nnu+A|W7D<`Wa0NdS!2oVvxShDKmPGuu1Z{X#D3g|-0BZ&qN9*G%zO46N zD4sVu^%@Qrc`Ds1baRPAMG7LbeA>HftOGIA&>{S+y14WB!(!4xyYUUh=}X*79hA*; zs@NUjK4So91b$-;-y6->tMfCSvO&Q{3%OG#fnJLTF^s=9aIa;Dv9bIfwI98O6QfM# z&RzC+V0j(IuuEljHs;@Ei!vnIlXu^Ym7iYmY~+PRvHvr>_inmd1OCpx1sDLU%fF)P S!b7P50000 literal 0 HcmV?d00001 diff --git a/src/HYDROGUI/resources/icon_polyline.png b/src/HYDROGUI/resources/icon_polyline.png new file mode 100644 index 0000000000000000000000000000000000000000..7ab0765ebc0bcb20dc0ca8864d57c03b564436fe GIT binary patch literal 544 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 afB^v8!ZZ=E>wzZ#0000