0020012: EDF 831 GEOM : API for points representation in 3D viewer

This commit is contained in:
dmv 2009-11-03 15:27:43 +00:00
parent a9632ce4b6
commit d2f606321a
12 changed files with 55 additions and 19 deletions

View File

@ -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 \

BIN
resources/marker_1.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

BIN
resources/marker_2.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

BIN
resources/marker_3.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

BIN
resources/marker_4.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

BIN
resources/marker_5.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

BIN
resources/marker_6.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

BIN
resources/marker_7.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

BIN
resources/marker_8.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

BIN
resources/marker_9.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

View File

@ -629,6 +629,42 @@
<source>ICON_SELECT</source>
<translation>select1.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_1</source>
<translation>marker_1.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_2</source>
<translation>marker_2.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_3</source>
<translation>marker_3.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_4</source>
<translation>marker_4.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_5</source>
<translation>marker_5.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_6</source>
<translation>marker_6.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_7</source>
<translation>marker_7.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_8</source>
<translation>marker_8.png</translation>
</message>
<message>
<source>ICON_VERTEX_MARKER_9</source>
<translation>marker_9.png</translation>
</message>
<message>
<source>ICO_ARC</source>
<translation>arc.png</translation>

View File

@ -1589,39 +1589,30 @@ void GeometryGUI::createPreferences()
setPreferenceProperty( step, "precision", 3 );
// Set property for type of vertex marker
QStringList aTypeOfMarkerList;
QList<QVariant> anTypeOfMarkerIndexesList;
QList<QVariant> 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. );