Explorer perspective migrated

com.hazard157.prisex24/OSGI-INF/l10n/bundle.properties

@@ -71,6 +71,12 @@ Uipart_Episode_Tags             = Tags
 Uipart_Episode_Tags_D           = Mark an episode with tags
 Uipart_Episodes_List            = Episodes
 Uipart_Episodes_List_D          = Episodes list
+Uipart_ExplorerDirectQuery      = Direct
+Uipart_ExplorerDirectQuery_D    = Direct query displays results immediately
+Uipart_ExplorerInquiries        = Inquiries
+Uipart_ExplorerInquiries_D      = Viewing and creating saved inquiries
+Uipart_ExplorerQueryResult      = Results
+Uipart_ExplorerQueryResult_D    = Viewing a list of the results of the current query
 Uipart_PlepTimeline             = Timeline
 Uipart_PlepTimeline_D           = Planned episode timeline
 Uipart_Pleps                    = Plans

com.hazard157.prisex24/OSGI-INF/l10n/bundle_ka_GE.properties

@@ -71,6 +71,12 @@ Uipart_Episode_Tags             = ტეგები
 Uipart_Episode_Tags_D           = მონიშნეთ ეპიზოდი ტეგებით
 Uipart_Episodes_List            = ეპიზოდები
 Uipart_Episodes_List_D          = ეპიზოდების სია
+Uipart_ExplorerDirectQuery      = უშუალო
+Uipart_ExplorerDirectQuery_D    = პირდაპირი შეკითხვა აჩვენებს შედეგებს დაუყოვნებლივ
+Uipart_ExplorerInquiries        = მოთხოვნები
+Uipart_ExplorerInquiries_D      = შენახული მოთხოვნების ნახვა და შექმნა
+Uipart_ExplorerQueryResult      = შედეგები
+Uipart_ExplorerQueryResult_D    = მიმდინარე მოთხოვნის შედეგების სიის ნახვა
 Uipart_PlepTimeline             = დროის ხაზი
 Uipart_PlepTimeline_D           = დაგეგმილი ეპიზოდის ქრონოლოგია
 Uipart_Pleps                    = გეგმები

com.hazard157.prisex24/OSGI-INF/l10n/bundle_ru_RU.properties

@@ -71,6 +71,12 @@ Uipart_Episode_Tags             = Ярлыки
 Uipart_Episode_Tags_D           = Пометка эпизода ярлыками
 Uipart_Episodes_List            = Эпизоды
 Uipart_Episodes_List_D          = Список эпизодов
+Uipart_ExplorerDirectQuery      = Прямой
+Uipart_ExplorerDirectQuery_D    = Прямой запрос отображает результаты немедленно
+Uipart_ExplorerInquiries        = Запросы
+Uipart_ExplorerInquiries_D      = Просмотр и создание сохраненных выборок
+Uipart_ExplorerQueryResult      = Результаты
+Uipart_ExplorerQueryResult_D    = Просмотр списка результатов текущего запроса
 Uipart_PlepTimeline             = График
 Uipart_PlepTimeline_D           = График запланированного эпизодов
 Uipart_Pleps                    = Планы

com.hazard157.prisex24/fragment.e4xmi

@@ -105,9 +105,23 @@
         </children>
       </children>
     </elements>
