Skip to content

New fork with unmasked/photo foucault.#25

Open
edeforas wants to merge 11 commits intoedeforas:masterfrom
pcrubille:master
Open

New fork with unmasked/photo foucault.#25
edeforas wants to merge 11 commits intoedeforas:masterfrom
pcrubille:master

Conversation

@edeforas
Copy link
Owner

@edeforas edeforas commented Jan 8, 2023

No description provided.

@edeforas
Copy link
Owner Author

edeforas commented Jan 8, 2023

Thanks , can you please add a small set of image + foucault2 files in the sample folder so user can play with it ?
Also I will add you in the About box as Paul Crubille, ok for you ?

@@ -0,0 +1,10 @@

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok to convert in english or move them into the github issues ?




// double _dSlit_angle;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is nice, I just argued on some coding style, thanks!
However, there is maybe a missing part, the connection to the main App ?
I think we can merge quickly , I will test and restest with you samples data , also gives it to the Sorbonne Observatory so they can test it,
and then a other release maybe cleanup

Thanks

ui->dateTimeEdit->setTime(QTime::currentTime());
set_mirror_total_diameter( _pMirror->diameter() );
// _dMirror_angle =0.;
_dNumber_of_images = ui->le_nb_img->text().toDouble(&bSuccess);
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test bSuccess?

resize_vectors();
_dDeltaHx =0.5;
_dName_format_n =7;
_dName_format_n =3;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Repetition?

// _dMirror_angle =0.;
_dNumber_of_images = ui->le_nb_img->text().toDouble(&bSuccess);
resize_vectors();
_dDeltaHx =0.5;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard coded value ? Please add a comment

float DialogNewUnmaskedMeasure::get_slit_angle()
{
bool bSuccess;
return ui->leSlitAngle->text().toFloat(&bSuccess);
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test bSuccess ?

} else {
QMessageBox::critical(this,tr("Error"),tr("Images number should be at least 3.)"));
ui->le_nb_img->setText( QString::number( _dNumber_of_images) );
// ui->le_nb_img->setFocus();
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

for( i = _dNumber_of_images; i < MaxZones; i++ )
{
images_set.clear_image( i );
};
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

; not mandatory

int i;
images_set.set_rotation( get_slit_angle() );
_STATE = STATE_INIT;
for( i = _dNumber_of_images; i < MaxZones; i++ )
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can be local

//
QProgressDialog progress("Loading images...", "continue", 0, _dNumber_of_images, this);
progress.setWindowModality(Qt::WindowModal);
/*
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe Delete

{
_STATE = STATE_CROPPING ;

// CHARGEMENT IMAGES
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe English, thanks

_STATE = STATE_ANALYZING ;
QProgressDialog progress("Searching zones...", "continue", 0, _dNumber_of_images, this);
progress.setWindowModality(Qt::WindowModal);
/*
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

Copy link
Owner Author

@edeforas edeforas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all

return (a.hm < b.hm);
}
};
static std::vector < hx_hm > v_hx_hm;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need statics ? It will have conflict if two Unmasked measures exist?

};
static std::vector < hx_hm > v_hx_hm;

// v_hx_mx.push_back(hx_mx( hx , hm));
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

}
/*

{
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove ?

}
void DialogNewUnmaskedMeasure::on_pushButton_cancel_clicked()
{
printf("cancel - ");
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove since A console maybe flash for this printf ?


vector<double> DialogNewUnmaskedMeasure::get_Img_hx()
{
/* if((_STATE == STATE_CROPPING )||(_STATE == STATE_ANALYZING ))
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

return _Img_Hx;
}
//////////////////////////////////////////////////////////////////////
/*void DialogNewUnmaskedMeasure::on_btnComputeNbOfzone_clicked()
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove ?

@@ -0,0 +1,102 @@
#include "TaskItemUnmaskedMeasure.h"
#include "Mirror.h"
// #include "MirrorCouderMeasure.h"
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

}

/////////////////////////////////////////////////////////////
// ALGO TO FIND THE CENTER:
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

return true;
}

class table_trigo
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sur is it quicker than direct computation ...




// double _dSlit_angle;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is nice, I just argued on some coding style, thanks!
However, there is maybe a missing part, the connection to the main App ?
I think we can merge quickly , I will test and restest with you samples data , also gives it to the Sorbonne Observatory so they can test it,
and then a other release maybe cleanup

Thanks

Paul Crubille and others added 10 commits January 16, 2023 12:16
(ajout de clear sur les vecteurs).
Ajout d'un exemple simule avec Difract dans sample.
…tion of the radius by top and bottom detection before 3 points circle algo.

Testing, zone minimal values are greater near the edge than in the center. It is now used to valid or unvalid minimas as zones..
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants