Skip to content

customize_refCurvedef-refStroketrim_and_make_refPixPaintLasso #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kikuchiof123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

customize_refCurvedef-refStroketrim_and_make_refPixPaintLasso #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions RoiPainter4D/RoiPainter4D/FormMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "FormPlaceCPs.h"
#include "FormRefCurveDeform.h"
#include "FormSelectMskId.h"
#include "FormRefPixPaint.h"

#pragma unmanaged
#include "OglForCLI.h"
Expand All @@ -39,6 +40,7 @@
#include "Mode/ModeSegStrokeFfd.h"
#include "Mode/ModePlaceCPs.h"
#include "Mode/ModeRefCurveDeform.h"
#include "Mode/ModeRefPixPaint.h"
#include <string>
#include <vector>
#pragma managed
Expand Down Expand Up @@ -81,6 +83,7 @@ int main()
ModeRefStrokeTrim::GetInst();
//ModeSegStrokeFfd::GetInst();
ModeRefCurveDeform::GetInst();
ModeRefPixPaint::GetInst();
FormSegBolus::GetInst();

std::cout << "FormMain::getInst()->ShowDialog() \n";
Expand Down Expand Up @@ -147,6 +150,7 @@ void FormMain::InitializeSingletons()
FormSegLocalRGrow::GetInst()->Show();
FormSegBolus::GetInst()->Show();
FormRefStrokeTrim::GetInst()->Show();
FormRefPixPaint::GetInst()->Show();
FormSegSwallowOrgans::GetInst()->Show();
FormSegSwallowOrganTimeline::GetInst()->Show();
FormSegJointTracker::GetInst()->Show();
Expand All @@ -165,6 +169,7 @@ void FormMain::InitializeSingletons()
FormSegLocalRGrow::GetInst()->Hide();
FormSegBolus::GetInst()->Hide();
FormRefStrokeTrim::GetInst()->Hide();
FormRefPixPaint::GetInst()->Hide();
FormSegSwallowOrgans::GetInst()->Hide();
FormSegSwallowOrganTimeline::GetInst()->Hide();
FormSegJointTracker::GetInst()->Hide();
Expand All @@ -184,6 +189,7 @@ void FormMain::InitializeSingletons()
FormSegLocalRGrow::GetInst()->Owner = this;
FormSegBolus::GetInst()->Owner = this;
FormRefStrokeTrim::GetInst()->Owner = this;
FormRefPixPaint::GetInst()->Owner = this;
FormSegSwallowOrgans::GetInst()->Owner = this;
FormSegStrokeFfd::GetInst()->Owner = this;
FormSegSwallowOrganTimeline::GetInst()->Owner = this;
Expand Down Expand Up @@ -403,6 +409,7 @@ void FormMain::ReplaceOtherForms()
FormSegRigidICP ::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
FormSegLocalRGrow ::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
FormRefStrokeTrim ::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
FormRefPixPaint ::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
FormSegBolus ::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
FormSegSwallowOrgans::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
FormSegJointTracker ::GetInst()->Location = Point(thisX + thisW, thisY + dlgH);
Expand Down Expand Up @@ -482,6 +489,10 @@ System::Void FormMain::switch_refStrokeTrim_Click(System::Object^ sender, Syste
ModeCore::GetInst()->ModeSwitch(MODE_REF_STRKTRIM);
RedrawMainPanel();
}
System::Void FormMain::switch_refPixPaint_Click(System::Object^ sender, System::EventArgs^ e) {
ModeCore::GetInst()->ModeSwitch(MODE_REF_PIXPAINT);
RedrawMainPanel();
}

System::Void FormMain::switch_SegBolus_Click(System::Object^ sender, System::EventArgs^ e)
{
Expand Down
767 changes: 392 additions & 375 deletions RoiPainter4D/RoiPainter4D/FormMain.h
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 28 additions & 1 deletion RoiPainter4D/RoiPainter4D/FormRefCurveDeform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ using namespace RoiPainter4D;
void FormRefCurveDeform::InitAllItems()
{
m_numbox_cpsize->Value = 10;
m_checkbox_showonlyselectedstroke->Checked = true;
m_checkbox_showonlyselectedstroke->Checked = false;
m_trackbar_mcscale->Value = 2;
m_checkbox_vissurf_trans->Checked = true;
m_checkbox_vissurf_solid->Checked = false;

FormSelectMskId^ modal = gcnew FormSelectMskId();
if (modal->ShowDialog() == System::Windows::Forms::DialogResult::Cancel) return;
Expand Down Expand Up @@ -100,6 +102,31 @@ System::Void FormRefCurveDeform::m_btn_savestate_Click(System::Object^ sender, S
}


System::Void FormRefCurveDeform::m_checkbox_visbound_CheckedChanged(
System::Object^ sender,
System::EventArgs^ e)
{
formMain_RedrawMainPanel();
}

System::Void FormRefCurveDeform::m_checkbox_vissurf_CheckedChanged(
System::Object^ sender,
System::EventArgs^ e)
{
if (m_checkbox_vissurf_trans->Checked)
m_checkbox_vissurf_solid->Checked = false;
formMain_RedrawMainPanel();
}

System::Void FormRefCurveDeform::m_checkbox_vissurf_solid_CheckedChanged(
System::Object^ sender,
System::EventArgs^ e)
{
if (m_checkbox_vissurf_solid->Checked)
m_checkbox_vissurf_trans->Checked = false;
formMain_RedrawMainPanel();
}

void FormRefCurveDeform::LoadState()
{
std::string fpath;
Expand Down
Loading