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

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 7e74345c421aae1d18d743d4d8daebdd3f41965e..7f6261d325d956909b77f13c51cefece2f9799b9 100644 (file)
--- 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 (executable)
index 0000000..f0d2109
Binary files /dev/null and b/resources/marker_1.png differ

diff --git a/resources/marker_2.png b/resources/marker_2.png
new file mode 100755 (executable)
index 0000000..8bbaa85
Binary files /dev/null and b/resources/marker_2.png differ

diff --git a/resources/marker_3.png b/resources/marker_3.png
new file mode 100755 (executable)
index 0000000..e37d613
Binary files /dev/null and b/resources/marker_3.png differ

diff --git a/resources/marker_4.png b/resources/marker_4.png
new file mode 100755 (executable)
index 0000000..78c8055
Binary files /dev/null and b/resources/marker_4.png differ

diff --git a/resources/marker_5.png b/resources/marker_5.png
new file mode 100755 (executable)
index 0000000..a994c11
Binary files /dev/null and b/resources/marker_5.png differ

diff --git a/resources/marker_6.png b/resources/marker_6.png
new file mode 100755 (executable)
index 0000000..967b93e
Binary files /dev/null and b/resources/marker_6.png differ

diff --git a/resources/marker_7.png b/resources/marker_7.png
new file mode 100755 (executable)
index 0000000..7a3eb90
Binary files /dev/null and b/resources/marker_7.png differ

diff --git a/resources/marker_8.png b/resources/marker_8.png
new file mode 100755 (executable)
index 0000000..3b3ccc4
Binary files /dev/null and b/resources/marker_8.png differ

diff --git a/resources/marker_9.png b/resources/marker_9.png
new file mode 100755 (executable)
index 0000000..0d76036
Binary files /dev/null and b/resources/marker_9.png differ

diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts
index 2e25def67092ac9a5dd7c636df9eb51202bb70ff..748ecd84ffd94e4cb3e86d8ccf41409a14d08635 100644 (file)
--- a/src/GEOMGUI/GEOM_images.ts
+++ b/src/GEOMGUI/GEOM_images.ts
@@ -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>

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index cfb50c82bb2c10aba2119d503f156b59ab187d5b..5e88b7c2cd2b949aca768ae15cbb8e7953478797 100644 (file)
--- 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<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. );