summaryrefslogtreecommitdiff
path: root/2004/i/nono/src/ovision/comm.cc
diff options
context:
space:
mode:
Diffstat (limited to '2004/i/nono/src/ovision/comm.cc')
-rw-r--r--2004/i/nono/src/ovision/comm.cc26
1 files changed, 17 insertions, 9 deletions
diff --git a/2004/i/nono/src/ovision/comm.cc b/2004/i/nono/src/ovision/comm.cc
index d3541bf..116b7d8 100644
--- a/2004/i/nono/src/ovision/comm.cc
+++ b/2004/i/nono/src/ovision/comm.cc
@@ -41,8 +41,8 @@ Comm::Comm(char *filename)
int *pPoint = GetPpoint();
for (int i=0; i<3; i++)
{
- pPoint[i*2] = oconfig->tabPoint[i][0];
- pPoint[i*2+1] = oconfig->tabPoint[i][1];
+ pPoint[i*2] = oconfig->tabPoint[i*4];
+ pPoint[i*2+1] = oconfig->tabPoint[i*4+1];
}
// Ouverture de l'image pilote et stockage
@@ -96,6 +96,14 @@ Comm::~Comm()
}
+/// Recharge le fichier de config
+void
+Comm::ReloadConfig (char *filename)
+{
+ oconfig->Load (filename);
+}
+
+
/// Segmente et group les couleurs
void
Comm::SegmAndGroup()
@@ -371,22 +379,22 @@ Comm::ExecuteUiCmds(char *buffer)
int *pPoint;
pPoint = GetPpoint();
- for (int i=0; i<NB_POINTS; i++)
+ for (int i=0; i<NB_POINTS_UI; i++)
if (pPoint[i*2] == -1)
{
cerr << "Comm::ExecuteUiCmds : Pas assez de points selectionnes\n";
return;
}
- for (int i = 0; i<NB_POINTS; i++)
+ for (int i = 0; i<NB_POINTS_UI; i++)
{
- oconfig->tabPoint[i][0] = pPoint[i*2];
- oconfig->tabPoint[i][1] = pPoint[i*2+1];
- oconfig->tabPoint[i][2] = 0;
- oconfig->tabPoint[i][3] = 0;
+ oconfig->tabPoint[i*4+0] = pPoint[i*2];
+ oconfig->tabPoint[i*4+1] = pPoint[i*2+1];
+ oconfig->tabPoint[i*4+2] = 0;
+ oconfig->tabPoint[i*4+3] = 0;
}
- oconfig->CreateDistFile("rc/dist");
+ oconfig->CreateDistFile("rc/dist", NB_POINTS_UI);
break;
case 'y':