Changeset 1251 in Sophya

Timestamp:

Oct 24, 2000, 10:34:07 AM (25 years ago)

Author:

ercodmgr

Message:

fenetre pour CxxExecutor - Reza 24/10/2000

Location:

trunk/SophyaPI/PIext

Files:

• Makefile (modified) (7 diffs)
• cxxexecwin.cc (added)
• cxxexecwin.h (added)
• objlist.list (modified) (1 diff)
• piacmd.cc (modified) (4 diffs)
• piacmd.h (modified) (3 diffs)
• pistdimgapp.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/Makefile

@@ -4 +4 @@
  
 all: $(LIB)libPIext.a
-$(LIB)libPIext.a : $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
+$(LIB)libPIext.a : $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)cxxexecwin.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
         $(AR) $(ARFLAGS)  $@ $? 
 ifeq ($(CXX),cxx)
@@ -11 +11 @@
  
 clean:
-        rm -f $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
+        rm -f $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)cxxexecwin.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
 ifeq ($(CXX),cxx)
         cd $(REPM); rm -f *.o
@@ -167 +167 @@
  $(INC)piperiodx.h \
  $(INC)periodic.h
+$(OBJ)cxxexecwin.o: cxxexecwin.cc
 $(OBJ)nobjmgr.o: nobjmgr.cc $(INC)strutil.h \
  $(INC)datatypes.h \
@@ -638 +639 @@
  $(INC)ntupintf.h pawexecut.h piacmd.h \
  dlftypes.h $(INC)pdlmgr.h nobjmgr.h \
- servnobjm.h pistdimgapp.h $(INC)pisysdep.h \
+ servnobjm.h nomgadapter.h $(INC)pidrawer.h \
+ $(INC)pibwdggen.h \
+ $(INC)pisysdep.h \
+ $(INC)piwdgx.h \
+ $(INC)piwdggen.h \
+ $(INC)pimsghandler.h \
+ $(INC)picolist.h \
+ $(INC)picmap.h \
+ $(INC)picmapx.h \
+ $(INC)picmapgen.h \
+ $(INC)pigraphx.h \
+ $(INC)pigraphgen.h \
+ $(INC)pifontx.h \
+ $(INC)pifontgen.h \
+ $(INC)pigraphuc.h \
+ $(INC)pievthandler.h \
+ $(INC)psfile.h \
+ $(INC)parradapter.h \
+ $(INC)lut.h \
+ $(INC)generalfit.h \
+ $(INC)generaldata.h \
+ $(INC)poly.h pistdimgapp.h \
  $(INC)piapplx.h \
  $(INC)piapplgen.h \
- $(INC)pimsghandler.h \
  $(INC)picontainerx.h \
  $(INC)picontainergen.h \
- $(INC)piwdgx.h \
- $(INC)piwdggen.h \
- $(INC)picolist.h \
  $(INC)pimenubarx.h \
  $(INC)pimenubargen.h \
@@ -655 +673 @@
  $(INC)pistdwdggen.h \
  $(INC)pibwdgx.h \
- $(INC)pibwdggen.h \
- $(INC)picmap.h \
- $(INC)picmapx.h \
- $(INC)picmapgen.h \
- $(INC)pigraphx.h \
- $(INC)pigraphgen.h \
- $(INC)pifontx.h \
- $(INC)pifontgen.h \
- $(INC)pigraphuc.h \
- $(INC)pievthandler.h \
- $(INC)psfile.h \
  $(INC)pigraphps.h \
  $(INC)piwindowx.h \
@@ -674 +681 @@
  $(INC)pifilechogen.h \
  $(INC)piimage.h \
- $(INC)parradapter.h \
- $(INC)lut.h \
- $(INC)pidrawer.h \
  $(INC)pipixmapx.h \
  $(INC)pipixmapgen.h \
@@ -759 +763 @@
  $(INC)utils.h \
  $(INC)perrors.h \
