Changeset 2087 for trunk/MagicSoft

Timestamp:

05/07/03 11:32:44 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mmain/MSearch.cc (added)
• mmain/MSearch.h (added)
• mmain/MStatusDisplay.cc (modified) (8 diffs)
• mmain/MStatusDisplay.h (modified) (2 diffs)
• mmain/MainLinkDef.h (modified) (1 diff)
• mmain/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/05/07: Thomas Bretz
+
+   * mmain/Makefile, mmain/MainLinkDef.h:
+     - added MSearch
+     
+   * mmain/MSearch.[h,cc]:
+     - added
+
+   * mmmain/MStatusDisplay.[h,cc]:
+     - implemented Search
+
+
 
  2003/05/07: Abelardo Moralejo
@@ -5 +18 @@
    * mranforest/Makefile
      - fixed typo.
+
+
 
  2003/05/06: Abelardo Moralejo
@@ -23 +38 @@
        events, including non-triggers (while we usually run over files
        containing only triggers).
+
+
 
  2003/05/06: Thomas Bretz

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -90 +90 @@
 #include "MGList.h"               // MGList
 #include "MGMenu.h"               // MGMenu, TGMenu
+#include "MSearch.h"              // MSearch
 #include "MParContainer.h"        // MParContainer::GetDescriptor
 
@@ -96 +97 @@
 
 ClassImp(MStatusDisplay);
+
+// ------------ Workaround for a non working TGTextView::Search -------------
+class MGTextView : public TGTextView
+{
+public:
+    MGTextView(const TGWindow *parent, UInt_t w, UInt_t h, Int_t id = -1,
+               UInt_t sboptions = 0, ULong_t back = GetWhitePixel()) :
+    TGTextView(parent, w, h, id, sboptions, back) {}
+    MGTextView(const TGWindow *parent, UInt_t w, UInt_t h, TGText *text,
+               Int_t id = -1, UInt_t sboptions = 0, ULong_t back = GetWhitePixel()) :
+    TGTextView(parent, w, h, text, id, sboptions, back) {}
+    MGTextView(const TGWindow *parent, UInt_t w, UInt_t h, const char *string,
+               Int_t id = -1, UInt_t sboptions = 0, ULong_t back = GetWhitePixel()) :
+    TGTextView(parent, w, h, string, id, sboptions, back) {}
+
+    void Mark(Long_t xPos, Long_t yPos) { TGTextView::Mark(xPos, yPos); }
+    void UnMark()                       { TGTextView::UnMark(); }
+
+    Bool_t Search(const char *string, Bool_t direction, Bool_t caseSensitive)
+    {
+        // Taken from TGTextView::Search and modified.
+
+        TGLongPosition pos, pos2;
+        pos2.fX = pos2.fY = 0;
+        if (fIsMarked) {
+            if (!direction)
+            {
+                pos2.fX = fMarkedStart.fX;
+                pos2.fY = fMarkedStart.fY;
+            }
+            else
+            {
+                pos2.fX = fMarkedEnd.fX + 1;
+                pos2.fY = fMarkedEnd.fY;
+            }
+        }
+        if (!fText->Search(&pos, pos2, string, direction, caseSensitive))
+            return kFALSE;
+        UnMark();
+        fIsMarked = kTRUE;
+        fMarkedStart.fY = fMarkedEnd.fY = pos.fY;
+        fMarkedStart.fX = pos.fX;
+        fMarkedEnd.fX = fMarkedStart.fX + strlen(string);
+        pos.fY = ToObjYCoord(fVisible.fY);
+        if ((fMarkedStart.fY < pos.fY) ||
+            (ToScrYCoord(fMarkedStart.fY) >= (Int_t)fCanvas->GetHeight()))
+            pos.fY = fMarkedStart.fY;
+        pos.fX = ToObjXCoord(fVisible.fX, pos.fY);
+        if ((fMarkedStart.fX < pos.fX) ||
+            (ToScrXCoord(fMarkedStart.fX, pos.fY) >= (Int_t)fCanvas->GetWidth()))
+            pos.fX = fMarkedStart.fX;
+
+        SetVsbPosition((ToScrYCoord(pos.fY) + fVisible.fY)/fScrollVal.fY);
+        SetHsbPosition((ToScrXCoord(pos.fX, pos.fY) + fVisible.fX)/fScrollVal.fX);
+        DrawRegion(0, (Int_t)ToScrYCoord(fMarkedStart.fY), fCanvas->GetWidth(),
+                   UInt_t(ToScrYCoord(fMarkedEnd.fY+1) - ToScrYCoord(fMarkedEnd.fY)));
+
+        return kTRUE;
+    }
+};
+// --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------
@@ -163 +225 @@
     logmenu->AddSeparator();
     logmenu->AddEntry("Select &All",    kLogSelect);
