From d2f606321a6f64e755b72cffdbd8c4bf2904a565 Mon Sep 17 00:00:00 2001 From: dmv Date: Tue, 3 Nov 2009 15:27:43 +0000 Subject: [PATCH] 0020012: EDF 831 GEOM : API for points representation in 3D viewer --- resources/Makefile.am | 9 +++++++++ resources/marker_1.png | Bin 0 -> 261 bytes resources/marker_2.png | Bin 0 -> 239 bytes resources/marker_3.png | Bin 0 -> 285 bytes resources/marker_4.png | Bin 0 -> 274 bytes resources/marker_5.png | Bin 0 -> 266 bytes resources/marker_6.png | Bin 0 -> 283 bytes resources/marker_7.png | Bin 0 -> 282 bytes resources/marker_8.png | Bin 0 -> 320 bytes resources/marker_9.png | Bin 0 -> 300 bytes src/GEOMGUI/GEOM_images.ts | 36 ++++++++++++++++++++++++++++++++++++ src/GEOMGUI/GeometryGUI.cxx | 29 ++++++++++------------------- 12 files changed, 55 insertions(+), 19 deletions(-) create mode 100755 resources/marker_1.png create mode 100755 resources/marker_2.png create mode 100755 resources/marker_3.png create mode 100755 resources/marker_4.png create mode 100755 resources/marker_5.png create mode 100755 resources/marker_6.png create mode 100755 resources/marker_7.png create mode 100755 resources/marker_8.png create mode 100755 resources/marker_9.png diff --git a/resources/Makefile.am b/resources/Makefile.am index 7e74345c4..7f6261d32 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -186,6 +186,15 @@ suppressintwires.png \ marker.png \ marker2.png \ marker3.png \ +marker_1.png \ +marker_2.png \ +marker_3.png \ +marker_4.png \ +marker_5.png \ +marker_6.png \ +marker_7.png \ +marker_8.png \ +marker_9.png \ position.png \ position2.png \ position3.png \ diff --git a/resources/marker_1.png b/resources/marker_1.png new file mode 100755 index 0000000000000000000000000000000000000000..f0d21091d88a83773e7979511c1ff6200b48b3d4 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTzd%8G=RNPAX^Z&m+vnqo^!;BA}r%q@InaBc}5*jQFj4m4)F^D4^U2aKE(y}&{ zHS+~sm{|mvPcXzpM7ce*x2qIj<51|@%OKz&B8^G(OnK(kz_92BD+41NgMzQk)H8b{ RPXe96;OXk;vd$@?2>?nQL0td< literal 0 HcmV?d00001 diff --git a/resources/marker_2.png b/resources/marker_2.png new file mode 100755 index 0000000000000000000000000000000000000000..8bbaa854e234d7a1d13ac8dc60d02098178db461 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hUudb&7bP0l+XkKJNr5W literal 0 HcmV?d00001 diff --git a/resources/marker_3.png b/resources/marker_3.png new file mode 100755 index 0000000000000000000000000000000000000000..e37d613e1edc4afdb1b26b886c74481c907b63ce GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTr_H=O!skoK&=l_3uW>p4-h8Z6`Po2;bGLZ!`B{WzV7>~Gg_1<{G$kf3o!geAe z%I%@OqL~pJhXPwplfls!CT2VW4m~@P7;oSA84DR0T{dzv zFm*gKVBk>bN@i4OD9BQ4<39v6wBdAS%N)MLKox~SK*QX;ij^H00^cw-FfcQ$e52eg TWvmW#9Rq`>tDnm{r-UW|VCYco literal 0 HcmV?d00001 diff --git a/resources/marker_4.png b/resources/marker_4.png new file mode 100755 index 0000000000000000000000000000000000000000..78c8055325e4c2bc3fa924015482adbf401fb3f2 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hU8c)B=-RNPAX^Z&m+vnqo^L&OHoQzx{NX8d~cvDPgoi;<~=b+%hhSK&!U76IlH z+zL9ni$BO8JJx>jDo{X}xfQ6zW0UM`Z3d=}Byk27fun4w#6=DP2a(-CRT2|FGg)d1 v0vQ`q)q*}TIWQOo&5{P1|Hy!W!+?SN`^u?H9{2D7-NfMO>gTe~DWM4f^qWmT literal 0 HcmV?d00001 diff --git a/resources/marker_5.png b/resources/marker_5.png new file mode 100755 index 0000000000000000000000000000000000000000..a994c1100412a856d0609296d30fa92a841f1fa2 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTTc)B=-RNPAX^Z&m+vnqo^!wd-x76wKZa|gGui5klntY+p=V4EPG5E13}(B4R1 zHhD5Thr%L}hr%E#=g@Pb1_q@UF;4fGfXagY_Vh6_btH*1um~JYWDsx=InLz35IBdA zfvIB&!{KFo3JnsPXMGqLT?*5H>brOuI1CuLgpN0+)LE$j-NNAM>gTe~DWM4fhCxL{ literal 0 HcmV?d00001 diff --git a/resources/marker_6.png b/resources/marker_6.png new file mode 100755 index 0000000000000000000000000000000000000000..967b93ecc25181d1b2fea151d283eed958c8eedc GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTr^mK6yskoK&=l_3uW>p4-hKLQEr%q@k&G_}?W35|G79&#!>uk52uELXyECS3Y zxD|AC7k`jHcC7v4RiJ<{b1P7b$0pg?+6+t`N#YDF0&&b6j?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTr@N{tuskoK&?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hU0^K@|xskoK&=l_3uW>p4-hKLQEr%q@k&G_}?W35|G79&#!;}a%{Y10CK@Ez_VQG^To`ZIA#t7wU~3QJ6V>W z4PXGO-=UH)>q90RV*|sXOomO|A0$D7ElfP|2bvfh7#{Li#N>QoU?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hTL@^op4-h6sn2o;8pDtM|V*KE&c!Q_}k4lYyNBgJDAq!=Xz? zT>mF#mh^bbDKu=*I@G%HBr}V^Q9T9@g*9rE53zG7sO2bfb16hPEMhmX0*b1|2pKqk z$Yf(|U^tY?;A6Z^!K*2>8Vhl_jk4hK>97J{l?Urz4QLSVI(wb*` hf$EMpC^B#uFx+uYQBZVc>j1iz!PC{xWt~$(6999WRk;8F literal 0 HcmV?d00001 diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts index 2e25def67..748ecd84f 100644 --- a/src/GEOMGUI/GEOM_images.ts +++ b/src/GEOMGUI/GEOM_images.ts @@ -629,6 +629,42 @@ ICON_SELECT select1.png + + ICON_VERTEX_MARKER_1 + marker_1.png + + + ICON_VERTEX_MARKER_2 + marker_2.png + + + ICON_VERTEX_MARKER_3 + marker_3.png + + + ICON_VERTEX_MARKER_4 + marker_4.png + + + ICON_VERTEX_MARKER_5 + marker_5.png + + + ICON_VERTEX_MARKER_6 + marker_6.png + + + ICON_VERTEX_MARKER_7 + marker_7.png + + + ICON_VERTEX_MARKER_8 + marker_8.png + + + ICON_VERTEX_MARKER_9 + marker_9.png + ICO_ARC arc.png diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index cfb50c82b..5e88b7c2c 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -1589,39 +1589,30 @@ void GeometryGUI::createPreferences() setPreferenceProperty( step, "precision", 3 ); // Set property for type of vertex marker - QStringList aTypeOfMarkerList; QList anTypeOfMarkerIndexesList; + QList anTypeOfMarkerIconsList; - aTypeOfMarkerList.append( tr("TOM_PLUS") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_PLUS); - - aTypeOfMarkerList.append( tr("TOM_POINT") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_POINT); - - aTypeOfMarkerList.append( tr("TOM_STAR") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_STAR); - - aTypeOfMarkerList.append( tr("TOM_O") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_O); - - aTypeOfMarkerList.append( tr("TOM_X") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_X); - - aTypeOfMarkerList.append( tr("TOM_O_POINT") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_O_POINT); - - aTypeOfMarkerList.append( tr("TOM_O_PLUS") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_O_PLUS); - - aTypeOfMarkerList.append( tr("TOM_O_STAR") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_O_STAR); - - aTypeOfMarkerList.append( tr("TOM_O_X") ); anTypeOfMarkerIndexesList.append(Aspect_TOM_O_X); + // Create icons list + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + for (int i = 1; i<=9; i++) { + QString str = "ICON_VERTEX_MARKER_"; + str.append( QString::number(i) ); + QPixmap pixmap (resMgr->loadPixmap("GEOM", tr( str.toLatin1().data() ))); + anTypeOfMarkerIconsList.append(pixmap); + } - setPreferenceProperty( typeOfMarker, "strings", aTypeOfMarkerList ); setPreferenceProperty( typeOfMarker, "indexes", anTypeOfMarkerIndexesList ); + setPreferenceProperty( typeOfMarker, "icons", anTypeOfMarkerIconsList ); // Set property for Vertex Marker scale setPreferenceProperty( markerScale, "min", 1. ); -- 2.39.2