+    <elements xsi:type="advanced:Perspective" xmi:id="_h3mtcBvQEe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.persp.explorer" label="%Persp_Explorer" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/explorer.png" tooltip="%Persp_Explorer_D">
+      <children xsi:type="basic:PartSashContainer" xmi:id="_gHMDQBvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.partsashcontainer.6" horizontal="true">
+        <children xsi:type="basic:PartStack" xmi:id="_iMwBkBvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.partstack.12" containerData="1400" selectedElement="_l5qYMBvREe6OO6g7I-LlOQ">
+          <children xsi:type="basic:Part" xmi:id="_lm2w8BvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.part.explorer_direct_query" contributionURI="bundleclass://com.hazard157.prisex24/com.hazard157.prisex24.e4.uiparts.explorer.UipartsExplorerDirectQuery" label="%Uipart_ExplorerDirectQuery" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/explorer-direct-query.png" tooltip="%Uipart_ExplorerDirectQuery_D"/>
+          <children xsi:type="basic:Part" xmi:id="_l5qYMBvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.part.explorer_inquiries" contributionURI="bundleclass://com.hazard157.prisex24/com.hazard157.prisex24.e4.uiparts.explorer.UipartsExplorerInquiries" label="%Uipart_ExplorerInquiries" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/explorer-inquiries.png" tooltip="%Uipart_ExplorerInquiries_D"/>
+        </children>
+        <children xsi:type="basic:PartStack" xmi:id="_j2ip4BvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.partstack.13" containerData="1400">
+          <children xsi:type="basic:Part" xmi:id="_mXEF4BvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.part.explorer_result_svins" contributionURI="bundleclass://com.hazard157.prisex24/com.hazard157.prisex24.e4.uiparts.explorer.UipartExplorerResults" label="%Uipart_ExplorerQueryResult" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/explorer-query-result.png" tooltip="%Uipart_ExplorerQueryResult_D"/>
+        </children>
+        <children xsi:type="basic:PartStack" xmi:id="_kp1IABvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.partstack.14" containerData="7200">
+          <children xsi:type="advanced:Placeholder" xmi:id="_nGRVQBvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.placeholder.3" ref="_2Coq4Az_Ee6MCt0KJQBWiw"/>
+        </children>
+      </children>
+    </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_ZtJLQAqqEe6kmvIYOJ1hbQ" featurename="children" parentElementId="org.toxsoft.mws.menu.main.perspectives">
-    <elements xsi:type="menu:HandledMenuItem" xmi:id="_MTd-UBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.handledmenuitem.persp_welcome" label="%Persp_Welcome" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/welcome.png" tooltip="%Persp_Welcome_D" mnemonics="" command="_erzlkAilEe6RgN0UorbIgw">
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_MTd-UBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.handledmenuitem.persp_welcome" label="%Persp_Welcome" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/welcome.png" tooltip="%Persp_Welcome_D" type="Radio" mnemonics="" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_S2qlkBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.parameter.4" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.welcome"/>
     </elements>
     <elements xsi:type="menu:MenuSeparator" xmi:id="_KZlrkBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.menuseparator.2"/>
@@ -126,19 +140,22 @@
     <elements xsi:type="menu:HandledMenuItem" xmi:id="_gzMD0BeCEe661Z0SOwydgg" elementId="com.hazard157.prisex24.handledmenuitem.persp_planning" label="%Persp_Planning" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/planning.png" tooltip="%Persp_Planning_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_qbhQABeCEe661Z0SOwydgg" elementId="com.hazard157.prisex24.parameter.7" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.planning"/>
     </elements>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_9TkTUBvQEe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.handledmenuitem.persp_explorer" label="%Persp_Explorer" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/explorer.png" tooltip="%Persp_Explorer_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
+      <parameters xmi:id="_NrrKMBvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.parameter.12" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.explorer"/>
+    </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Z5OfcAqqEe6kmvIYOJ1hbQ" featurename="children" parentElementId="org.toxsoft.mws.toolbar.perspectives">
-    <elements xsi:type="menu:HandledToolItem" xmi:id="_VL4JcBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.handledtoolitem.persp_welcome" label="%Persp_Welcome" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/welcome.png" tooltip="%Persp_Welcome_D" command="_erzlkAilEe6RgN0UorbIgw">
+    <elements xsi:type="menu:HandledToolItem" xmi:id="_VL4JcBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.handledtoolitem.persp_welcome" label="%Persp_Welcome" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/welcome.png" tooltip="%Persp_Welcome_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_Y15kIBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.parameter.5" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.welcome"/>
     </elements>
     <elements xsi:type="menu:ToolBarSeparator" xmi:id="_UcAywBTEEe6zZuIbQz4mwA" elementId="com.hazard157.prisex24.toolbarseparator.2"/>
     <elements xsi:type="menu:HandledToolItem" xmi:id="_mZe2sAw5Ee6bKYfEj3FUUA" elementId="com.hazard157.prisex24.handledtoolitem.persp_episodes" label="%Persp_Episodes" iconURI="platform:/plugin/com.hazard157.psx.proj3/icons/is24x24/incidents-list-episode.png" tooltip="%Persp_Episodes_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_tWbasAw5Ee6bKYfEj3FUUA" elementId="com.hazard157.prisex24.parameter.2" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.episodes"/>
     </elements>