-    /*
-     logmenu->AddSeparator();
-     logmenu->AddEntry("Search",         kLogSearch);
-     */
+    logmenu->AddSeparator();
+    logmenu->AddEntry("&Find...",       kLogFind);
     logmenu->AddSeparator();
     logmenu->AddEntry("&Save",          kLogSave);
@@ -280 +340 @@
 
         // Create Text View
-        fLogBox = new TGTextView(f, 1, 1); // , -1, 0, TGFrame::GetDefaultFrameBackground());
+        fLogBox = new MGTextView(f, 1, 1); // , -1, 0, TGFrame::GetDefaultFrameBackground());
         if (fFont)
             fLogBox->SetFont(fFont);
@@ -782 +842 @@
         fLogBox->SelectAll();
         return kTRUE;
-    case kLogSearch:
-        //virtual Bool_t Search(const char *string, Bool_t direction, Bool_t caseSensitive);
+    case kLogFind:
+        new MSearch(this);
         return kTRUE;
     case kLogSave:
@@ -939 +999 @@
 // --------------------------------------------------------------------------
 //
+// Process the kC_USER messages
+//
+Bool_t MStatusDisplay::ProcessMessageUser(Long_t submsg, Long_t mp1, Long_t mp2)
+{
+    // kS_START, case sensitive | backward<<1, char *txt
+    switch (submsg)
+    {
+    case kS_START:
+        fLogBox->Search((char*)mp2, !(mp1&2>>1), mp1&1);
+        return kTRUE;
+#ifdef DEBUG
+    default:
+        cout << "User: " << "Submsg:" << submsg << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
+#endif
+    }
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 // Process the messages from the GUI
 //
@@ -944 +1024 @@
 {
     // Can be found in WidgetMessageTypes.h
+    cout << "Msg: " << GET_MSG(msg) << " Submsg:" << GET_SUBMSG(msg);
+    cout << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
     switch (GET_MSG(msg))
     {
@@ -951 +1033 @@
     case kC_TEXTVIEW:
         return ProcessMessageTextview(GET_SUBMSG(msg), mp1, mp2);
+
+    case kC_USER:
+        return ProcessMessageUser(GET_SUBMSG(msg), mp1, mp2);
     }
 #ifdef DEBUG

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -44 +44 @@
         kSize640, kSize800, kSize960, kSize1024, kSize1280,
         // kLog
-        kLogCopy, kLogClear, kLogSelect, kLogSearch, kLogSave, kLogAppend,
+        kLogCopy, kLogClear, kLogSelect, kLogFind, kLogSave, kLogAppend,
         // kPic
-        kPicMagic, kPicMars
+        kPicMagic, kPicMars,
+        // kPic
+        kSearch
     } Status_t;
 
@@ -82 +84 @@
     Bool_t ProcessMessageCommand(Long_t submsg, Long_t mp1, Long_t mp2);
     Bool_t ProcessMessageTextview(Long_t submsg, Long_t mp1, Long_t mp2);
+    Bool_t ProcessMessageUser(Long_t submsg, Long_t mp1, Long_t mp2);
     Bool_t ProcessMessage(Long_t msg, Long_t mp1, Long_t mp2);
     void   CloseWindow();

trunk/MagicSoft/Mars/mmain/MainLinkDef.h

@@ -13 +13 @@
 #pragma link C++ class MDataCheck+;
 #pragma link C++ class MMonteCarlo+;
+#pragma link C++ class MSearch+;
 #pragma link C++ class MProgressBar+;
 #pragma link C++ class MCameraDisplay+;

trunk/MagicSoft/Mars/mmain/Makefile

@@ -37 +37 @@
            MAnalysis.cc \
            MMonteCarlo.cc \
+           MSearch.cc \
            MStatusDisplay.cc \
            MProgressBar.cc \