Changeset 2677 in Sophya

Timestamp:

Apr 19, 2005, 11:13:49 AM (20 years ago)

Author:

ansari

Message:

Ajout de l option nodisp ds les affichages des NamedObjMgr, prise en compte de <Cntrl C> (Msg_Cancel) pour arreter l'execution de l'interpreteur ds PIStdImgApp et remplacement commande breakexe par stop ds PIACmd - Reza 19/4/2005

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (6 diffs)
• piacmd.cc (modified) (2 diffs)
• piaversion.h (modified) (1 diff)
• pistdimgapp.cc (modified) (1 diff)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -1309 +1309 @@
 void NamedObjMgr::DisplayObj(string& nom, string dopt) 
 {
+// Pas de display si option dopt = nodisp 
+if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
+
 ZSync(*myMutex);
 
@@ -1356 +1359 @@
 void NamedObjMgr::DisplayImage(string& nom, string dopt, bool fgimagnav)
 {
+// Pas de display si option dopt = nodisp 
+if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
+
 ZSync(*myMutex);
 
@@ -1393 +1399 @@
 void NamedObjMgr::DisplaySurf3D(string& nom, string dopt)
 {
+// Pas de display si option dopt = nodisp 
+if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
+
 ZSync(*myMutex);
 
@@ -1440 +1449 @@
                             string& label, string dopt, bool fg3d)
 {
+// Pas de display si option dopt = nodisp 
+if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
+
 ZSync(*myMutex);
 
@@ -1503 +1515 @@
 //|  opt = options generales pour le display.
 {
+// Pas de display si option dopt = nodisp 
+if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
+
 ZSync(*myMutex);
 
@@ -1556 +1571 @@
 //   nomvx et nomvy
 {
+// Pas de display si option dopt = nodisp 
+if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
+
 ZSync(*myMutex);
 

trunk/SophyaPI/PIext/piacmd.cc

@@ -165 +165 @@
 usage = "To display the Help window ";
 RegisterCommand(kw, usage, NULL, grp);
-kw = "breakexe";
-usage = "To break (stop) interpreter (PIACmd/Commander) execution";
+kw = "stop";
+usage = "To stop (break) interpreter (PIACmd/Commander) execution";
 RegisterCommand(kw, usage, NULL, grp);
 
@@ -206 +206 @@
 void PIACmd::AddInputLine(string const & line)
 {
-  if (line == "breakexe")  { 
+  if (line == "stop")  { 
     StopExecution();
     return;

trunk/SophyaPI/PIext/piaversion.h

@@ -2 +2 @@
 #define PIAPPVERSION_H_SEEN
 
-#define PIAPP_VERSIONNUMBER  3.972
+#define PIAPP_VERSIONNUMBER  3.98
 
 #endif

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -572 +572 @@
 else if ( (msg >= 10500) && (msg < 10600) )  MBProcess5(msg, sender, data);
 else if ( (msg >= 10600) && (msg < 10700) )  MBProcess6(msg, sender, data);
-else if ( msg == 30200  ) {    // Objet PIConsole 
+else if ( (msg == 30200) && (smm == PIMsg_Cancel) )  // <Cntrl C> appuye sur Console
+  CmdInterpreter()->StopExecution();
+else if ( (msg == 30200 ) && (smm == PIMsg_OK) ){    // Objet PIConsole avec <Return>/<Enter>
   string s = mCons->GetCmdString();
   //  string s2 = "\nExecuting " + s + "\n";