-    <elements xsi:type="menu:HandledToolItem" xmi:id="_X_I18BjPEe6_pb_aM8Q6Gg" elementId="com.hazard157.prisex24.handledtoolitem.persp_gazes" label="%Persp_Gazes" iconURI="platform:/plugin/com.hazard157.psx.proj3/icons/is24x24/incidents-list-gaze.png" tooltip="%Persp_Gazes_D" command="_erzlkAilEe6RgN0UorbIgw">
+    <elements xsi:type="menu:HandledToolItem" xmi:id="_X_I18BjPEe6_pb_aM8Q6Gg" elementId="com.hazard157.prisex24.handledtoolitem.persp_gazes" label="%Persp_Gazes" iconURI="platform:/plugin/com.hazard157.psx.proj3/icons/is24x24/incidents-list-gaze.png" tooltip="%Persp_Gazes_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_k8vU0BjPEe6_pb_aM8Q6Gg" elementId="com.hazard157.prisex24.parameter.9" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.gazes"/>
     </elements>
-    <elements xsi:type="menu:HandledToolItem" xmi:id="_Yb8twBjPEe6_pb_aM8Q6Gg" elementId="com.hazard157.prisex24.handledtoolitem.persp_mingles" label="%Persp_Mingles" iconURI="platform:/plugin/com.hazard157.psx.proj3/icons/is24x24/incidents-list-mingle.png" tooltip="%Persp_Mingles_D" command="_erzlkAilEe6RgN0UorbIgw">
+    <elements xsi:type="menu:HandledToolItem" xmi:id="_Yb8twBjPEe6_pb_aM8Q6Gg" elementId="com.hazard157.prisex24.handledtoolitem.persp_mingles" label="%Persp_Mingles" iconURI="platform:/plugin/com.hazard157.psx.proj3/icons/is24x24/incidents-list-mingle.png" tooltip="%Persp_Mingles_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_ZPRLoBjQEe6_pb_aM8Q6Gg" elementId="com.hazard157.prisex24.parameter.11" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.mingles"/>
     </elements>
     <elements xsi:type="menu:HandledToolItem" xmi:id="_e7h7sAqqEe6kmvIYOJ1hbQ" elementId="com.hazard157.prisex24.handledtoolitem.persp_refbooks" label="%Persp_Refbooks" iconURI="platform:/plugin/com.hazard157.common/icons/is24x24/refbooks-list.png" tooltip="%Persp_Refbooks_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
@@ -147,6 +164,9 @@
     <elements xsi:type="menu:HandledToolItem" xmi:id="_hwxGYBeCEe661Z0SOwydgg" elementId="com.hazard157.prisex24.handledtoolitem.persp_planning" label="%Persp_Planning" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/planning.png" tooltip="%Persp_Planning_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
       <parameters xmi:id="_pRLj0BeCEe661Z0SOwydgg" elementId="com.hazard157.prisex24.parameter.6" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.planning"/>
     </elements>
+    <elements xsi:type="menu:HandledToolItem" xmi:id="_AjB48BvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.handledtoolitem.persp_explorer" label="%Persp_Explorer" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/explorer.png" tooltip="%Persp_Explorer_D" type="Radio" command="_erzlkAilEe6RgN0UorbIgw">
+      <parameters xmi:id="_PJqyMBvREe6OO6g7I-LlOQ" elementId="com.hazard157.prisex24.parameter.13" name="org.toxsoft.mws.cmd.switch_persp.arg.perspId" value="com.hazard157.prisex24.persp.explorer"/>
+    </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_yU7DAAz_Ee6MCt0KJQBWiw" featurename="sharedElements" parentElementId="org.toxsoft.mws.window.main">
     <elements xsi:type="basic:Part" xmi:id="_2Coq4Az_Ee6MCt0KJQBWiw" elementId="com.hazard157.prisex24.part.shared.svins_frames" contributionURI="bundleclass://com.hazard157.prisex24/com.hazard157.prisex24.e4.uiparts.UipartSharedSvinsFramesViewer" label="%Uipart_Svins_Frames" iconURI="platform:/plugin/com.hazard157.prisex24/icons/is24x24/pornicon.png" tooltip="%Uipart_Svins_Frames_D"/>