- $(INC)fmath.h pawexecut.h cxxexecutor.h
+ $(INC)fmath.h pawexecut.h cxxexecutor.h \
+ cxxexecwin.h
 $(OBJ)piafitting.o: piafitting.cc $(INC)strutil.h \
  $(INC)nbtri.h \

trunk/SophyaPI/PIext/objlist.list

@@ -1 +1 @@
 basexecut.o
 cxxexecutor.o
+cxxexecwin.o
 nobjmgr.o
 nomgadapter.o

trunk/SophyaPI/PIext/piacmd.cc

@@ -16 +16 @@
 #include "pawexecut.h"
 #include "cxxexecutor.h"
+#include "cxxexecwin.h"
 
 #include PISTDWDG_H 
@@ -314 +315 @@
 fitexec = new PIAFitter(this, app);
 pawexec = new PAWExecutor(this, app);
-cxxexec = new CxxExecutor(this, app);
+CxxExecutor * cxxe = new CxxExecutor(this, app);
+cxxexec = cxxe;
+cxxoptwin = new  CxxOptionWind(app, cxxe);
+cxxexwin  = new  CxxExecWind(app, cxxe);
+
 AddInterpreter(this);
 curcmdi = this;
@@ -332 +337 @@
   }
 delete helpwin;
+delete cxxexwin;
+delete cxxoptwin;
 if (curpiacmd == this)  curpiacmd = NULL;
 delete basexec;
@@ -908 +915 @@
 
 /* --Methode-- */
+void PIACmd::ShowCxxOptionWindow()
+{
+cxxoptwin->Show();
+}
+
+/* --Methode-- */
+void PIACmd::ShowCxxExecWindow()
+{
+cxxexwin->Show();
+}
+
+/* --Methode-- */
 void PIACmd::HelptoLaTex(string const & fname)
 {

trunk/SophyaPI/PIext/piacmd.h

@@ -47 +47 @@
 }
 #endif
-class PIAHelpWind; // Fenetre d'aide en ligne 
+
+class PIAHelpWind;   // Fenetre d'aide en ligne 
+class CxxExecWind;   // Fenetre pour CxxExecutor
+class CxxOptionWind; // Option de CxxExecutor
+
 class PIACmdBloc;
 
@@ -79 +83 @@
 
   virtual string&       GetUsage(const string& kw);
-  virtual void          ShowHelpWindow();
+
+          void          ShowHelpWindow();
+          void          ShowCxxOptionWindow();
+          void          ShowCxxExecWindow();
 
   virtual void          HelptoLaTex(string const & flnm);
@@ -135 +142 @@
 // Fenetre d'aide interactive 
   PIAHelpWind* helpwin;
-
+  CxxExecWind* cxxexwin;
+  CxxOptionWind* cxxoptwin;
 };
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -69 +69 @@
 m[2]->AppendItem("Show ImageTools", 10301);
 m[2]->AppendItem("Show DrawerTools", 10302);
+m[2]->AppendItem("CxxExecutorWindow", 10303);
 m[2]->AppendItem("Ext.Pave", 10304);
 m[2]->SetSensitivityMsg(10304, false);
@@ -112 +113 @@
 m[5]->AppendCheckItem("Catch SigSEGV", 10604);
 m[5]->AppendCheckItem("ObjMgr Verb", 10605);
+m[5]->AppendCheckItem("CxxExecOption", 10606);
 
 m[6] = new PIMenu(Menubar(),"Modules");
@@ -1094 +1096 @@
     break;
 
+  case 10303 :
+    mCmd->ShowCxxExecWindow();
+    break;
+
   case 10304 :
   case 10305 :
@@ -1363 +1369 @@
     mObjMgr->SetVerbose(m[5]->GetStateMsg(10605));
     break;
+  case 10606:
+    mCmd->ShowCxxOptionWindow();
+    break;
   default:
     cerr << "PIStdImgApp::MBProcess6() BUG?? Msg= " <<  msg << endl;