com.hazard157.prisex24/src/com/hazard157/prisex24/IPrisex24CoreConstants.java

@@ -94,6 +94,11 @@ public interface IPrisex24CoreConstants {
   String PARTID_TRACKS        = "com.hazard157.prisex24.part.tracks";        //$NON-NLS-1$
   String PARTID_PEPL_TIMELINE = "com.hazard157.prisex24.part.plep_timeline"; //$NON-NLS-1$
 
+  String PERSPID_EXPLORER             = "com.hazard157.prisex24.persp.explorer";             //$NON-NLS-1$
+  String PARTID_EXPLORER_DIRECT_QUERY = "com.hazard157.prisex24.part.explorer_direct_query"; //$NON-NLS-1$
+  String PARTID_EXPLORER_INQUIRIES    = "com.hazard157.prisex24.part.explorer_inquiries";    //$NON-NLS-1$
+  String PARTID_EXPLORER_RESULT_SVINS = "com.hazard157.prisex24.part.explorer_result_svins"; //$NON-NLS-1$
+
   String PARTID_SHARED_SVINS_FRAMES = "com.hazard157.prisex24.part.shared.svins_frames"; //$NON-NLS-1$
   String PARTID_SHARED_SNIPPETS     = "com.hazard157.prisex24.part.shared.snippets";     //$NON-NLS-1$
   String PARTID_SHARED_             = "com.hazard157.prisex24.part.shared.";             //$NON-NLS-1$
@@ -141,6 +146,10 @@ public interface IPrisex24CoreConstants {
   String ICONID_FILM                         = "film";                         //$NON-NLS-1$
   String ICONID_PLANNING_FULL                = "planning-full";                //$NON-NLS-1$
   String ICONID_PLANNING                     = "planning";                     //$NON-NLS-1$
+  String ICONID_EXPLORER                     = "explorer";                     //$NON-NLS-1$
+  String ICONID_EXPLORER_DIRECT_QUERY        = "explorer-direct-query";        //$NON-NLS-1$
+  String ICONID_EXPLORER_INQUIRIES           = "explorer-inquiries";           //$NON-NLS-1$
+  String ICONID_EXPLORER_QUERY_RESULT        = "explorer-query-result";        //$NON-NLS-1$
 
   // ------------------------------------------------------------------------------------
   // Actions

com.hazard157.prisex24/src/com/hazard157/prisex24/IPsxGuiContextable.java

@@ -7,6 +7,7 @@
 import com.hazard157.prisex24.e4.services.currep.*;
 import com.hazard157.prisex24.e4.services.psx.*;
 import com.hazard157.prisex24.pdus.snippets.*;
+import com.hazard157.psx.proj3.cameras.*;
 import com.hazard157.psx.proj3.episodes.*;
 import com.hazard157.psx.proj3.sourcevids.*;
 
@@ -51,6 +52,10 @@ default IUnitEpisodes unitEpisodes() {
     return tsContext().get( IUnitEpisodes.class );
   }
 
+  default IUnitCameras unitCameras() {
+    return tsContext().get( IUnitCameras.class );
+  }
+
   default IUnitSourceVideos unitSourceVideos() {
     return tsContext().get( IUnitSourceVideos.class );
   }

com.hazard157.prisex24/src/com/hazard157/prisex24/e4/addons/AddonPrisex24Core.java

@@ -28,12 +28,16 @@
 import com.hazard157.prisex24.cofs.*;
 import com.hazard157.prisex24.cofs.impl.*;
 import com.hazard157.prisex24.e4.services.currep.*;
+import com.hazard157.prisex24.e4.services.currpq.*;
 import com.hazard157.prisex24.e4.services.gazes.*;
 import com.hazard157.prisex24.e4.services.mingles.*;
 import com.hazard157.prisex24.e4.services.pleps.*;
 import com.hazard157.prisex24.e4.services.psx.*;
 import com.hazard157.prisex24.e4.services.selsvins.*;
 import com.hazard157.prisex24.e4.uiparts.welcome.*;
+import com.hazard157.prisex24.explorer.m5.*;
+import com.hazard157.prisex24.explorer.pdu.*;
+import com.hazard157.prisex24.explorer.pdu.impl.*;
 import com.hazard157.prisex24.glib.fravisum.*;
 import com.hazard157.prisex24.m5.camera.*;
 import com.hazard157.prisex24.m5.episodes.*;
@@ -97,11 +101,16 @@ protected void initApp( IEclipseContext aAppContext ) {
     aAppContext.set( ICurrentTrackService.class, new CurrentTrackService() );
     aAppContext.set( ICurrentGazeService.class, new CurrentGazeService() );
     aAppContext.set( ICurrentMingleService.class, new CurrentMingleService() );
+    aAppContext.set( ICurrentPqResultService.class, new CurrentPqResultService() );
     //
     ITsProject proj = aAppContext.get( ITsProject.class );
     IUnitSnippets unitSnippets = new UnitSnippets();
     proj.registerUnit( ISnippetConstants.UNITID_SNIPPETS, unitSnippets, true );
     aAppContext.set( IUnitSnippets.class, unitSnippets );
+    // the explorer PDU initialization
+    IUnitExplorer explorerUnit = new UnitExplorer();
+    proj.registerUnit( IUnitExplorer.UNITID_EXPLORER, explorerUnit, true );
+    aAppContext.set( IUnitExplorer.class, explorerUnit );
   }
 
   @Override
@@ -130,6 +139,8 @@ protected void initWin( IEclipseContext aWinContext ) {
     m5.addModel( new GazeM5Model() );
     m5.addModel( new MingleM5Model() );
     m5.addModel( new SvinM5Model() );
+    m5.addModel( new InquiryM5Model() );
+    m5.addModel( new InquiryItemM5Model() );
     // VALEDs
     IValedControlFactoriesRegistry vcfReg = aWinContext.get( IValedControlFactoriesRegistry.class );
     vcfReg.registerFactory( ValedFrameFactory.FACTORY );

com.hazard157.prisex24/src/com/hazard157/prisex24/e4/services/currpq/CurrentPqResultService.java

@@ -0,0 +1,23 @@
+package com.hazard157.prisex24.e4.services.currpq;
+
+import org.toxsoft.core.tsgui.mws.services.currentity.*;
+
+import com.hazard157.psx.common.stuff.svin.*;
+
+/**
+ * Реализация {@link ICurrentPqResultService}.
+ *
+ * @author hazard157
+ */
+public class CurrentPqResultService
+    extends CurrentEntityService<ISvinSeq>
+    implements ICurrentPqResultService {
+
+  /**
+   * Конструктор.
+   */
+  public CurrentPqResultService() {
+    // nop
+  }
+
+}

com.hazard157.prisex24/src/com/hazard157/prisex24/e4/services/currpq/ICurrentPqResultService.java

@@ -0,0 +1,17 @@
+package com.hazard157.prisex24.e4.services.currpq;
+
+import org.toxsoft.core.tsgui.mws.services.currentity.*;
+
+import com.hazard157.psx.common.stuff.svin.*;
+
+/**
+ * Понятие "текущай результат выборки".
+ *
+ * @author hazard157
+ */
+public interface ICurrentPqResultService
+    extends ICurrentEntityService<ISvinSeq> {
+
+  // nop
+
+}

com.hazard157.prisex24/src/com/hazard157/prisex24/e4/services/selsvins/IPsxSelectedSvinsService.java

@@ -15,6 +15,8 @@
  */
 public interface IPsxSelectedSvinsService {
 
+  // TODO add ability to set UIpart label, tooltip and icon
+
   /**
    * Returns list of SVINs.
    *

com.hazard157.prisex24/src/com/hazard157/prisex24/e4/uiparts/explorer/IPsxResources.java

@@ -0,0 +1,15 @@
+package com.hazard157.prisex24.e4.uiparts.explorer;
+
+/**
+ * Localizable resources.
+ *
+ * @author hazard157
+ */
+interface IPsxResources {
+
+  String STR_N_FILTER_ANY_TEXT = "Выборка любого текста";
+  String STR_N_FILTER_TAG_IDS  = "Выборка по ярлыкам";
+  String STR_N_CLEAR_FILTER    = "Сброс";
+  String STR_D_CLEAR_FILTER    = "Сбросить фильтра на начения по умолчанию";
+
+}